diff options
| author | Jeremy Messenger <mezz@FreeBSD.org> | 2008-03-28 04:34:02 +0000 |
|---|---|---|
| committer | Jeremy Messenger <mezz@FreeBSD.org> | 2008-03-28 04:34:02 +0000 |
| commit | 68c9624db0cbfe854cb8b50ed9f7980e7afd95a9 (patch) | |
| tree | 4cd3ddae9c758775965adf35b7fabee35fb97fbe /x11-toolkits | |
| parent | 8dc5a0fde03d312ae8a70b48e1fcafaea6022487 (diff) | |
| download | ports-68c9624db0cbfe854cb8b50ed9f7980e7afd95a9.tar.gz ports-68c9624db0cbfe854cb8b50ed9f7980e7afd95a9.zip | |
Notes
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 7 | ||||
| -rw-r--r-- | x11-toolkits/gtk30/Makefile | 7 |
2 files changed, 10 insertions, 4 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 8dddd6e5078d..13e10e3a5e9a 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.12.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -64,10 +64,13 @@ CONFIGURE_ARGS+= --enable-debug=yes .include <bsd.port.pre.mk> -.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so) +.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \ + !defined(WITHOUT_CUPS) LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +CONFIGURE_ARGS+=--enable-cups=auto PLIST_SUB+= CUPS:="" .else +CONFIGURE_ARGS+=--disable-cups PLIST_SUB+= CUPS:="@comment " .endif diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile index 8dddd6e5078d..13e10e3a5e9a 100644 --- a/x11-toolkits/gtk30/Makefile +++ b/x11-toolkits/gtk30/Makefile @@ -8,7 +8,7 @@ PORTNAME= gtk PORTVERSION= 2.12.9 -PORTREVISION?= 0 +PORTREVISION?= 1 CATEGORIES= x11-toolkits MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/gtk+/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/,} \ ftp://ftp.gtk.org/pub/gtk/%SUBDIR%/ \ @@ -64,10 +64,13 @@ CONFIGURE_ARGS+= --enable-debug=yes .include <bsd.port.pre.mk> -.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so) +.if (defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)) && \ + !defined(WITHOUT_CUPS) LIB_DEPENDS+= cups.2:${PORTSDIR}/print/cups-base +CONFIGURE_ARGS+=--enable-cups=auto PLIST_SUB+= CUPS:="" .else +CONFIGURE_ARGS+=--disable-cups PLIST_SUB+= CUPS:="@comment " .endif |