[74824] trunk/dports/sysutils/dpkg

[afb at macports.org]

Revision: 74824
          http://trac.macports.org/changeset/74824
Author:   afb at macports.org
Date:     2011-01-03 01:51:18 -0800 (Mon, 03 Jan 2011)
Log Message:
-----------
make sure to actually use perl5, not /usr/bin/perl

Modified Paths:
--------------
    trunk/dports/sysutils/dpkg/Portfile

Added Paths:
-----------
    trunk/dports/sysutils/dpkg/files/patch-scripts-Makefile

Modified: trunk/dports/sysutils/dpkg/Portfile
===================================================================
--- trunk/dports/sysutils/dpkg/Portfile	2011-01-03 09:15:41 UTC (rev 74823)
+++ trunk/dports/sysutils/dpkg/Portfile	2011-01-03 09:51:18 UTC (rev 74824)
@@ -4,6 +4,7 @@
 
 name			dpkg
 version			1.14.29
+revision		1
 platforms		darwin freebsd
 categories		sysutils archivers
 maintainers		landonf openmaintainer
@@ -30,8 +31,10 @@
 
 patchfiles		patch-lib_tarfn.c \
 			patch-main_remove.c \
-			patch-main_archives.c
+			patch-main_archives.c \
+			patch-scripts-Makefile
 
+configure.env		PERL=${prefix}/bin/perl5
 configure.args		--without-sgml-doc --with-libintl-prefix=${prefix} \
 			--with-libiconv-prefix=${prefix} --with-admindir=${prefix}/var/db/dpkg \
 			--mandir=${prefix}/share/man \

Added: trunk/dports/sysutils/dpkg/files/patch-scripts-Makefile
===================================================================
--- trunk/dports/sysutils/dpkg/files/patch-scripts-Makefile	                        (rev 0)
+++ trunk/dports/sysutils/dpkg/files/patch-scripts-Makefile	2011-01-03 09:51:18 UTC (rev 74824)
@@ -0,0 +1,22 @@
+--- scripts/Makefile.am.orig	2010-03-08 21:27:35.000000000 +0100
++++ scripts/Makefile.am	2011-01-03 10:15:37.000000000 +0100
+@@ -123,7 +123,7 @@ nobase_dist_perllib_DATA = \
+ 	Dpkg/Source/Patch.pm \
+ 	Dpkg.pm
+ 
+-do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" \
++do_perl_subst = sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \
+ 		    -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \
+ 		    -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \
+ 		    -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \
+--- scripts/Makefile.in.orig	2010-03-08 21:32:20.000000000 +0100
++++ scripts/Makefile.in	2011-01-03 10:15:50.000000000 +0100
+@@ -330,7 +330,7 @@ nobase_dist_perllib_DATA = \
+ 	Dpkg/Source/Patch.pm \
+ 	Dpkg.pm
+ 
+-do_perl_subst = sed -e "s:^\#![:space:]*/usr/bin/perl:\#!$(PERL):" \
++do_perl_subst = sed -e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \
+ 		    -e "s:\$$dpkglibdir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$dpkglibdir=\"$(pkglibdir)\":" \
+ 		    -e "s:\$$pkgdatadir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$pkgdatadir=\"$(pkgdatadir)\":" \
+ 		    -e "s:\$$admindir[[:space:]]*=[[:space:]]*['\"][^'\"]*['\"]:\$$admindir=\"$(admindir)\":" \
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110103/b98b6378/attachment.html>