Changes between Version 7 and Version 8 of howto/PatchLocal

Timestamp:

Dec 2, 2020, 9:10:13 PM (3 years ago)

Author:

bernstei

Comment:

add a few missing steps needed for dealing with the renamed ("-devel") port name.

howto/PatchLocal

@@ -24 +24 @@
 Create the port's category directory (using port "arb" as an example):
 {{{
-PORT_CATEGORY=`port dir arb | awk -F\/ '{ print $(NF-1) }'`
+port=arb
+PORT_CATEGORY=`port dir ${port} | awk -F\/ '{ print $(NF-1) }'`
 mkdir /usr/local/ports/$PORT_CATEGORY
 cd /usr/local/ports/$PORT_CATEGORY
-cp -r `port dir arb` .
-mv arb arb-devel
-# edit arb-devel/Portfile and replace "name arb" with "name arb-devel"
-cd arb-devel
+cp -r `port dir ${port}` .
+mv ${port} ${port}-devel
+# edit ${port}-devel/Portfile and replace "name arb" with "name arb-devel", and 
+#   create two new lines, one defining "distname arb-${version}", overriding the 
+#   default of ${name}-${version}, and one defining "dist_subdir arb",
+#   overriding the default of ${name}, otherwise the fetch  will fail to 
+#   find the distfile, because it will be including the "-devel" as part of 
+#   the path and distfile on the mirror site
+cd ${port}-devel
 port lint # to check for problems
 }}}
@@ -47 +53 @@
 
 {{{
-port patch arb-devel
-cd `port work arb-devel`
+port patch ${port}-devel
+cd `port work ${port}-devel`
 }}}
 
@@ -63 +69 @@
 See http://guide.macports.org/#development.patches.source
 {{{
-diff -u Makefile.orig Makefile > `port dir arb-devel`/files/patch-ARB-makefile2.diff
-port edit arb-devel # (add the patch-ARB-makefile2.diff file to the list of patches)
+diff -u Makefile.orig Makefile > `port dir ${port}-devel`/files/patch-ARB-makefile2.diff
+port edit ${port}-devel # (add the patch-ARB-makefile2.diff file to the list of patches)
 }}}
 
@@ -70 +76 @@
 
 {{{
-port clean arb-devel
-port build arb-devel
+# leave work dir to ensure that the port clean isn't trying to remove an in-use 
+# directory and make the build fail
+cd /usr/local/ports 
+port clean ${port}-devel
+port build ${port}-devel
 }}}
 
@@ -77 +86 @@
 
 {{{
-port -s install arb-devel
+port -s install ${port}-devel
 }}}