diff options
| author | martti <martti> | 2002-10-19 18:08:58 +0000 |
|---|---|---|
| committer | martti <martti> | 2002-10-19 18:08:58 +0000 |
| commit | 35d2bf8abc889a149b5b98ebe87757699f2b9851 (patch) | |
| tree | 7c39664dfcd474825f0cebca9ec0d3f8cb3f6231 /devel | |
| parent | 311c47de6851efe5efe590b3452090057ab2a87b (diff) | |
| download | pkgsrc-35d2bf8abc889a149b5b98ebe87757699f2b9851.tar.gz | |
Fix build failure (PR#18795)
Diffstat (limited to 'devel')
| -rw-r--r-- | devel/popt/Makefile | 11 | ||||
| -rw-r--r-- | devel/popt/distinfo | 3 | ||||
| -rw-r--r-- | devel/popt/patches/patch-ab | 21 |
3 files changed, 29 insertions, 6 deletions
diff --git a/devel/popt/Makefile b/devel/popt/Makefile index 452ca531736..5b315548d6d 100644 --- a/devel/popt/Makefile +++ b/devel/popt/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.14 2002/10/15 10:18:41 martti Exp $ +# $NetBSD: Makefile,v 1.15 2002/10/19 18:08:58 martti Exp $ # DISTNAME= popt-1.7 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.1.x/ \ http://gd.tuwien.ac.at/z7/utils/rpm.org/dist/rpm-4.1.x/ \ @@ -13,16 +14,16 @@ COMMENT= Command line option parsing library BUILD_USES_MSGFMT= yes -CONFLICTS= ORBit<=0.5.3 +CONFLICTS= ORBit<=0.5.3 USE_BUILDLINK2= yes GNU_CONFIGURE= yes USE_GMAKE= yes USE_LIBTOOL= yes -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool -WRKSRC= ${WRKDIR}/${PKGNAME} -CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" +WRKSRC= ${WRKDIR}/${DISTNAME} +CONFIGURE_ENV+= PKGLOCALEDIR="${PKGLOCALEDIR}" .include "../../devel/gettext-lib/buildlink2.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/popt/distinfo b/devel/popt/distinfo index 894ae31a768..dccaaebf4c3 100644 --- a/devel/popt/distinfo +++ b/devel/popt/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.8 2002/10/15 10:18:41 martti Exp $ +$NetBSD: distinfo,v 1.9 2002/10/19 18:08:59 martti Exp $ SHA1 (popt-1.7.tar.gz) = 66f3c77b87a160951b180447f4a6dce68ad2f71b Size (popt-1.7.tar.gz) = 574549 bytes SHA1 (patch-aa) = e4fe1bf5bfd717faf8233a22300869121827af6c +SHA1 (patch-ab) = b267b75c778a93148aceb3ab4fe85141e6333375 diff --git a/devel/popt/patches/patch-ab b/devel/popt/patches/patch-ab new file mode 100644 index 00000000000..36393ae5846 --- /dev/null +++ b/devel/popt/patches/patch-ab @@ -0,0 +1,21 @@ +$NetBSD: patch-ab,v 1.3 2002/10/19 18:08:59 martti Exp $ + +--- Makefile.in.orig Sat Oct 19 18:32:02 2002 ++++ Makefile.in Sat Oct 19 19:07:20 2002 +@@ -133,13 +133,13 @@ + noinst_PROGRAMS = test1 test2 test3 + test1_SOURCES = test1.c + test1_LDFLAGS = -all-static +-test1_LDADD = $(lib_LTLIBRARIES) ++test1_LDADD = $(lib_LTLIBRARIES) -lintl + test2_SOURCES = test2.c + test2_LDFLAGS = -all-static +-test2_LDADD = $(lib_LTLIBRARIES) ++test2_LDADD = $(lib_LTLIBRARIES) -lintl + test3_SOURCES = test3.c + test3_LDFLAGS = -all-static +-test3_LDADD = $(lib_LTLIBRARIES) ++test3_LDADD = $(lib_LTLIBRARIES) -lintl + + noinst_SCRIPTS = testit.sh + |