This patch makes a handful of packaging changes:
- Moves some WANTLIBs into LIB_DEPENDS to make the dependency tracker
happy.
- Adds a 'gtk' flavor so that the whole Gtk UI stack doesn't get pulled
in in order to build the optional gconf-sanity-checker program.
- Eliminate a redundant (I think) @unexec in PLIST.
(No maintainer is listed)
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/gconf2/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile 24 May 2005 21:37:09 -0000 1.10
+++ Makefile 14 Jul 2005 21:37:05 -0000
@@ -4,7 +4,7 @@
VERSION= 2.10.0
DISTNAME= GConf-${VERSION}
-PKGNAME= gconf2-${VERSION}
+PKGNAME= gconf2-${VERSION}p1
CATEGORIES= devel
HOMEPAGE= http://www.gnome.org/projects/gconf/
@@ -16,19 +16,19 @@
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS= ORBit-2::devel/ORBit2 \
-
gdk-x11-2.0.0.0,gdk_pixbuf-2.0.0.0,gtk-x11-2.0.0.0::x11/gtk+2 \
+
glib-2.0.0.0,gmodule-2.0.0.0,gobject-2.0.0.0,gthread-2.0.0.0::devel/glib2 \
+ popt::devel/popt \
xml2.6::textproc/libxml
+FLAVORS= gtk
+FLAVOR?=
+
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
-WANTLIB= X11 Xft Xrender atk-1.0.0.0 c \
- fontconfig freetype glib-2.0.0.0 gmodule-2.0.0.0 \
- gobject-2.0.0.0 gthread-2.0.0.0 m pango-1.0.0.0 \
- pangoft2-1.0.0.0 pangox-1.0.0.0 pangoxft-1.0.0.0 \
- popt pthread z
+WANTLIB= c m pthread z
SEPARATE_BUILD= concurrent
@@ -38,10 +38,19 @@
USE_GMAKE= Yes
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
-CONFIGURE_ARGS+= --disable-gtk-conf
CONFIGURE_ARGS+= --enable-gconf-source=${DEFAULT_GCONF_SOURCE}
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
+
+.if ${FLAVOR:L:Mgtk}
+LIB_DEPENDS+=
gdk-x11-2.0.0.3,gdk_pixbuf-2.0.0.3,gtk-x11-2.0.0.3::x11/gtk+2 \
+
pango-1.0.0.0,pangox-1.0.0.0,pangoft2-1.0.0.0,pangoxft-1.0.0.0::devel/pango \
+ atk-1.0.0.0::devel/atk
+WANTLIB+= X11 Xft Xrender fontconfig freetype
+CONFIGURE_ARGS+= --enable-gtk
+.else
+CONFIGURE_ARGS+= --disable-gtk
+.endif
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/examples/gconf2; \
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/gconf2/pkg/PLIST,v
retrieving revision 1.11
diff -u -r1.11 PLIST
--- pkg/PLIST 24 May 2005 21:37:09 -0000 1.11
+++ pkg/PLIST 14 Jul 2005 21:37:05 -0000
@@ -24,7 +24,7 @@
lib/libgconf-2.la
lib/pkgconfig/
lib/pkgconfig/gconf-2.0.pc
-libexec/gconf-sanity-check-2
+%%gtk%%
libexec/gconfd-2
@man man/man1/gconftool-2.1
share/aclocal/gconf-2.m4
@@ -187,4 +187,3 @@
share/sgml/gconf/
share/sgml/gconf/gconf-1.0.dtd
%%SHARED%%
[EMAIL PROTECTED] rmdir ${SYSCONFDIR}/gconf 2>/dev/null || true
