diff options
| -rw-r--r-- | devel/popt/Makefile | 9 | ||||
| -rw-r--r-- | devel/popt/distinfo | 8 | ||||
| -rw-r--r-- | devel/popt/patches/patch-aa | 17 | ||||
| -rw-r--r-- | devel/popt/patches/patch-ab | 23 | ||||
| -rw-r--r-- | devel/popt/pkg/PLIST | 10 |
5 files changed, 16 insertions, 51 deletions
diff --git a/devel/popt/Makefile b/devel/popt/Makefile index f1c8368e7cb..a8bf7027737 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2001/04/24 12:30:18 wulf Exp $ +# $NetBSD: Makefile,v 1.7 2001/06/14 12:55:17 mjl Exp $ # -DISTNAME= popt-1.2 -PKGNAME= popt-1.2nb1 +DISTNAME= popt-1.5.-1 +PKGNAME= popt-1.5 CATEGORIES= devel -MASTER_SITES= ftp://ftp.redhat.com/redhat/code/popt/ +MASTER_SITES= ftp://people.redhat.com/sopwith/popt/ MAINTAINER= packages@netbsd.org COMMENT= Command line option parsing library @@ -16,6 +16,7 @@ CONFLICTS= ORBit<=0.5.3 GNU_CONFIGURE= yes USE_GMAKE= yes +WRKSRC= ${WRKDIR}/${PKGNAME} MAKE_ENV+= LOCALEDIR=${LOCAL_BASE}/share/locale/ .include "../../mk/bsd.pkg.mk" diff --git a/devel/popt/distinfo b/devel/popt/distinfo index f65d1297fba..982af0d9fae 100644 --- a/devel/popt/distinfo +++ b/devel/popt/distinfo @@ -1,6 +1,4 @@ -$NetBSD: distinfo,v 1.3 2001/04/24 12:30:18 wulf Exp $ +$NetBSD: distinfo,v 1.4 2001/06/14 12:55:17 mjl Exp $ -SHA1 (popt-1.2.tar.gz) = cf25aa77dfc2eef941293ac10f0761d6aaf690bc -Size (popt-1.2.tar.gz) = 294172 bytes -SHA1 (patch-aa) = 97906976871d32c9ce0c54f952b18efe2655c89d -SHA1 (patch-ab) = f2c336cef55c52d586c64d6f7e2b99065aa5641e +SHA1 (popt-1.5.-1.tar.gz) = 3e01fb7f4117bd28fbe1ef1ca87b5035f1b72841 +Size (popt-1.5.-1.tar.gz) = 428892 bytes diff --git a/devel/popt/patches/patch-aa b/devel/popt/patches/patch-aa deleted file mode 100644 index b4fc6bb2d67..00000000000 --- a/devel/popt/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 2000/10/31 13:33:12 wennmach Exp $ - -Adding missing install dir - ---- po/Makefile.in.in.orig Thu Oct 22 21:39:17 1998 -+++ po/Makefile.in.in Mon Oct 30 14:51:12 2000 -@@ -16,6 +16,10 @@ - LINGUAS = ro - CATALOGS = $(addsuffix .mo, $(LINGUAS)) - -+prefix = @prefix@ -+datadir = @datadir@ -+LOCALEDIR = $(datadir)/locale -+ - POTFILES = \ - - all: $(NLSPACKAGE).pot $(CATALOGS) diff --git a/devel/popt/patches/patch-ab b/devel/popt/patches/patch-ab deleted file mode 100644 index df0530302d8..00000000000 --- a/devel/popt/patches/patch-ab +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-ab,v 1.1 2001/04/24 12:29:03 wulf Exp $ - ---- popt.h.orig Mon Apr 23 23:13:20 2001 -+++ popt.h Mon Apr 23 23:15:20 2001 -@@ -76,6 +76,9 @@ - const struct poptOption * opt, - const char * arg, void * data); - -+#ifdef __cplusplus -+extern "C" { -+#endif - poptContext poptGetContext(char * name, int argc, char ** argv, - const struct poptOption * options, int flags); - void poptResetContext(poptContext con); -@@ -106,5 +109,8 @@ - void poptPrintUsage(poptContext con, FILE * f, int flags); - void poptSetOtherOptionHelp(poptContext con, const char * text); - const char * poptGetInvocationName(poptContext con); -+#ifdef __cplusplus -+} -+#endif - - #endif diff --git a/devel/popt/pkg/PLIST b/devel/popt/pkg/PLIST index 2b45a789372..8363f2c2adf 100644 --- a/devel/popt/pkg/PLIST +++ b/devel/popt/pkg/PLIST @@ -1,4 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2000/10/31 13:33:12 wennmach Exp $ +@comment $NetBSD: PLIST,v 1.2 2001/06/14 12:55:18 mjl Exp $ +lib/locale/ro/LC_MESSAGES/popt.mo +lib/locale/sk/LC_MESSAGES/popt.mo +lib/libpopt.so +lib/libpopt.so.0.0 +lib/libpopt.so.0 +lib/libpopt.la lib/libpopt.a include/popt.h -share/locale/ro/LC_MESSAGES/rpm.mo +man/man3/popt.3 |