1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-28 05:29:48 +00:00

1. Upgrade to 1.15.1.

2. Fixes to quiet down  portlint.
3. USE_SUBMAKE to make MLINKS work.

PR:		39053
Submitter:	maintainer
This commit is contained in:
Alan Eldridge 2002-07-02 10:04:43 +00:00
parent 21225f9885
commit ae8d1ab39c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=62322
8 changed files with 72 additions and 119 deletions

View File

@ -1,21 +1,25 @@
# New ports collection makefile for: cups-lpr
# Date created: 29 November 2001
# By: James Halstead <jah4007@cs.rit.edu>
# Whom: James Halstead <jah4007@cs.rit.edu>
#
# $FreeBSD$
#
PORTNAME= cups-lpr
PORTVERSION= ${CUPS_VERSION}
CATEGORIES= print
PORTVERSION= ${CUPS_PORTVER}
CATEGORIES?= print
MAINTAINER= jah4007@cs.rit.edu
LIB_DEPENDS= cups.2:${PORTSDIR}/print/cups-base
LIB_DEPENDS?= cups.2:${.CURDIR}/../../print/cups-base
MAN1= lp.1 lpoptions.1 lpq.1 lpr.1 lprm.1 lpstat.1 \
lppasswd.1
MAN8= accept.8 enable.8 lpadmin.8 lpc.8 lpinfo.8 \
lpmove.8 cupsaddsmb.8
USE_SUBMAKE= yes # required for MLINKS support
MLINKS= accept.8 reject.8
MLINKS+= enable.8 disable.8
MLINKS+= lp.1 cancel.1
@ -23,6 +27,5 @@ MLINKS+= lp.1 cancel.1
post-install:
@${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
.include <bsd.port.pre.mk>
.include "${PORTSDIR}/print/cups/Makefile.inc"
.include <bsd.port.post.mk>
.include "${.CURDIR}/../../print/cups/Makefile.inc"
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (cups-1.1.14-source.tar.bz2) = 7cc9725d94568b24f5ade78fb7e26480
MD5 (cups-1.1.15-1-source.tar.bz2) = 971a14d35f61ea19871616f437e199a2

View File

@ -1,10 +1,10 @@
--- Makefile.orig Fri Feb 22 21:28:50 2002
+++ Makefile Fri Feb 22 21:33:45 2002
--- Makefile.orig Tue Apr 23 13:49:34 2002
+++ Makefile Sat Jun 8 01:20:35 2002
@@ -28,8 +28,7 @@
# Directories to make...
#
-DIRS = cups backend berkeley cgi-bin filter man pdftops pstoraster \
-DIRS = cups backend berkeley cgi-bin filter man pdftops \
- scheduler systemv
+DIRS = berkeley systemv man
@ -28,7 +28,22 @@
echo Cleaning in $$dir... ;\
(cd $$dir; $(MAKE) $(MFLAGS) clean) || exit 1;\
done
@@ -61,47 +60,47 @@
@@ -57,7 +56,7 @@
#
depend:
- for dir in $(DIRS); do\
+ for dir in cups $(DIRS); do\
echo Making dependencies in $$dir... ;\
(cd $$dir; $(MAKE) $(MFLAGS) depend) || exit 1;\
done
@@ -67,52 +66,52 @@
# Install object and target files...
#
-install: installhdrs
+install:
for dir in $(DIRS); do\
echo Installing in $$dir... ;\
(cd $$dir; $(MAKE) $(MFLAGS) install) || exit 1;\
done
@ -65,7 +80,7 @@
- if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
- $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
- if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \
- $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
- $(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; \
@ -106,7 +121,7 @@
+# if test "x$(INITDIR)" = "x" -a "x$(INITDDIR)" != "x"; then \
+# $(INSTALL_DIR) $(BUILDROOT)$(INITDDIR); \
+# if test "$(INITDDIR)" = "/System/Library/StartupItems/PrintingServices"; then \
+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices.sh; \
+# $(INSTALL_SCRIPT) cups.sh $(BUILDROOT)$(INITDDIR)/PrintingServices; \
+# $(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; \
@ -115,5 +130,5 @@
+# fi \
+# fi
#
# Install source and header files...

View File

@ -1,18 +0,0 @@
--- 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"

View File

@ -1,81 +0,0 @@
--- man/Makefile.orig Thu Oct 25 23:16:48 2001
+++ man/Makefile Wed Nov 28 22:34:11 2001
@@ -28,13 +28,12 @@
# Man pages...
#
-MAN1 = backend.man filter.man lp.man lpoptions.man lppasswd.man \
+MAN1 = lp.man lpoptions.man lppasswd.man \
lpq.man lprm.man lpr.man lpstat.man
-MAN3 = cups-config.man
-MAN5 = classes.conf.man cupsd.conf.man mime.convs.man mime.types.man \
- printers.conf.man
-MAN8 = accept.man cupsaddsmb.man cups-lpd.man cups-polld.man \
- cupsd.man enable.man lpadmin.man lpinfo.man lpmove.man \
+MAN3 =
+MAN5 =
+MAN8 = accept.man cupsaddsmb.man \
+ enable.man lpadmin.man lpinfo.man lpmove.man \
lpc.man
CAT1 = $(MAN1:.man=.$(CAT1EXT))
@@ -47,7 +46,7 @@
# Make everything...
#
-all: $(CAT1) $(CAT3) $(CAT5) $(CAT8)
+all: #$(CAT1) $(CAT3) $(CAT5) $(CAT8)
#
@@ -85,28 +84,28 @@
$(LN) accept.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/reject.$(MAN8EXT)
$(RM) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
$(LN) enable.$(MAN8EXT) $(AMANDIR)/man$(MAN8EXT)/disable.$(MAN8EXT)
- $(INSTALL_DIR) $(MANDIR)/cat1
- for file in $(CAT1); do \
- $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
- done
- $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
- $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
- $(INSTALL_DIR) $(PMANDIR)/cat3
- for file in $(CAT3); do \
- $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
- done
- $(INSTALL_DIR) $(MANDIR)/cat5
- for file in $(CAT5); do \
- $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
- done
- $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
- for file in $(CAT8); do \
- $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
- done
- $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
- $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
- $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
- $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+# $(INSTALL_DIR) $(MANDIR)/cat1
+# for file in $(CAT1); do \
+# $(INSTALL_MAN) $$file $(MANDIR)/cat1; \
+# done
+# $(RM) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+# $(LN) lp.$(CAT1EXT) $(MANDIR)/cat1/cancel.$(CAT1EXT)
+# $(INSTALL_DIR) $(PMANDIR)/cat3
+# for file in $(CAT3); do \
+# $(INSTALL_MAN) $$file $(PMANDIR)/cat3; \
+# done
+# $(INSTALL_DIR) $(MANDIR)/cat5
+# for file in $(CAT5); do \
+# $(INSTALL_MAN) $$file $(MANDIR)/cat5; \
+# done
+# $(INSTALL_DIR) $(AMANDIR)/cat$(MAN8EXT)
+# for file in $(CAT8); do \
+# $(INSTALL_MAN) $$file $(AMANDIR)/cat$(MAN8EXT); \
+# done
+# $(RM) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+# $(LN) accept.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/reject.$(CAT8EXT)
+# $(RM) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
+# $(LN) enable.$(CAT8EXT) $(AMANDIR)/cat$(MAN8EXT)/disable.$(CAT8EXT)
#

View File

@ -0,0 +1,32 @@
--- man/Makefile.common.orig Sat Jun 8 01:05:48 2002
+++ man/Makefile.common Sat Jun 8 01:08:44 2002
@@ -26,26 +26,17 @@
# Man pages...
#
-MAN1 = backend.man \
- filter.man \
- lp.man \
+MAN1 = lp.man \
lpoptions.man \
lppasswd.man \
lpq.man \
lprm.man \
lpr.man \
lpstat.man
-MAN3 = cups-config.man
-MAN5 = classes.conf.man \
- cupsd.conf.man \
- mime.convs.man \
- mime.types.man \
- printers.conf.man
+MAN3 =
+MAN5 =
MAN8 = accept.man \
cupsaddsmb.man \
- cups-lpd.man \
- cups-polld.man \
- cupsd.man \
enable.man \
lpadmin.man \
lpinfo.man \

View File

@ -1,5 +1,5 @@
CUPS provides a printing layer for UNIX based operating systems. This port
provides binaries to make cups compatible (and indeed look just like) a standard
BSD or system V printing system. WARNING: The compatibility binaries will
conflict with the names of the native binaries.
CUPS provides a printing layer for UNIX based operating systems. This
port provides binaries to make cups compatible (and indeed look just
like) a standard BSD or system V printing system. WARNING: The
compatibility binaries will conflict with the names of the native
binaries.

View File

@ -1,3 +1,4 @@
======================================================================
CUPS BSD and system V print compatibility system is installed.
@ -16,3 +17,4 @@ The relevant files for the FreeBSD printing system are:
/usr/bin/lp* /usr/sbin/lpc /usr/sbin/lpd /usr/share/man/cat*/lp*
/usr/share/man/man1/lp.* /usr/share/man/man1/lp[a-s,u-z]*
======================================================================