summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-07-29 09:34:45 +0800
committerahze <ahze@df743ca5-7f9a-e211-a948-0013205c9059>2005-07-29 09:34:45 +0800
commit7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee (patch)
treec9f18eca0104c15467ed7bdbc472c8bc6cfb6e8c
parentffc27e7fdba51d3b90e0c18c145864847cbb88c5 (diff)
downloadmarcuscom-ports-7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee.tar
marcuscom-ports-7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee.tar.gz
marcuscom-ports-7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee.tar.bz2
marcuscom-ports-7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee.tar.lz
marcuscom-ports-7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee.tar.xz
marcuscom-ports-7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee.tar.zst
marcuscom-ports-7d4d7f0801def4618ea9e2e15a5a8c515cfae9ee.zip
- Revert back to cups being disabled by default since libgnomecups didn't
make it. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4351 df743ca5-7f9a-e211-a948-0013205c9059
-rw-r--r--print/libgnomeprint/Makefile16
1 files changed, 6 insertions, 10 deletions
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 7223d8bd9..49ab61b93 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -3,12 +3,12 @@
# Whom: Vanilla I. Shu <vanilla@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/print/libgnomeprint/Makefile,v 1.46 2005/07/19 07:26:38 ahze Exp $
+# $MCom: ports/print/libgnomeprint/Makefile,v 1.47 2005/07/20 10:26:25 ahze Exp $
#
PORTNAME= libgnomeprint
PORTVERSION= 2.11.0
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= print gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/2.11
@@ -36,11 +36,7 @@ PLIST_SUB= VERSION=${PORTVERSION} \
.include <bsd.port.pre.mk>
-.if exists(${LOCALBASE}/lib/libcups.so)
-WITH_CUPS= yes
-.endif
-
-.if !defined(WITHOUT_CUPS)
+.if defined(WITH_CUPS) || exists(${LOCALBASE}/lib/libcups.so)
CONFIGURE_ARGS+= --with-cups
LIB_DEPENDS+= gnomecups-1.0:${PORTSDIR}/print/libgnomecups
PLIST_SUB+= CUPS:=""
@@ -50,9 +46,9 @@ PLIST_SUB+= CUPS:="@comment "
.endif
pre-everything::
-.if !defined(WITHOUT_CUPS)
- @${ECHO_MSG} " Disable cups support by defining"
- @${ECHO_MSG} " WITHOUT_CUPS"
+.if !defined(WITH_CUPS)
+ @${ECHO_MSG} " Enagle cups support by defining"
+ @${ECHO_MSG} " WITH_CUPS"
@${ECHO_MSG} ""
.endif