diff options
author | jmmv <jmmv> | 2003-02-05 22:06:45 +0000 |
---|---|---|
committer | jmmv <jmmv> | 2003-02-05 22:06:45 +0000 |
commit | 0c4fa0ad9e427f49742670b3fe174571d59094c6 (patch) | |
tree | f7c161fb481f9530690c4178987f1d7e08b735f5 /devel/GConf2 | |
parent | bc9f384516d0d852da6c3b39d9b9e2b8b8063ce9 (diff) | |
download | pkgsrc-0c4fa0ad9e427f49742670b3fe174571d59094c6.tar.gz |
Modify the package for the shortcoming GConf2-ui (which will use the
new Makefile.common). Reviewed by wiz.
Diffstat (limited to 'devel/GConf2')
-rw-r--r-- | devel/GConf2/Makefile | 28 | ||||
-rw-r--r-- | devel/GConf2/Makefile.common | 31 | ||||
-rw-r--r-- | devel/GConf2/distinfo | 4 | ||||
-rw-r--r-- | devel/GConf2/patches/patch-aa | 21 |
4 files changed, 44 insertions, 40 deletions
diff --git a/devel/GConf2/Makefile b/devel/GConf2/Makefile index 3cdd19e9619..d39aa1ae7e4 100644 --- a/devel/GConf2/Makefile +++ b/devel/GConf2/Makefile @@ -1,30 +1,12 @@ -# $NetBSD: Makefile,v 1.12 2003/01/25 16:29:49 jmmv Exp $ +# $NetBSD: Makefile,v 1.13 2003/02/05 22:06:45 jmmv Exp $ # -DISTNAME= GConf-1.2.1 -PKGNAME= ${DISTNAME:S/GConf/GConf2/} -PKGREVISION= 5 -CATEGORIES= devel gnome -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/1.2/} -EXTRACT_SUFX= .tar.bz2 +.include "../../devel/GConf2/Makefile.common" -MAINTAINER= jmmv@netbsd.org -HOMEPAGE= http://advogato.org/proj/GConf/ -COMMENT= configuration database system used by GNOME (v2) +PKGNAME= ${DISTNAME:S/GConf/GConf2/} +PKGREVISION= 5 -BUILD_USES_MSGFMT= yes - -USE_BUILDLINK2= yes -USE_PKGLOCALEDIR= yes -GNU_CONFIGURE= yes -USE_LIBTOOL= yes -USE_GMAKE= yes -USE_PERL5= build - -LIBTOOL_OVERRIDE= ${WRKSRC}/libtool - -CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html -CONFIGURE_ARGS+= --enable-gtk-doc=no +CONFIGURE_ENV+= PKG_USE_GTK=no .include "../../devel/gettext-lib/buildlink2.mk" .include "../../devel/glib2/buildlink2.mk" diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common new file mode 100644 index 00000000000..a1c67ae303f --- /dev/null +++ b/devel/GConf2/Makefile.common @@ -0,0 +1,31 @@ +# $NetBSD: Makefile.common,v 1.1 2003/02/05 22:06:45 jmmv Exp $ +# + +DISTNAME= GConf-1.2.1 +CATEGORIES= devel gnome +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/GConf/1.2/} +EXTRACT_SUFX= .tar.bz2 + +MAINTAINER= jmmv@netbsd.org +HOMEPAGE= http://advogato.org/proj/GConf/ +COMMENT= configuration database system used by GNOME (v2) + +BUILD_USES_MSGFMT= yes + +DISTINFO_FILE= ${.CURDIR}/../GConf2/distinfo +FILESDIR= ${.CURDIR}/../GConf2/files +PATCHDIR= ${.CURDIR}/../GConf2/patches +PKGDIR= ${.CURDIR}/../GConf2 +PLIST_SRC= ${.CURDIR}/PLIST + +USE_BUILDLINK2= yes +USE_PKGLOCALEDIR= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_GMAKE= yes +USE_PERL5= build + +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + +CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html +CONFIGURE_ARGS+= --enable-gtk-doc=no diff --git a/devel/GConf2/distinfo b/devel/GConf2/distinfo index 560ded6f50f..d65cc691b70 100644 --- a/devel/GConf2/distinfo +++ b/devel/GConf2/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2003/01/25 16:29:50 jmmv Exp $ +$NetBSD: distinfo,v 1.5 2003/02/05 22:06:45 jmmv Exp $ SHA1 (GConf-1.2.1.tar.bz2) = a0b585dbfbd598380bd4e40f275ff478b196eefc Size (GConf-1.2.1.tar.bz2) = 954798 bytes -SHA1 (patch-aa) = 9a8f02de1d4b15a0d93387b78e29ad8b276363b9 +SHA1 (patch-aa) = 140463db01048861197fbaf4fe3940f23e11ae46 diff --git a/devel/GConf2/patches/patch-aa b/devel/GConf2/patches/patch-aa index 425da649053..7736a36d9f4 100644 --- a/devel/GConf2/patches/patch-aa +++ b/devel/GConf2/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1 2003/01/25 16:29:50 jmmv Exp $ +$NetBSD: patch-aa,v 1.2 2003/02/05 22:06:45 jmmv Exp $ Disable GTK2 support. This is a workaround until bug #102825 gets fixed. See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details. @@ -9,11 +9,11 @@ See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details. fi -+if false; then ++if [ "$PKG_USE_GTK" = "yes" ]; then if test "$PKG_CONFIG" = "no" ; then echo "*** The pkg-config script could not be found. Make sure it is" echo "*** in your path, or set the PKG_CONFIG environment variable" -@@ -8150,12 +8151,14 @@ echo "${ECHO_T}$DEPENDENT_WITH_GTK_LIBS" +@@ -8150,6 +8151,7 @@ echo "${ECHO_T}$DEPENDENT_WITH_GTK_LIBS" echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi @@ -21,28 +21,19 @@ See http://bugzilla.gnome.org/show_bug.cgi?id=102825 for more details. if test $succeeded = yes; then HAVE_GTK=yes - else - HAVE_GTK=no - fi -+HAVE_GTK=no - - - succeeded=no -@@ -8203,6 +8206,7 @@ fi +@@ -8203,6 +8205,7 @@ fi fi -+if false; then ++if [ "$PKG_USE_GTK" = "yes" ]; then if test "$PKG_CONFIG" = "no" ; then echo "*** The pkg-config script could not be found. Make sure it is" echo "*** in your path, or set the PKG_CONFIG environment variable" -@@ -8246,7 +8250,9 @@ echo "${ECHO_T}$DEPENDENT_WITH_XML_AND_G +@@ -8246,6 +8249,7 @@ echo "${ECHO_T}$DEPENDENT_WITH_XML_AND_G echo "*** See http://www.freedesktop.org/software/pkgconfig" fi fi +fi -+succeeded=no if test $succeeded = yes; then : - else |