summaryrefslogtreecommitdiff
path: root/print
diff options
context:
space:
mode:
Diffstat (limited to 'print')
-rw-r--r--print/apsfilter/Makefile4
-rw-r--r--print/cups-smb-backend/Makefile7
-rw-r--r--print/gnome-cups-manager/Makefile8
3 files changed, 9 insertions, 10 deletions
diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile
index 483678c211b2..79da472e02bd 100644
--- a/print/apsfilter/Makefile
+++ b/print/apsfilter/Makefile
@@ -3,7 +3,7 @@
PORTNAME= apsfilter
PORTVERSION= 7.2.8
-PORTREVISION= 18
+PORTREVISION= 19
CATEGORIES= print
MASTER_SITES= http://www.apsfilter.org/download/
DIST_SUBDIR= apsfilter
@@ -51,6 +51,7 @@ DOCS_MAKE_ARGS= -DDOCS
PORTDOCS= ANNOUNCE FAQ HOWTO-BUGREPORTS apsfilter4.png \
README.BSD handbook.html README.TeX paper
GS_USES= ghostscript:run
+SAMBA_USES= samba:run
.include <bsd.port.options.mk>
@@ -108,7 +109,6 @@ _DEPENDS_FIG2DEV= \
_DEPENDS_HTML2PS= \
html2ps:print/html2ps
_DEPENDS_ATALK= pap:net/netatalk
-_DEPENDS_SAMBA= smbclient:net/samba36
_DEPENDS_MP3= mpg321:audio/mpg321
_DEPENDS_OGG= ogg123:audio/vorbis-tools
_DEPENDS_WAV= wavplay:audio/wavplay
diff --git a/print/cups-smb-backend/Makefile b/print/cups-smb-backend/Makefile
index ca688f85e8f8..0918ade62246 100644
--- a/print/cups-smb-backend/Makefile
+++ b/print/cups-smb-backend/Makefile
@@ -3,7 +3,7 @@
PORTNAME= cups-smb-backend
PORTVERSION= 1.0
-PORTREVISION= 7
+PORTREVISION= 8
CATEGORIES= print
MASTER_SITES= # empty
DISTFILES= # empty
@@ -11,12 +11,11 @@ DISTFILES= # empty
MAINTAINER= ports@FreeBSD.org
COMMENT= CUPS backend for printing to Windows servers
-RUN_DEPENDS= smbspool:net/${SAMBA_PORT} \
- ${LOCALBASE}/sbin/cupsd:print/cups
+RUN_DEPENDS= ${LOCALBASE}/sbin/cupsd:print/cups
+USES= samba:run # smbspool
NO_BUILD= yes
PLIST_FILES= libexec/cups/backend/smb
-SAMBA_PORT?= samba36
SUB_FILES= pkg-message
do-install:
diff --git a/print/gnome-cups-manager/Makefile b/print/gnome-cups-manager/Makefile
index 668bb662a593..12515d62bd4f 100644
--- a/print/gnome-cups-manager/Makefile
+++ b/print/gnome-cups-manager/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gnome-cups-manager
PORTVERSION= 0.31
-PORTREVISION= 16
+PORTREVISION= 17
PORTEPOCH= 1
CATEGORIES= print gnome
MASTER_SITES= GNOME
@@ -16,15 +16,15 @@ COMMENT= Administration tool for cups
LIB_DEPENDS= libgnomecups-1.0.so:print/libgnomecups
RUN_DEPENDS= gnomesu:security/libgnomesu
-USES= gettext gmake libtool pathfix pkgconfig tar:bzip2
+USES= gettext gmake libtool pathfix pkgconfig samba:lib tar:bzip2
USE_GNOME= gnomeprefix intlhack libgnomeprintui libgnomeui
USE_LDCONFIG= yes
USE_XORG= x11
INSTALLS_ICONS= yes
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
-CPPFLAGS+= -I${LOCALBASE}/include -D_IPP_PRIVATE_STRUCTURES
-LIBS+= -L${LOCALBASE}/lib
+CPPFLAGS+= -I${LOCALBASE}/include -I${SAMBAINCLUDES} -D_IPP_PRIVATE_STRUCTURES
+LIBS+= -L${LOCALBASE}/lib -L${SAMBALIBS}
post-patch:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|' \