This is a new file. It will eventually replace Makefile.inc, which will then be

taken out back, shot, and fed to the 'raptors. In the meantime, I'm done with
working on this port for tonight, and so CVS is my offsite backup system.

1 files changed, 43 insertions, 21 deletions

diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common
index 7bc74296c88..8d25ac89cbd 100644
--- a/print/cups/Makefile.common
+++ b/print/cups/Makefile.common
@@ -2,31 +2,41 @@
 # $FreeBSD$
 
 MASTER_SITES=	\
-		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
-		ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \
-		ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
-		ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
-		ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
-
-CUPS_VERSION=	1.1.15
-CUPS_REVISION=	1
-CUPS_PORTVER=	${CUPS_VERSION}.${CUPS_REVISION}
+    ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
+    ftp://ftp.ntua.gr/pub/gnu/cups/${CUPS_VERSION}/ \
+    ftp://ftp.easysw.com/pub/cups/${CUPS_VERSION}/ \
+    ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
+    ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
+
+CUPS_VERSION=	1.1.16
+CUPS_REVISION=	0
+
+CUPS_USER=	daemon
+CUPS_GROUP=	daemon
+LOCALSTATEDIR=	/var
+SPOOLDIR=	${LOCALSTATEDIR}/spool/cups
+OPTFLAGS?=	""
 
 .ifdef CUPS_FR
 MANLANG=	"" fr
 .else
-EXTRA_PATCHES=${.CURDIR}/../../print/cups/files/fr-patch-man-Makefile
+#EXTRA_PATCHES=${.CURDIR}/../../print/cups/files/fr-patch-man-Makefile
 .endif
 
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-Makefile
-EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-fr-Makefile
+#EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-Makefile
+#EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-man-fr-Makefile
 EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-config-scripts-cups-common.m4
 EXTRA_PATCHES+=${.CURDIR}/../../print/cups/files/patch-Makedefs.in
 
 #protect the base port
 .if ${PORTNAME} != "cups"
+.if ${CUPS_REVISION} == 0
+CUPS_PORTVER=	${CUPS_VERSION}
+DISTNAME=	cups-${CUPS_VERSION}-source
+.else # ${CUPS_REVISION} != 0
+CUPS_PORTVER=	${CUPS_VERSION}.${CUPS_REVISION}
 DISTNAME=	cups-${CUPS_VERSION}-${CUPS_REVISION}-source
-#DISTNAME=	cups-${CUPS_VERSION}-source
+.endif # ${CUPS_REVISION} != 0
 DISTFILES=	${DISTNAME}.tar.bz2
 WRKSRC=		${WRKDIR}/cups-${CUPS_VERSION}
 
@@ -34,13 +44,6 @@ USE_BZIP2=	yes
 #Breaks build.. USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
-CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
-CONFIGURE_ENV+=	CPPFLAGS="-I${PREFIX}/include"
-CONFIGURE_ENV+=	DSOFLAGS="-L${PREFIX}/lib"
-CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib"
-
-CONFIGURE_ARGS+= --localstatedir=/var
-
 AUTOCONF=	autoconf
 BUILD_DEPENDS+=	autoconf:${PORTSDIR}/devel/autoconf
 
@@ -48,7 +51,26 @@ LIB_DEPENDS+=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png \
 		tiff.4:${PORTSDIR}/graphics/tiff
 
+CONFIGURE_ENV+=	CFLAGS="${CFLAGS}"
+CONFIGURE_ENV+=	CPPFLAGS="-I${PREFIX}/include -I${X11BASE}/include"
+CONFIGURE_ENV+=	DSOFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV+=	LDFLAGS="-L${PREFIX}/lib -L${X11BASE}/lib"
+
+CONFIGURE_ARGS+=							\
+	--localstatedir=${LOCALSTATEDIR}				\
+	--with-cups-user=${CUPS_USER} --with-cups-group=${CUPS_GROUP}	\
+	--with-rcdir=${PREFIX}/etc/rc.d --without-pam
+
+COMPONENT=	${PORTNAME}
+MAKE_ARGS+=	COMPONENT=${COMPONENT}
+
 post-patch::
+	${RM} -f ${WRKSRC}/man/Makefile
+	${CP} -f ${.CURDIR}/../../print/cups/man-Makefile \
+		${WRKSRC}/man/Makefile
+	${CP} -f ${FILESDIR}/manfiles.${COMPONENT} \
+		${WRKSRC}/man/manfiles.${COMPONENT}
 	cd ${WRKSRC}; ${AUTOCONF} --force
-.endif
+
+.endif # ${PORTNAME} != "cups"