macports: better way to swap SYSDATADIR

diff --git a/packaging/macports/Makefile b/packaging/macports/Makefile
deleted file mode 100644 (file)
index 10d9547..0000000
--- a/packaging/macports/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# use proper system paths for MacPorts instead of Debian's:
-post-patch:
-       @${REINPLACE_CMD} -e 's|/etc/monkeysphere|'$(SYSETCDIR)'|g' \
-         ${WRKSRC}/src/share/defaultenv \
-         ${WRKSRC}/src/transitions/0.23 \
-         ${WRKSRC}/man/man1/monkeysphere.1 \
-         ${WRKSRC}/man/man8/monkeysphere-authentication.8 \
-         ${WRKSRC}/man/man8/monkeysphere-host.8 \
-         ${WRKSRC}/etc/monkeysphere-authentication.conf
-       @${REINPLACE_CMD} -e 's|/var/lib/monkeysphere|'$(SYSDATADIR)'|g' \
-         ${WRKSRC}/src/transitions/0.23 \
-         ${WRKSRC}/man/man1/monkeysphere.1 \
-         ${WRKSRC}/man/man8/monkeysphere-authentication.8 \
-         ${WRKSRC}/man/man8/monkeysphere-host.8 \
-         ${WRKSRC}/src/monkeysphere-host \
-         ${WRKSRC}/src/monkeysphere-authentication \
-         ${WRKSRC}/doc/getting-started-admin.mdwn
-       @${REINPLACE_CMD} -e 's|/usr/share/monkeysphere|'$(SYSSHAREDIR)'|g' \
-         ${WRKSRC}/src/monkeysphere-host \
-         ${WRKSRC}/src/monkeysphere-authentication \
-         ${WRKSRC}/src/monkeysphere
-       # and clean up cruft from the sed replacements:
-       ${FIND} ${WRKSRC} -name '*.bak' -delete

diff --git a/packaging/macports/Portfile b/packaging/macports/Portfile
index e6176d0d313309f221b0c163a310180708910903..290edfdd84d0f045962432445009923b1008b0e2 100644 (file)
--- a/packaging/macports/Portfile
+++ b/packaging/macports/Portfile
@@ -31,17 +31,31 @@ extract.suffix      .orig.tar.gz
 worksrcdir          ${name}-${version}
 checksums           md5 8590532f4702fa44027a6a583657c9ef
 
-patch.dir           ${worksrcpath}
-patch.cmd           make
-patch.args          -f Makefile \
-                    WRKSRC=${worksrcpath} \
-                    SYSETCDIR=${destroot}${prefix}/etc/monkeysphere \
-                    SYSDATADIR=${destroot}${prefix}/var/db/monkeysphere \
-                    SYSSHAREDIR=${destroot}${prefix}/share/monkeysphere \
-                    post-patch
-
 use_configure       no
 
+post-build {
+    exec sed -i .tmp -e "s|/etc/monkeysphere|${prefix}/etc/monkeysphere|g" \
+        ${worksrcpath}/src/share/defaultenv \
+        ${worksrcpath}/src/transitions/0.23 \
+        ${worksrcpath}/man/man1/monkeysphere.1 \
+        ${worksrcpath}/man/man8/monkeysphere-authentication.8 \
+        ${worksrcpath}/man/man8/monkeysphere-host.8 \
+        ${worksrcpath}/etc/monkeysphere-authentication.conf
+    exec sed -i .tmp -e "s|/var/lib/monkeysphere|${prefix}/var/db/monkeysphere|g" \
+        ${worksrcpath}/src/transitions/0.23 \
+        ${worksrcpath}/man/man1/monkeysphere.1 \
+        ${worksrcpath}/man/man8/monkeysphere-authentication.8 \
+        ${worksrcpath}/man/man8/monkeysphere-host.8 \
+        ${worksrcpath}/src/monkeysphere-host \
+        ${worksrcpath}/src/monkeysphere-authentication \
+        ${worksrcpath}/doc/getting-started-admin.mdwn
+    exec sed -i .tmp -e "s|/usr/share/monkeysphere|${prefix}/share/monkeysphere|g" \
+        ${worksrcpath}/src/monkeysphere-host \
+        ${worksrcpath}/src/monkeysphere-authentication \
+        ${worksrcpath}/src/monkeysphere
+    exec find ${worksrcpath} -name *.tmp -delete
+}
+
 destroot.destdir    DESTDIR=${destroot}${prefix}
 destroot.args       PREFIX=