diff options
Diffstat (limited to 'devel/popt')
-rw-r--r-- | devel/popt/Makefile | 12 | ||||
-rw-r--r-- | devel/popt/buildlink.mk | 36 | ||||
-rw-r--r-- | devel/popt/distinfo | 7 | ||||
-rw-r--r-- | devel/popt/patches/patch-aa | 47 | ||||
-rw-r--r-- | devel/popt/pkg/PLIST | 17 |
5 files changed, 110 insertions, 9 deletions
diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 73ae265a938..cd756a49407 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -1,10 +1,12 @@ -# $NetBSD: Makefile,v 1.8 2001/07/01 11:46:49 tron Exp $ +# $NetBSD: Makefile,v 1.9 2001/09/30 21:03:22 rh Exp $ # -DISTNAME= popt-1.5.-1 -PKGNAME= popt-1.5 +DISTNAME= popt-1.6.2 CATEGORIES= devel -MASTER_SITES= ftp://people.redhat.com/sopwith/popt/ +MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ \ + http://gd.tuwien.ac.at/z7/utils/rpm.org/dist/rpm-4.0.x/ \ + ftp://ftp.iks-jena.de/pub/software/unix/misc/ \ + ftp://sunsite.cnlab-switch.ch/mirror/rpm/dist/rpm-4.0.x/ MAINTAINER= packages@netbsd.org COMMENT= Command line option parsing library @@ -17,7 +19,7 @@ GNU_CONFIGURE= yes USE_GMAKE= yes WRKSRC= ${WRKDIR}/${PKGNAME} -MAKE_ENV+= LOCALEDIR=${LOCAL_BASE}/share/locale/ +CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" .include "../../devel/gettext-lib/buildlink.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/popt/buildlink.mk b/devel/popt/buildlink.mk new file mode 100644 index 00000000000..d3abb7b0e15 --- /dev/null +++ b/devel/popt/buildlink.mk @@ -0,0 +1,36 @@ +# $NetBSD: buildlink.mk,v 1.1 2001/09/30 21:03:22 rh Exp $ +# +# This Makefile fragment is included by packages that use popt. +# +# To use this Makefile fragment, simply: +# +# (1) Optionally define BUILDLINK_DEPENDS.popt to the dependency patthern +# for the version of popt desired. +# (2) Include this Makefile fragment in the package Makefile, +# (3) Add ${BUILDLINK_DIR}/include to the front of the C preprocessor's header +# search path, and +# (4) Add ${BUILDLINK_DIR}/lib to the front of the linker's library search +# path. + +.if !defined(POPT_BUILDLINK_MK) +POPT_BUILDLINK_MK= # defined + +.include "../../mk/bsd.buildlink.mk" + +BUILDLINK_DEPENDS.popt?= popt>=1.6.2 +DEPENDS+= ${BUILDLINK_DEPENDS.popt}:../../devel/popt + +EVAL_PREFIX+= BUILDLINK_PREFIX.popt=popt +BUILDLINK_PREFIX.popt_DEFAULT= ${LOCALBASE} +BUILDLINK_FILES.popt= include/popt.h +BUILDLINK_FILES.popt+= lib/libpopt.* + +.include "../../devel/gettext-lib/buildlink.mk" + +BUILDLINK_TARGETS.popt= popt-buildlink +BUILDLINK_TARGETS+= ${BUILDLINK_TARGETS.popt} + +pre-configure: ${BUILDLINK_TARGETS.popt} +popt-buildlink: _BUILDLINK_USE + +.endif # POPT_BUILDLINK_MK diff --git a/devel/popt/distinfo b/devel/popt/distinfo index 982af0d9fae..f7adc0cb9a7 100644 --- a/devel/popt/distinfo +++ b/devel/popt/distinfo @@ -1,4 +1,5 @@ -$NetBSD: distinfo,v 1.4 2001/06/14 12:55:17 mjl Exp $ +$NetBSD: distinfo,v 1.5 2001/09/30 21:03:23 rh Exp $ -SHA1 (popt-1.5.-1.tar.gz) = 3e01fb7f4117bd28fbe1ef1ca87b5035f1b72841 -Size (popt-1.5.-1.tar.gz) = 428892 bytes +SHA1 (popt-1.6.2.tar.gz) = 1a636662fbe1648f8c899378765e093ab53bff0e +Size (popt-1.6.2.tar.gz) = 446164 bytes +SHA1 (patch-aa) = 8ffd927f904920e34812d7ae07bd7c4475cc23ad diff --git a/devel/popt/patches/patch-aa b/devel/popt/patches/patch-aa new file mode 100644 index 00000000000..40c929221cb --- /dev/null +++ b/devel/popt/patches/patch-aa @@ -0,0 +1,47 @@ +$NetBSD: patch-aa,v 1.3 2001/09/30 21:03:23 rh Exp $ + +--- configure.orig Fri Feb 23 22:43:41 2001 ++++ configure +@@ -3674,13 +3674,13 @@ + if { (eval echo configure:3675: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then + rm -rf conftest* + CATOBJEXT=.gmo +- DATADIRNAME=share ++ DATADIRNAME=${PKGLOCALEDIR} + else + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CATOBJEXT=.mo +- DATADIRNAME=lib ++ DATADIRNAME=${PKGLOCALEDIR} + fi + rm -f conftest* + INSTOBJEXT=.mo +@@ -3942,7 +3942,7 @@ + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.cat + INSTOBJEXT=.cat +- DATADIRNAME=lib ++ DATADIRNAME=${PKGLOCALEDIR} + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` +@@ -4071,7 +4071,7 @@ + USE_INCLUDED_LIBINTL=yes + CATOBJEXT=.gmo + INSTOBJEXT=.mo +- DATADIRNAME=share ++ DATADIRNAME=${PKGLOCALEDIR} + INTLDEPS='$(top_builddir)/intl/libintl.a' + INTLLIBS=$INTLDEPS + LIBS=`echo $LIBS | sed -e 's/-lintl//'` +@@ -4091,7 +4091,7 @@ + # We need to process the po/ directory. + POSUB=po + else +- DATADIRNAME=share ++ DATADIRNAME=${PKGLOCALEDIR} + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h + fi diff --git a/devel/popt/pkg/PLIST b/devel/popt/pkg/PLIST index d05bc1beaed..98598f640e1 100644 --- a/devel/popt/pkg/PLIST +++ b/devel/popt/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2001/07/01 11:46:49 tron Exp $ +@comment $NetBSD: PLIST,v 1.4 2001/09/30 21:03:24 rh Exp $ include/popt.h lib/libpopt.a lib/libpopt.la @@ -6,5 +6,20 @@ lib/libpopt.so lib/libpopt.so.0 lib/libpopt.so.0.0 man/man3/popt.3 +${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/da/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/is/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/no/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/popt.mo ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/popt.mo ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/popt.mo +${PKGLOCALEDIR}/locale/zh_CN.GB2312/LC_MESSAGES/popt.mo |