diff options
author | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-01-09 23:15:21 +0000 |
---|---|---|
committer | Maxim Sobolev <sobomax@FreeBSD.org> | 2002-01-09 23:15:21 +0000 |
commit | e572405e974ddf1e86cd1e1fa81031f72844b807 (patch) | |
tree | d95451e4b02d6e1ebfebf57e7d444adaabe1b030 | |
parent | f8994d9a0b78d135ad889f2ab2cb08681bbc5ae6 (diff) | |
download | ports-e572405e974ddf1e86cd1e1fa81031f72844b807.tar.gz ports-e572405e974ddf1e86cd1e1fa81031f72844b807.zip |
Rework oprional dependency mechanism, so that it always produces -gnome
version of the package on bento.
Notes
Notes:
svn path=/head/; revision=52834
-rw-r--r-- | x11-toolkits/rep-gtk/Makefile | 8 | ||||
-rw-r--r-- | x11-toolkits/rep-gtk2/Makefile | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/x11-toolkits/rep-gtk/Makefile b/x11-toolkits/rep-gtk/Makefile index f01992c042cb..8a10e0911c2d 100644 --- a/x11-toolkits/rep-gtk/Makefile +++ b/x11-toolkits/rep-gtk/Makefile @@ -27,10 +27,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) || defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME +.if defined(HAVE_GNOME) USE_GNOME= yes CONFIGURE_ARGS= --with-gnome --with-libglade --with-gdk-pixbuf \ --with-gnome-canvas-pixbuf diff --git a/x11-toolkits/rep-gtk2/Makefile b/x11-toolkits/rep-gtk2/Makefile index f01992c042cb..8a10e0911c2d 100644 --- a/x11-toolkits/rep-gtk2/Makefile +++ b/x11-toolkits/rep-gtk2/Makefile @@ -27,10 +27,14 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LIBS="-L${LOCALBASE}/lib" CONFIGURE_TARGET= ${ARCH}-pc-freebsd${OSREL:C/\..*//} +.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD) +.undef WITHOUT_GNOME +WITH_GNOME= yes +.endif + .include <bsd.port.pre.mk> -.if defined(HAVE_GNOME) || defined(PACKAGE_BUILDING) -.undef WITHOUT_GNOME +.if defined(HAVE_GNOME) USE_GNOME= yes CONFIGURE_ARGS= --with-gnome --with-libglade --with-gdk-pixbuf \ --with-gnome-canvas-pixbuf |