Date: Fri, 27 Mar 2009 16:29:37 -0500 (CDT) From: "Sean C. Farley" <scf@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: dinoex@FreeBSD.org Subject: ports/133136: [PATCH] print/cups-base: install without executables Message-ID: <200903272129.n2RLTb48061574@thor.farley.org> Resent-Message-ID: <200903272130.n2RLU1tl029182@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 133136
>Category: ports
>Synopsis: [PATCH] print/cups-base: install without executables
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 27 21:30:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Sean C. Farley
>Release: FreeBSD 7.1-STABLE i386
>Organization:
>Environment:
System: FreeBSD thor.farley.org 7.1-STABLE FreeBSD 7.1-STABLE #0 r189902M: Mon Mar 16 19:48:52 CDT
>Description:
This patch adds an options (default off) to install cups-base without
the executables. The allows java/openjdk6 (tested) and probably
java/jdk16 to build without the need for the cups's executables.
Port maintainer (dinoex@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- cups-base-1.3.9_4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/print/cups-base.orig/Makefile /usr/ports/print/cups-base/Makefile
--- /usr/ports/print/cups-base.orig/Makefile 2009-02-18 21:02:28.000000000 -0600
+++ /usr/ports/print/cups-base/Makefile 2009-03-27 16:24:33.000000000 -0500
@@ -7,8 +7,8 @@
PORTNAME= cups
PORTVERSION= 1.3.9
-PORTREVISION= 3
DISTVERSIONSUFFIX= -source
+PORTREVISION= 4
CATEGORIES= print
MASTER_SITES= EASYSW/${PORTNAME}/${DISTVERSION}
PKGNAMESUFFIX= -base${PKGNAMESUFFIX2}
@@ -26,7 +26,6 @@
USE_BZIP2= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
-USE_RC_SUBR= cupsd
CFLAGS+= ${PTHREAD_CFLAGS}
CPPFLAGS= -I${LOCALBASE}/include
LDFLAGS= -L${LOCALBASE}/lib
@@ -51,7 +50,8 @@
PAM "Build with PAM support" off \
LDAP "Build with LDAP support" off \
DBUS "Build with DBUS support" off \
- XDG_OPEN "Build with XDG_OPEN as browser" off
+ XDG_OPEN "Build with XDG_OPEN as browser" off \
+ EXECUTABLES "Build executables" on
CUPS_ETCDIR= ${PREFIX}/etc/cups
CUPS_SPOOLDIR= /var/spool/cups
@@ -65,6 +65,10 @@
.include <bsd.port.pre.mk>
+.if !defined(WITHOUT_EXECUTABLES)
+USE_RC_SUBR= cupsd
+.endif
+
.if defined(CUPS_OVERWRITE_BASE)
PLIST_SUB+= OVERWRITE=""
.else
@@ -135,6 +139,12 @@
RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils
.endif
+.if defined(WITHOUT_EXECUTABLES)
+PLIST_SUB+= EXECUTABLES="@comment "
+.else
+PLIST_SUB+= EXECUTABLES=""
+.endif
+
MAN1EXT= 1
MAN5EXT= 5
MAN7EXT= 7
@@ -195,6 +205,11 @@
.endif
@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
@${REINPLACE_CMD} -e '/share/s|/usr/share|${PREFIX}/share|g' ${WRKSRC}/Makefile
+.if defined(WITHOUT_EXECUTABLES)
+ @${REINPLACE_CMD} -e 's|berkeley||g' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|scheduler||g' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e 's|systemv||g' ${WRKSRC}/Makefile
+.endif
@${REINPLACE_CMD} -e 's|/etc/cups|/usr/local/etc/cups|g' ${WRKSRC}/man/*.man*
@${REINPLACE_CMD} -e 's|CXX="$$CC"||g ; s|-lpthreads.*;|${PTHREAD_LIBS};|g' \
-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
@@ -212,9 +227,11 @@
if test -e /usr/bin/lprm; then ${CHMOD} -h 0 /usr/bin/lprm; fi
if test -e /usr/sbin/lpc; then ${CHMOD} -h 0 /usr/sbin/lpc; fi
.endif
+.if defined(WITHOUT_EXECUTABLES)
+ ${INSTALL} -d ${CUPS_ETCDIR}/
+.endif
post-install:
- ${INSTALL} -d ${CUPS_ETCDIR}/
${CP} -p ${WRKSRC}/conf/snmp.conf ${WRKSRC}/conf/snmp.conf.N
.for f in cupsd.conf mime.convs mime.types snmp.conf
${INSTALL_DATA} ${WRKSRC}/conf/${f} ${CUPS_ETCDIR}/${f}.N
diff -ruN --exclude=CVS /usr/ports/print/cups-base.orig/pkg-plist /usr/ports/print/cups-base/pkg-plist
--- /usr/ports/print/cups-base.orig/pkg-plist 2008-10-15 10:26:24.000000000 -0500
+++ /usr/ports/print/cups-base/pkg-plist 2009-03-27 15:25:30.000000000 -0500
@@ -34,17 +34,17 @@
@exec if test ! -f %D/etc/cups/snmp.conf; then cp -p %D/etc/cups/snmp.conf.N %D/etc/cups/snmp.conf; fi
@exec chgrp cups %D/etc/cups
%%WITH_PAMD%%etc/pam.d/cups
-bin/cancel
+%%EXECUTABLES%%bin/cancel
bin/cups-config
-bin/cupstestdsc
-bin/cupstestppd
-bin/lp
-bin/lpoptions
-bin/lppasswd
-bin/lpq
-bin/lpr
-bin/lprm
-bin/lpstat
+%%EXECUTABLES%%bin/cupstestdsc
+%%EXECUTABLES%%bin/cupstestppd
+%%EXECUTABLES%%bin/lp
+%%EXECUTABLES%%bin/lpoptions
+%%EXECUTABLES%%bin/lppasswd
+%%EXECUTABLES%%bin/lpq
+%%EXECUTABLES%%bin/lpr
+%%EXECUTABLES%%bin/lprm
+%%EXECUTABLES%%bin/lpstat
etc/cups/cupsd.conf.default
include/cups/adminutil.h
include/cups/array.h
@@ -79,10 +79,10 @@
libexec/cups/cgi-bin/help.cgi
libexec/cups/cgi-bin/jobs.cgi
libexec/cups/cgi-bin/printers.cgi
-libexec/cups/daemon/cups-deviced
-libexec/cups/daemon/cups-driverd
-libexec/cups/daemon/cups-lpd
-libexec/cups/daemon/cups-polld
+%%EXECUTABLES%%libexec/cups/daemon/cups-deviced
+%%EXECUTABLES%%libexec/cups/daemon/cups-driverd
+%%EXECUTABLES%%libexec/cups/daemon/cups-lpd
+%%EXECUTABLES%%libexec/cups/daemon/cups-polld
libexec/cups/filter/gziptoany
libexec/cups/filter/hpgltops
libexec/cups/filter/imagetops
@@ -98,18 +98,18 @@
libexec/cups/monitor/tbcp
libexec/cups/notifier/mailto
libexec/cups/notifier/rss
-sbin/accept
-sbin/cupsaddsmb
-sbin/cupsctl
-sbin/cupsd
-sbin/cupsdisable
-sbin/cupsenable
-sbin/cupsfilter
-sbin/lpadmin
-sbin/lpc
-sbin/lpinfo
-sbin/lpmove
-sbin/reject
+%%EXECUTABLES%%sbin/accept
+%%EXECUTABLES%%sbin/cupsaddsmb
+%%EXECUTABLES%%sbin/cupsctl
+%%EXECUTABLES%%sbin/cupsd
+%%EXECUTABLES%%sbin/cupsdisable
+%%EXECUTABLES%%sbin/cupsenable
+%%EXECUTABLES%%sbin/cupsfilter
+%%EXECUTABLES%%sbin/lpadmin
+%%EXECUTABLES%%sbin/lpc
+%%EXECUTABLES%%sbin/lpinfo
+%%EXECUTABLES%%sbin/lpmove
+%%EXECUTABLES%%sbin/reject
%%DATADIR%%/banners/classified
%%DATADIR%%/banners/confidential
%%DATADIR%%/banners/secret
@@ -1777,8 +1777,8 @@
@dirrm libexec/cups/monitor
@dirrmtry libexec/cups/filter
@exec mkdir -p %D/libexec/cups/driver
-@dirrm libexec/cups/driver
-@dirrm libexec/cups/daemon
+%%EXECUTABLES%%@dirrm libexec/cups/driver
+%%EXECUTABLES%%@dirrm libexec/cups/daemon
@dirrm libexec/cups/cgi-bin
@dirrmtry libexec/cups/backend
@dirrmtry libexec/cups
--- cups-base-1.3.9_4.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903272129.n2RLTb48061574>