aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2006-10-26 05:19:26 +0800
committermarcus <marcus@FreeBSD.org>2006-10-26 05:19:26 +0800
commit04816c87c9229381d898552c06a3cc28042fe382 (patch)
tree0df7b02f5334e7f057fea1a89957b2e59f367d87
parentc6c5781bf42cb118296dbf0ff5eede268c4ecfc6 (diff)
downloadfreebsd-ports-gnome-04816c87c9229381d898552c06a3cc28042fe382.tar.gz
freebsd-ports-gnome-04816c87c9229381d898552c06a3cc28042fe382.tar.zst
freebsd-ports-gnome-04816c87c9229381d898552c06a3cc28042fe382.zip
Fix gtkprint with users that have cups-base installed, but who are
using lpr instead of CUPS for printing. With this fix, CUPS users should be able to print to file, CUPS printers, and BSD lpr printers. Non-CUPS users should be able to print to file and BSD lpr printers. Approved by: portmgr (implicit)
-rw-r--r--x11-toolkits/gtk20/Makefile4
-rw-r--r--x11-toolkits/gtk30/Makefile4
2 files changed, 6 insertions, 2 deletions
diff --git a/x11-toolkits/gtk20/Makefile b/x11-toolkits/gtk20/Makefile
index 5a1783c426e3..937047d3b0f9 100644
--- a/x11-toolkits/gtk20/Makefile
+++ b/x11-toolkits/gtk20/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.10.6
-PORTREVISION?= 1
+PORTREVISION?= 2
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/v2.10/ \
@@ -117,6 +117,8 @@ post-patch:
s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
${WRKSRC}/demos/gtk-demo/Makefile.in
@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
+ @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
+ ${WRKSRC}/gtk/Makefile.in
pre-build:
@${RM} -rf ${WRKSRC}/docs/gtk.info*
diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index 5a1783c426e3..937047d3b0f9 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -8,7 +8,7 @@
PORTNAME= gtk
PORTVERSION= 2.10.6
-PORTREVISION?= 1
+PORTREVISION?= 2
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/v2.10/ \
@@ -117,6 +117,8 @@ post-patch:
s|@LDFLAGS@|& ${PTHREAD_LIBS}|' \
${WRKSRC}/demos/gtk-demo/Makefile.in
@${REINPLACE_CMD} -e 's|@LN_S@|${LN} -sf|' ${WRKSRC}/gtk/Makefile.in
+ @${REINPLACE_CMD} -e 's|file,cups|file,cups,lpr|' \
+ ${WRKSRC}/gtk/Makefile.in
pre-build:
@${RM} -rf ${WRKSRC}/docs/gtk.info*