diff options
| author | mycroft <mycroft> | 2000-11-09 20:14:48 +0000 |
|---|---|---|
| committer | mycroft <mycroft> | 2000-11-09 20:14:48 +0000 |
| commit | 1cd57bb0ecdefa0568115baa472f654d5a19af12 (patch) | |
| tree | e40c75843aaee3239571fc33c105a5798afeda85 | |
| parent | 5bc75800e68632a9226ebcada3451dfda6e33436 (diff) | |
| download | pkgsrc-1cd57bb0ecdefa0568115baa472f654d5a19af12.tar.gz | |
Remove previous changes to override LIBINTL and DATADIRNAME in configure.
Instead, do the ${LOCALEBASE} substitution in configure.in and rebuild it.
| -rw-r--r-- | misc/gnome-pim/Makefile | 13 | ||||
| -rw-r--r-- | misc/gnome-pim/files/patch-sum | 4 | ||||
| -rw-r--r-- | misc/gnome-pim/patches/patch-ab | 26 |
3 files changed, 25 insertions, 18 deletions
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile index 0478cbe903c..87d59e73b89 100644 --- a/misc/gnome-pim/Makefile +++ b/misc/gnome-pim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2000/10/28 13:14:16 tron Exp $ +# $NetBSD: Makefile,v 1.19 2000/11/09 20:14:48 mycroft Exp $ # DISTNAME= gnome-pim-1.2.0 @@ -8,9 +8,12 @@ MASTER_SITES= ${MASTER_SITE_GNOME:=stable/sources/gnome-pim/} MAINTAINER= rh@netbsd.org HOMEPAGE= http://www.gnome.org/ -BUILD_DEPENDS= ${LOCALBASE}/bin/bison:../../devel/bison +BUILD_DEPENDS+= autoreconf:../../devel/autoconf +BUILD_DEPENDS+= automake:../../devel/automake +BUILD_DEPENDS+= bison:../../devel/bison DEPENDS+= gnome-core-*:../../x11/gnome-core +USE_GMAKE= # defined USE_X11BASE= # defined GNU_CONFIGURE= # defined @@ -19,6 +22,12 @@ CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include" \ PLIST_SUBST+= LOCALEBASE=${LOCALEBASE} +AUTOGEN_ENV= NOCONFIGURE=1 +AUTOGEN_ENV+= srcdir=${WRKSRC} + +pre-configure: + cd ${WRKSRC} && ${SETENV} ${AUTOGEN_ENV} ${SH} macros/autogen.sh + .include "../../mk/bsd.prefs.mk" # The directory in which locale files are found is: diff --git a/misc/gnome-pim/files/patch-sum b/misc/gnome-pim/files/patch-sum index ffc49a982f9..b938aa49f04 100644 --- a/misc/gnome-pim/files/patch-sum +++ b/misc/gnome-pim/files/patch-sum @@ -1,4 +1,4 @@ -$NetBSD: patch-sum,v 1.5 2000/10/23 17:06:57 jlam Exp $ +$NetBSD: patch-sum,v 1.6 2000/11/09 20:14:48 mycroft Exp $ MD5 (patch-aa) = aec56861a229f8fca23a02dbd951a264 -MD5 (patch-ab) = d6acc7732cf4d297ecda0f0b692c6681 +MD5 (patch-ab) = cff556b275e4903a8b33cdc6bc5038ad diff --git a/misc/gnome-pim/patches/patch-ab b/misc/gnome-pim/patches/patch-ab index a9e52f053ae..50c7a171e39 100644 --- a/misc/gnome-pim/patches/patch-ab +++ b/misc/gnome-pim/patches/patch-ab @@ -1,15 +1,13 @@ -$NetBSD: patch-ab,v 1.3 2000/10/23 17:06:57 jlam Exp $ +$NetBSD: patch-ab,v 1.4 2000/11/09 20:14:48 mycroft Exp $ ---- configure.orig Sat May 20 21:50:23 2000 -+++ configure -@@ -6393,6 +6393,10 @@ - - - -+# Set DATADIRNAME to "${LOCALEBASE}" -+DATADIRNAME="${LOCALEBASE}" -+INTLDEPS= -+INTLLIBS="-lintl" - - trap '' 1 2 15 - cat > confcache <<\EOF +--- aclocal.m4.orig Sun May 21 01:50:15 2000 ++++ aclocal.m4 Thu Nov 9 19:49:00 2000 +@@ -1439,7 +1439,7 @@ + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo +- DATADIRNAME=lib]) ++ DATADIRNAME=${LOCALEBASE}]) + INSTOBJEXT=.mo + fi + fi |