diff options
-rw-r--r-- | print/cups-base/Makefile | 21 | ||||
-rw-r--r-- | print/cups-base/distinfo | 2 | ||||
-rw-r--r-- | print/cups-base/files/patch-configure | 18 | ||||
-rw-r--r-- | print/cups-base/files/patch-cups.sh.in | 21 | ||||
-rw-r--r-- | print/cups-base/files/patch-data-Makefile | 10 | ||||
-rw-r--r-- | print/cups-base/pkg-plist | 19 | ||||
-rw-r--r-- | print/cups-lpr/Makefile | 28 | ||||
-rw-r--r-- | print/cups-lpr/distinfo | 2 | ||||
-rw-r--r-- | print/cups-lpr/files/patch-Makefile | 29 | ||||
-rw-r--r-- | print/cups-lpr/files/patch-configure | 18 | ||||
-rw-r--r-- | print/cups-lpr/pkg-message | 2 | ||||
-rw-r--r-- | print/cups/Makefile | 6 | ||||
-rw-r--r-- | print/cups/Makefile.common | 23 | ||||
-rw-r--r-- | print/cups/Makefile.inc | 23 | ||||
-rw-r--r-- | print/cups/distinfo | 2 |
15 files changed, 145 insertions, 79 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index f9a67ed..7ad2898 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -6,27 +6,12 @@ # PORTNAME= cups-base -PORTVERSION= ${VERSION} -PORTREVISION= 2 +PORTVERSION= ${CUPS_VERSION} CATEGORIES= print -MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \ - ftp://ftp2.easysw.com/pub/cups/${VERSION}/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \ - ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/ -DISTNAME= cups-${VERSION}-source - MAINTAINER= jah4007@cs.rit.edu -VERSION= 1.1.12 - -USE_BZIP2= yes INSTALLS_SHLIB= yes -WRKSRC= ${WRKDIR}/cups-${VERSION} - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=/var - MAN1= backend.1 filter.1 MAN3= cups-config.3 MAN5= classes.conf.5 cupsd.conf.5 mime.convs.5 mime.types.5 \ @@ -46,4 +31,6 @@ post-install: ${PREFIX}/etc/rc.d/cupsd.sh.sample @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/print/cups/Makefile.inc" +.include <bsd.port.post.mk> diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo index 14e6221..f871858 100644 --- a/print/cups-base/distinfo +++ b/print/cups-base/distinfo @@ -1 +1 @@ -MD5 (cups-1.1.12-source.tar.bz2) = 18e74aa115e9fdaa569685e6351f0ebc +MD5 (cups-1.1.14-source.tar.bz2) = 7cc9725d94568b24f5ade78fb7e26480 diff --git a/print/cups-base/files/patch-configure b/print/cups-base/files/patch-configure new file mode 100644 index 0000000..9e48416 --- /dev/null +++ b/print/cups-base/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.old Tue Feb 5 11:17:34 2002 ++++ configure Tue Feb 5 11:18:00 2002 +@@ -3224,13 +3224,13 @@ + DSO="\$(CC)" + DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.4,-soname,\$@ -shared \$(OPTIM)" + ;; +- OSF1* | Linux* | NetBSD* | OpenBSD*) ++ OSF1* | Linux* | NetBSD* | OpenBSD* | FreeBSD*) + LIBCUPS="libcups.so.2" + LIBCUPSIMAGE="libcupsimage.so.2" + DSO="\$(CC)" + DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)" + ;; +- Darwin* | FreeBSD*) ++ Darwin*) + LIBCUPS="libcups.2.dylib" + LIBCUPSIMAGE="libcupsimage.2.dylib" + DSO="ld" diff --git a/print/cups-base/files/patch-cups.sh.in b/print/cups-base/files/patch-cups.sh.in index 66c8738..cad2eaf 100644 --- a/print/cups-base/files/patch-cups.sh.in +++ b/print/cups-base/files/patch-cups.sh.in @@ -1,7 +1,7 @@ ---- cups.sh.in.orig Fri Nov 2 15:43:10 2001 -+++ cups.sh.in Sat Nov 17 12:25:49 2001 -@@ -63,6 +63,10 @@ - IS_ON=: +--- cups.sh.in.orig Sat Feb 2 23:26:44 2002 ++++ cups.sh.in Sat Feb 2 23:27:07 2002 +@@ -78,6 +78,10 @@ + IS_ON=/bin/true ;; + FreeBSD*) @@ -11,16 +11,7 @@ *) IS_ON=/bin/true ;; -@@ -104,7 +108,7 @@ - OSF1*) - pid=`ps -e | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` - ;; -- Linux* | NetBSD* | Darwin*) -+ Linux* | NetBSD* | Darwin* | FreeBSD*) - pid=`ps ax | awk '{if (match($5, ".*/cupsd$") || $5 == "cupsd") print $1}'` - ;; - *) -@@ -126,7 +130,8 @@ +@@ -141,7 +145,8 @@ exec_prefix=@exec_prefix@ @sbindir@/cupsd fi @@ -30,7 +21,7 @@ else $ECHO "cups: scheduler stopped." fi -@@ -135,7 +140,8 @@ +@@ -150,7 +155,8 @@ stop) if test "$pid" != ""; then kill $pid diff --git a/print/cups-base/files/patch-data-Makefile b/print/cups-base/files/patch-data-Makefile index 508fc84..b5c9741 100644 --- a/print/cups-base/files/patch-data-Makefile +++ b/print/cups-base/files/patch-data-Makefile @@ -1,10 +1,10 @@ ---- data/Makefile.orig Sat Aug 18 10:38:01 2001 -+++ data/Makefile Sat Aug 18 10:39:25 2001 -@@ -93,14 +93,14 @@ +--- data/Makefile.orig Thu Jan 31 09:53:42 2002 ++++ data/Makefile Sat Feb 2 23:34:44 2002 +@@ -97,14 +97,14 @@ for file in $(DATAFILES); do \ $(INSTALL_DATA) $$file $(DATADIR)/data; \ done -- -if test x$(PAMDIR) != x; then \ +- -if test x$(PAMDIR) != x$(BUILDROOT); then \ - $(INSTALL_DIR) $(PAMDIR); \ - if test -f /lib/security/pam_unix.so; then \ - $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \ @@ -12,7 +12,7 @@ - $(INSTALL_DATA) cups.pam $(PAMDIR)/cups; \ - fi \ - fi -+# -if test x$(PAMDIR) != x; then \ ++# -if test x$(PAMDIR) != x$(BUILDROOT); then \ +# $(INSTALL_DIR) $(PAMDIR); \ +# if test -f /lib/security/pam_unix.so; then \ +# $(INSTALL_DATA) cups.suse $(PAMDIR)/cups; \ diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist index ab15b6c..7c9c017 100644 --- a/print/cups-base/pkg-plist +++ b/print/cups-base/pkg-plist @@ -16,6 +16,7 @@ etc/cups/printers.conf.sample @exec test -f %B/printers.conf || cp %B/%f %B/printers.conf include/cups/cups.h include/cups/http.h +include/cups/image.h include/cups/ipp.h include/cups/language.h include/cups/md5.h @@ -69,6 +70,8 @@ share/cups/charsets/iso-8859-6 share/cups/charsets/iso-8859-7 share/cups/charsets/iso-8859-8 share/cups/charsets/iso-8859-9 +share/cups/charsets/koi8-r +share/cups/charsets/koi8-u share/cups/charsets/utf-8 share/cups/charsets/windows-1250 share/cups/charsets/windows-1251 @@ -287,12 +290,20 @@ share/doc/cups/sum.pdf share/doc/cups/svd.html share/doc/cups/svd.pdf share/locale/C/cups_C +share/locale/be/cups_be share/locale/cs/cups_cs share/locale/de/cups_de share/locale/en/cups_en share/locale/es/cups_es share/locale/fr/cups_fr +share/locale/he/cups_he share/locale/it/cups_it +share/locale/ru_RU.cp1251/cups_ru_RU.cp1251 +share/locale/ru_RU.koi8r/cups_ru_RU.koi8r +share/locale/sv/cups_sv +share/locale/uk/cups_uk +share/locale/uk_UA.cp1251/cups_uk_UA.cp1251 +share/locale/zh_CN/cups_zh_CN @exec mkdir -p /var/log/cups @unexec rmdir /var/log/cups 2>/dev/null || true @exec mkdir -p /var/spool/cups/tmp @@ -325,10 +336,18 @@ share/locale/it/cups_it @dirrm share/doc/cups/images @dirrm share/doc/cups @dirrm share/locale/C +@dirrm share/locale/be @dirrm share/locale/cs @dirrm share/locale/de @dirrm share/locale/en @dirrm share/locale/es @dirrm share/locale/fr +@dirrm share/locale/he @dirrm share/locale/it +@dirrm share/locale/ru_RU.cp1251 +@dirrm share/locale/ru_RU.koi8r +@dirrm share/locale/sv +@dirrm share/locale/uk +@dirrm share/locale/uk_UA.cp1251 +@dirrm share/locale/zh_CN @dirrm share/locale diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile index 2549f60..522a879 100644 --- a/print/cups-lpr/Makefile +++ b/print/cups-lpr/Makefile @@ -6,35 +6,23 @@ # PORTNAME= cups-lpr -PORTVERSION= ${VERSION} -PORTREVISION= 1 +PORTVERSION= ${CUPS_VERSION} CATEGORIES= print -MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \ - ftp://ftp2.easysw.com/pub/cups/${VERSION}/ \ - ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \ - ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/ -DISTNAME= cups-${VERSION}-source - MAINTAINER= jah4007@cs.rit.edu -VERSION= 1.1.12 - LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base -USE_BZIP2= yes - -WRKSRC= ${WRKDIR}/cups-${VERSION} - -GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=/var - -MAN1= cancel.1 lp.1 lpoptions.1 lpq.1 lpr.1 lprm.1 lpstat.1 \ +MAN1= lp.1 lpoptions.1 lpq.1 lpr.1 lprm.1 lpstat.1 \ lppasswd.1 -MAN8= accept.8 disable.8 enable.8 lpadmin.8 lpc.8 lpinfo.8 \ +MAN8= accept.8 enable.8 lpadmin.8 lpc.8 lpinfo.8 \ lpmove.8 cupsaddsmb.8 MLINKS= accept.8 reject.8 +MLINKS+= enable.8 disable.8 +MLINKS+= lp.1 cancel.1 post-install: @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} -.include <bsd.port.mk> +.include <bsd.port.pre.mk> +.include "${PORTSDIR}/print/cups/Makefile.inc" +.include <bsd.port.post.mk> diff --git a/print/cups-lpr/distinfo b/print/cups-lpr/distinfo index 14e6221..f871858 100644 --- a/print/cups-lpr/distinfo +++ b/print/cups-lpr/distinfo @@ -1 +1 @@ -MD5 (cups-1.1.12-source.tar.bz2) = 18e74aa115e9fdaa569685e6351f0ebc +MD5 (cups-1.1.14-source.tar.bz2) = 7cc9725d94568b24f5ade78fb7e26480 diff --git a/print/cups-lpr/files/patch-Makefile b/print/cups-lpr/files/patch-Makefile index 9b6a22b..d42d9c2 100644 --- a/print/cups-lpr/files/patch-Makefile +++ b/print/cups-lpr/files/patch-Makefile @@ -1,6 +1,6 @@ ---- Makefile.orig Tue Oct 30 15:37:13 2001 -+++ Makefile Wed Nov 28 22:43:18 2001 -@@ -28,15 +28,14 @@ +--- Makefile.orig Fri Feb 22 21:28:50 2002 ++++ Makefile Fri Feb 22 21:33:45 2002 +@@ -28,8 +28,7 @@ # Directories to make... # @@ -10,15 +10,16 @@ # # Make all targets... - # +@@ -37,7 +36,7 @@ all: + chmod +x cups-config - for dir in $(DIRS); do\ + for dir in cups $(DIRS); do\ echo Making all in $$dir... ;\ (cd $$dir ; $(MAKE) $(MFLAGS)) || exit 1;\ done -@@ -46,7 +45,7 @@ +@@ -47,7 +46,7 @@ # clean: @@ -27,7 +28,7 @@ echo Cleaning in $$dir... ;\ (cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\ done -@@ -60,47 +59,47 @@ +@@ -61,47 +60,47 @@ echo Installing in $$dir... ;\ (cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\ done @@ -46,8 +47,8 @@ - echo Installing in templates... - (cd templates; $(MAKE) $(MFLAGS) install) - echo Installing cups-config script... -- $(INSTALL_DIR) $(bindir) -- $(INSTALL_SCRIPT) cups-config $(bindir)/cups-config +- $(INSTALL_DIR) $(BINDIR) +- $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config - echo Installing startup script... - if test "x$(INITDIR)" != "x"; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ @@ -63,8 +64,8 @@ - fi - if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ -- if test "$(INITDDIR)" = "/System/Library/StartupItems/CUPS"; then \ -- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/CUPS; \ +- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ +- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \ - $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ - $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ - $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ @@ -87,8 +88,8 @@ +# echo Installing in templates... +# (cd templates; $(MAKE) $(MFLAGS) install) +# echo Installing cups-config script... -+# $(INSTALL_DIR) $(bindir) -+# $(INSTALL_SCRIPT) cups-config $(bindir)/cups-config ++# $(INSTALL_DIR) $(BINDIR) ++# $(INSTALL_SCRIPT) cups-config $(BINDIR)/cups-config +# echo Installing startup script... +# if test "x$(INITDIR)" != "x"; then \ +# $(INSTALL_DIR) $(BUILDROOT)$(INITDIR)/init.d; \ @@ -104,8 +105,8 @@ +# fi +# if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \ +# $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \ -+# if test "$(INITDDIR)" = "/System/Library/StartupItems/CUPS"; then \ -+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/CUPS; \ ++# if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \ ++# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \ +# $(INSTALL_DATA) cups.plist $(BUILDROOT)$(INITDDIR)/StartupParameters.plist; \ +# $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR)/Resources/English.lproj; \ +# $(INSTALL_DATA) cups.strings $(BUILDROOT)$(INITDDIR)/Resources/English.lproj/Localizable.strings; \ diff --git a/print/cups-lpr/files/patch-configure b/print/cups-lpr/files/patch-configure new file mode 100644 index 0000000..9e48416 --- /dev/null +++ b/print/cups-lpr/files/patch-configure @@ -0,0 +1,18 @@ +--- configure.old Tue Feb 5 11:17:34 2002 ++++ configure Tue Feb 5 11:18:00 2002 +@@ -3224,13 +3224,13 @@ + DSO="\$(CC)" + DSOFLAGS="$DSOFLAGS -Wl,-rpath,\$(libdir),-set_version,sgi2.4,-soname,\$@ -shared \$(OPTIM)" + ;; +- OSF1* | Linux* | NetBSD* | OpenBSD*) ++ OSF1* | Linux* | NetBSD* | OpenBSD* | FreeBSD*) + LIBCUPS="libcups.so.2" + LIBCUPSIMAGE="libcupsimage.so.2" + DSO="\$(CC)" + DSOFLAGS="$DSOFLAGS -Wl,-soname,\$@ -shared \$(OPTIM)" + ;; +- Darwin* | FreeBSD*) ++ Darwin*) + LIBCUPS="libcups.2.dylib" + LIBCUPSIMAGE="libcupsimage.2.dylib" + DSO="ld" diff --git a/print/cups-lpr/pkg-message b/print/cups-lpr/pkg-message index 5c9d237..ab378b4 100644 --- a/print/cups-lpr/pkg-message +++ b/print/cups-lpr/pkg-message @@ -5,7 +5,7 @@ This port installs binaries (lpr, lpc, etc) which have the same names as binaries in /usr/bin and /usr/sbin. Assuming you installed this port to use cups fully, the minimum you need to do is make sure all users PATH variable has %%PREFIX%%/bin before /usr/bin. As this is not always easy to do, -a you may consider removing the FreeBSD printing system completely. To do this, +you may consider removing the FreeBSD printing system completely. To do this, remove the binaries and man pages listed below, and set NO_LPR=true in your /etc/make.conf. This will prevent future buildworlds from re-installing the binaries, but will not prevent them from getting re-installed during a binary diff --git a/print/cups/Makefile b/print/cups/Makefile index 8876488..b3ecfed 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -6,8 +6,7 @@ # PORTNAME= cups -PORTVERSION= ${VERSION} -PORTREVISION= 1 +PORTVERSION= ${CUPS_VERSION} CATEGORIES= print MASTER_SITES= # empty DISTFILES= # none @@ -15,12 +14,11 @@ EXTRACT_ONLY= # empty MAINTAINER= jah4007@cs.rit.edu -VERSION= 1.1.12 - LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base RUN_DEPENDS= ${LOCALBASE}/sbin/cupsaddsmb:${PORTSDIR}/print/cups-lpr NO_BUILD= true do-install: # empty +.include "${.CURDIR}/Makefile.inc" .include <bsd.port.mk> diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common new file mode 100644 index 0000000..2054c4f --- /dev/null +++ b/print/cups/Makefile.common @@ -0,0 +1,23 @@ +# Common file for CUPS ports +# $FreeBSD$ + +MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \ + ftp://ftp2.easysw.com/pub/cups/${VERSION}/ \ + ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \ + ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/ + +CUPS_VERSION= 1.1.14 + +#protect the base port +.if( $(PORTNAME) != "cups") +DISTNAME= cups-${CUPS_VERSION}-source +DISTFILES= ${DISTNAME}.tar.bz2 +WRKSRC= ${WRKDIR}/cups-${CUPS_VERSION} + +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes + +CONFIGURE_ARGS+= --localstatedir=/var +.endif + diff --git a/print/cups/Makefile.inc b/print/cups/Makefile.inc new file mode 100644 index 0000000..2054c4f --- /dev/null +++ b/print/cups/Makefile.inc @@ -0,0 +1,23 @@ +# Common file for CUPS ports +# $FreeBSD$ + +MASTER_SITES= ftp://ftp.easysw.com/pub/cups/${VERSION}/ \ + ftp://ftp2.easysw.com/pub/cups/${VERSION}/ \ + ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${VERSION}/ \ + ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${VERSION}/ + +CUPS_VERSION= 1.1.14 + +#protect the base port +.if( $(PORTNAME) != "cups") +DISTNAME= cups-${CUPS_VERSION}-source +DISTFILES= ${DISTNAME}.tar.bz2 +WRKSRC= ${WRKDIR}/cups-${CUPS_VERSION} + +USE_BZIP2= yes +USE_GMAKE= yes +GNU_CONFIGURE= yes + +CONFIGURE_ARGS+= --localstatedir=/var +.endif + diff --git a/print/cups/distinfo b/print/cups/distinfo index 14e6221..f871858 100644 --- a/print/cups/distinfo +++ b/print/cups/distinfo @@ -1 +1 @@ -MD5 (cups-1.1.12-source.tar.bz2) = 18e74aa115e9fdaa569685e6351f0ebc +MD5 (cups-1.1.14-source.tar.bz2) = 7cc9725d94568b24f5ade78fb7e26480 |