diff options
| author | mezz <mezz@FreeBSD.org> | 2008-03-28 12:34:02 +0800 |
|---|---|---|
| committer | mezz <mezz@FreeBSD.org> | 2008-03-28 12:34:02 +0800 |
| commit | 45139b2f12f17c16c076274ce92e57afab060ee6 (patch) | |
| tree | 0d1a8021f8cb0ce7b1b127370ee54607dce726ef | |
| parent | 7d3a491666c11e72342bae94bfd92327ddb9dc8c (diff) | |
| download | freebsd-ports-gnome-45139b2f12f17c16c076274ce92e57afab060ee6.tar.gz freebsd-ports-gnome-45139b2f12f17c16c076274ce92e57afab060ee6.tar.zst freebsd-ports-gnome-45139b2f12f17c16c076274ce92e57afab060ee6.zip | |
-Fix enable CUPS by add --enable-cups=auto. [1]
-Respect the WITHOUT_CUPS with autocheck. [2]
-Bump the PORTREVISION.
PR: ports/120520 [2]
Submitted by: Subscriptions <subs@j79zlr.com> [1]
Naram Qashat <cyberbotx@cyberbotx.com> [2]
| -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 |