diff options
| author | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-22 04:40:31 +0800 |
|---|---|---|
| committer | mezz <mezz@df743ca5-7f9a-e211-a948-0013205c9059> | 2008-08-22 04:40:31 +0800 |
| commit | 1526d4d87ab98d77846119e82f73acc3b4ad729d (patch) | |
| tree | 19d96976d8b5603de651e94b2c987b003a2b8bbd /x11-toolkits | |
| parent | 12865c6b294f9ac5d666607b8dcc9ace6d010b78 (diff) | |
| download | marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.gz marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.bz2 marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.lz marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.xz marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.tar.zst marcuscom-ports-1526d4d87ab98d77846119e82f73acc3b4ad729d.zip | |
Sync w/ FreeBSD ports.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@11363 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'x11-toolkits')
| -rw-r--r-- | x11-toolkits/gtk20/Makefile | 9 | ||||
| -rw-r--r-- | x11-toolkits/pango/Makefile | 4 |
2 files changed, 7 insertions, 6 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile index 513c30be5..476db6f64 100644 --- a/x11-toolkits/gtk20/Makefile +++ b/x11-toolkits/gtk20/Makefile @@ -3,7 +3,7 @@ # Whom: Vanilla I. Shu <vanilla@MinJe.com.TW> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.136 2008/08/06 03:47:24 mezz Exp $ +# $MCom: ports/x11-toolkits/gtk20/Makefile,v 1.137 2008/08/19 02:08:49 marcus Exp $ # PORTNAME= gtk @@ -61,13 +61,14 @@ 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 -PLIST_SUB+= CUPS:="" CONFIGURE_ARGS+=--enable-cups=auto +PLIST_SUB+= CUPS:="" .else -PLIST_SUB+= CUPS:="@comment " CONFIGURE_ARGS+=--disable-cups +PLIST_SUB+= CUPS:="@comment " .endif post-patch: diff --git a/x11-toolkits/pango/Makefile b/x11-toolkits/pango/Makefile index cf8fe5652..bddd62903 100644 --- a/x11-toolkits/pango/Makefile +++ b/x11-toolkits/pango/Makefile @@ -3,14 +3,14 @@ # Whom: Maxim Sobolev <sobomax@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/x11-toolkits/pango/Makefile,v 1.124 2008/06/17 04:36:16 marcus Exp $ +# $MCom: ports/x11-toolkits/pango/Makefile,v 1.125 2008/08/12 05:24:53 marcus Exp $ # PORTNAME= pango PORTVERSION= 1.21.4 PORTREVISION?= 0 CATEGORIES= x11-toolkits -MASTER_SITES= ${MASTER_SITE_GNOME:S,%SUBDIR%,sources/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \ +MASTER_SITES= GNOME \ ftp://ftp.gtk.org/pub/pango/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ DIST_SUBDIR= gnome2 |