Ticket #12668: popt-1.12.diff

files/patch-popt.c

@@ -1 @@
---- ./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]);

files/patch-poptint.c

@@ -1 @@
---- poptint.c.varargs   2007-06-17 13:09:50.000000000 -0400
-+++ poptint.c   2007-06-17 13:11:54.000000000 -0400
-@@ -97,10 +97,15 @@
- {
-   char *buffer = NULL;
-   char c;
-+  va_list apc;
-+
-+  va_copy(apc, ap);     /* XXX linux amd64/ppc needs a copy. */
- 
-   buffer = calloc (sizeof (char), vsnprintf (&c, 1, format, ap) + 1);
-   vsprintf (buffer, format, ap);
- 
-+  va_end(apc);
-+
-   return buffer;
- }
- 

Portfile

@@ -3 +3 @@
 PortSystem 1.0
 
 name            popt
-version         1.11
-revision        1
+version         1.12
 categories      devel
 maintainers     n3npq@mac.com
 description     A getopt(3) like library with a number of enhancements
+
 long_description popt is a command line parsing library. It contains a number of \
 enhancements over getopt(3), including being fully reentrant, allowing users to \
 alias command line arguments, providing convience functions for parsing strings \
@@ -15 +15 @@
 
 platforms       darwin freebsd
 
-homepage        http://rpm5.org
-master_sites    ${homepage}/files/popt/
+homepage        http://rpm5.org/
+master_sites    ${homepage}files/popt/
 
 depends_lib     port:gettext \
                 port:libiconv
 
-patchfiles      patch-poptint.c patch-popt.c
-
-platform darwin {
-post-patch {
-        file copy -force /usr/share/libtool/config.guess ${worksrcpath}/config.guess
-        file copy -force /usr/share/libtool/config.sub ${worksrcpath}/config.sub
-}
-}
-
-configure.args  --mandir=${prefix}/share/man --with-libintl-prefix=${prefix} --with-libiconv-prefix=${prefix}
-
-destroot.args   localedir=${prefix}/share/locale
 post-destroot {
         file delete -force ${destroot}${prefix}/share/locale/locale.alias
         file delete -force ${destroot}${prefix}/lib/charset.alias
+
+        set docdir ${prefix}/share/doc/${name}-${version}
+        xinstall -d ${destroot}${docdir}
+        xinstall -m 0644 -W ${worksrcpath} ABOUT-NLS CHANGES COPYING README \
+                ${destroot}${docdir}
 }
 
-checksums       md5 3c36cb9d40a46a3190369002f6cda984
+test.run    yes
+test.target check
+
+checksums   md5 f45290e9ac4b1cf209d0042eb6755543 \
+            sha1 113669bd952913307044ed67d8120a2d3e05626b \
+            rmd160 95bd1960fd896df8f521fff2ea4c8570b2984eec
 
 platform darwin 7 {
         depends_build-append port:autoconf