[26410] trunk/dports/devel/popt

[source_changes at macosforge.org]

Revision: 26410
          http://trac.macosforge.org/projects/macports/changeset/26410
Author:   afb at macports.org
Date:     2007-06-21 15:40:07 -0700 (Thu, 21 Jun 2007)

Log Message:
-----------
patch disabling bug (reported upstream)

Modified Paths:
--------------
    trunk/dports/devel/popt/Portfile

Added Paths:
-----------
    trunk/dports/devel/popt/files/patch-popt.c

Modified: trunk/dports/devel/popt/Portfile
===================================================================
--- trunk/dports/devel/popt/Portfile	2007-06-21 19:42:16 UTC (rev 26409)
+++ trunk/dports/devel/popt/Portfile	2007-06-21 22:40:07 UTC (rev 26410)
@@ -3,7 +3,7 @@
 PortSystem 1.0
 name		popt
 version		1.11
-revision	0
+revision	1
 categories	devel
 maintainers	n3npq at mac.com
 description	A getopt(3) like library with a number of enhancements
@@ -15,7 +15,7 @@
 depends_lib	port:gettext \
 		port:libiconv
 
-patchfiles	patch-poptint.c
+patchfiles	patch-poptint.c patch-popt.c
 
 post-patch {
         file copy -force /usr/share/libtool/config.guess ${worksrcpath}/config.guess
@@ -23,7 +23,7 @@
 }
 
 configure.env	CFLAGS="-I${prefix}/include" LDFLAGS="-L${prefix}/lib"
-configure.args	--mandir=${prefix}/share/man --with-libiconv-prefix=${prefix}
+configure.args	--mandir=${prefix}/share/man --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix}
 
 destroot.args	localedir=${prefix}/share/locale
 post-destroot {

Added: trunk/dports/devel/popt/files/patch-popt.c
===================================================================
--- trunk/dports/devel/popt/files/patch-popt.c	                        (rev 0)
+++ trunk/dports/devel/popt/files/patch-popt.c	2007-06-21 22:40:07 UTC (rev 26410)
@@ -0,0 +1,11 @@
+--- ./popt.c.orig	2007-06-14 15:31:10.000000000 +0200
++++ ./popt.c	2007-06-21 22:34:24.000000000 +0200
+@@ -396,7 +396,7 @@
+     if (!strchr(item->argv[0], '/') && con->execPath != NULL) {
+ 	char *s = malloc(strlen(con->execPath) + strlen(item->argv[0]) + sizeof("/"));
+ 	if (s)
+-	    sprintf(s, "%s/%s", con->execPath, item->argv[-1]);
++	    sprintf(s, "%s/%s", con->execPath, item->argv[0]);
+ 	argv[argc] = s;
+     } else
+ 	argv[argc] = POPT_findProgramPath(item->argv[0]);


Property changes on: trunk/dports/devel/popt/files/patch-popt.c
___________________________________________________________________
Name: svn:eol-style
   + native

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070621/ac0c1642/attachment.html