diff options
author | obache <obache@pkgsrc.org> | 2010-02-05 08:44:03 +0000 |
---|---|---|
committer | obache <obache@pkgsrc.org> | 2010-02-05 08:44:03 +0000 |
commit | b852083a2ad0b528f6f8eff07adbb2d23edf93f7 (patch) | |
tree | e8d394683f1a5ee81f99146fc89b2f274a89af29 /devel | |
parent | ea9856b38e588dc6086845a04c5cdb6020db29b8 (diff) | |
download | pkgsrc-b852083a2ad0b528f6f8eff07adbb2d23edf93f7.tar.gz |
Reset WRKSRC settings, use CONFIGURE_DIRS instead.
This package are using some files outside of the directory specified by WRKSRC,
(ex. ../build-aux/config.*). But some pkgsrc checks/replacements/modifications
are only effect to below ${WRKSRC}.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/gettext-asprintf/Makefile | 7 | ||||
-rw-r--r-- | devel/gettext-lib/Makefile | 7 | ||||
-rw-r--r-- | devel/gettext-lib/distinfo | 8 | ||||
-rw-r--r-- | devel/gettext-lib/patches/patch-aa | 6 | ||||
-rw-r--r-- | devel/gettext-lib/patches/patch-ab | 6 | ||||
-rw-r--r-- | devel/gettext-lib/patches/patch-ac | 6 |
6 files changed, 19 insertions, 21 deletions
diff --git a/devel/gettext-asprintf/Makefile b/devel/gettext-asprintf/Makefile index 9e87cd267f4..a0a19fe9e74 100644 --- a/devel/gettext-asprintf/Makefile +++ b/devel/gettext-asprintf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/06/20 01:09:12 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/05 08:44:03 obache Exp $ DISTNAME= gettext-0.14.6 PKGNAME= gettext-asprintf-0.14.6 @@ -12,13 +12,12 @@ COMMENT= Provides a printf-like interface for C++ PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/${DISTNAME}/gettext-runtime - USE_LANGUAGES= c c++ USE_LIBTOOL= yes GNU_CONFIGURE= yes -BUILD_DIRS= libasprintf +CONFIGURE_DIRS= gettext-runtime +BUILD_DIRS= gettext-runtime/libasprintf INFO_FILES= yes diff --git a/devel/gettext-lib/Makefile b/devel/gettext-lib/Makefile index 7bf78f00c93..63ec43c5387 100644 --- a/devel/gettext-lib/Makefile +++ b/devel/gettext-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2008/06/20 01:09:12 joerg Exp $ +# $NetBSD: Makefile,v 1.48 2010/02/05 08:44:03 obache Exp $ DISTNAME= gettext-0.14.6 PKGNAME= gettext-lib-0.14.6 @@ -15,8 +15,6 @@ CONFLICTS= gettext<=0.10.35 PKG_INSTALLATION_TYPES= overwrite pkgviews PKG_DESTDIR_SUPPORT= user-destdir -WRKSRC= ${WRKDIR}/${DISTNAME}/gettext-runtime - USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-included-gettext @@ -29,7 +27,8 @@ CFLAGS.gnu-iconv+= -DHAVE_GNU_ICONV INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} localedir=${EGDIR} -BUILD_DIRS= intl +CONFIGURE_DIRS= gettext-runtime +BUILD_DIRS= gettext-runtime/intl EGDIR= ${PREFIX}/share/examples/gettext LOCALEDIR= ${PREFIX}/${PKGLOCALEDIR}/locale diff --git a/devel/gettext-lib/distinfo b/devel/gettext-lib/distinfo index cf0f6e40cf2..bc8d21366e5 100644 --- a/devel/gettext-lib/distinfo +++ b/devel/gettext-lib/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.14 2006/07/26 06:53:02 adam Exp $ +$NetBSD: distinfo,v 1.15 2010/02/05 08:44:03 obache Exp $ SHA1 (gettext-0.14.6.tar.gz) = 0d8ce8d9a09a719065a1530399c4f45c15a002c5 RMD160 (gettext-0.14.6.tar.gz) = 02138d12fd4d9ce0b3bda2d132f1569b30d16726 Size (gettext-0.14.6.tar.gz) = 7102365 bytes -SHA1 (patch-aa) = fea57fe492c342ed816a43632e63abd21853a0ee -SHA1 (patch-ab) = 2195304902fe17cd97c243a6bc395de1484a50c4 -SHA1 (patch-ac) = f7695a44cdb85a4f6d9b97872425acb4b74519c9 +SHA1 (patch-aa) = b0d25a2e9547649a3d6d583bdfc98255dcafbf90 +SHA1 (patch-ab) = fc4da46f6f7003c22880455dfe66ff161aa92135 +SHA1 (patch-ac) = 7097eecac165b0462e7bf270c58ed7cdb3bff94e diff --git a/devel/gettext-lib/patches/patch-aa b/devel/gettext-lib/patches/patch-aa index 0c65052248e..aef1c1bd239 100644 --- a/devel/gettext-lib/patches/patch-aa +++ b/devel/gettext-lib/patches/patch-aa @@ -1,7 +1,7 @@ -$NetBSD: patch-aa,v 1.5 2006/07/09 18:13:29 tonio Exp $ +$NetBSD: patch-aa,v 1.6 2010/02/05 08:44:04 obache Exp $ ---- intl/localcharset.c.orig 2005-05-20 13:07:51.000000000 -0700 -+++ intl/localcharset.c +--- gettext-runtime/intl/localcharset.c.orig 2005-05-20 13:07:51.000000000 -0700 ++++ gettext-runtime/intl/localcharset.c @@ -23,6 +23,10 @@ # include <config.h> #endif diff --git a/devel/gettext-lib/patches/patch-ab b/devel/gettext-lib/patches/patch-ab index 66204e62039..d57ec10a231 100644 --- a/devel/gettext-lib/patches/patch-ab +++ b/devel/gettext-lib/patches/patch-ab @@ -1,7 +1,7 @@ -$NetBSD: patch-ab,v 1.3 2006/02/05 22:45:54 joerg Exp $ +$NetBSD: patch-ab,v 1.4 2010/02/05 08:44:04 obache Exp $ ---- intl/Makefile.in.orig Thu Jul 25 08:49:57 2002 -+++ intl/Makefile.in Mon Mar 15 14:39:58 2004 +--- gettext-runtime/intl/Makefile.in.orig Thu Jul 25 08:49:57 2002 ++++ gettext-runtime/intl/Makefile.in Mon Mar 15 14:39:58 2004 @@ -156,8 +156,7 @@ libintl.la libgnuintl.la: $(OBJECTS) $(CC) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) $(LDFLAGS) -o $@ \ $(OBJECTS) @LTLIBICONV@ @INTL_MACOSX_LIBS@ $(LIBS) -lc \ diff --git a/devel/gettext-lib/patches/patch-ac b/devel/gettext-lib/patches/patch-ac index 5db9975417a..0a9d6717d7a 100644 --- a/devel/gettext-lib/patches/patch-ac +++ b/devel/gettext-lib/patches/patch-ac @@ -1,7 +1,7 @@ -$NetBSD: patch-ac,v 1.2 2006/02/05 22:45:54 joerg Exp $ +$NetBSD: patch-ac,v 1.3 2010/02/05 08:44:04 obache Exp $ ---- intl/dcigettext.c.orig 2005-05-20 20:06:17.000000000 +0000 -+++ intl/dcigettext.c +--- gettext-runtime/intl/dcigettext.c.orig 2005-05-20 20:06:17.000000000 +0000 ++++ gettext-runtime/intl/dcigettext.c @@ -243,7 +243,9 @@ struct known_translation_t /* Root of the search tree with known translations. We can use this only if the system provides the `tsearch' function family. */ |