4 files changed, 27 insertions, 39 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index fa1614a5c707..ebc7ae7f7ef6 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -1,18 +1,19 @@
-# New ports collection makefile for:   cups
-# Date created:        05 January 2001
-# Whom:                George Reid <greid@ukug.uk.freebsd.org>
+# New ports collection makefile for:	cups-base
+# Date created:				29 November 2001
+# Whom:					James Halstead <jah4007@cs.rit.edu>
 #
 # $FreeBSD$
 #
 
-PORTNAME=	cups
-PORTVERSION=	${VERSION}#.${REVISION}
+PORTNAME=	cups-base
+PORTVERSION=	${VERSION}
+PORTREVISION=	1
 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=	${PORTNAME}-${VERSION}-source
+DISTNAME=	cups-${VERSION}-source
 
 MAINTAINER=	jah4007@cs.rit.edu
 
@@ -21,20 +22,16 @@ VERSION=	1.1.12
 USE_BZIP2=	yes
 INSTALLS_SHLIB=	yes
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${VERSION}
+WRKSRC=		${WRKDIR}/cups-${VERSION}
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+= --localstatedir=/var
 
-MAN1=		backend.1 cancel.1 filter.1 lp.1 lpoptions.1 lpq.1 \
-		lpr.1 lprm.1 lpstat.1 lppasswd.1
+MAN1=		backend.1 filter.1
 MAN3=		cups-config.3
 MAN5=		classes.conf.5 cupsd.conf.5 mime.convs.5 mime.types.5 \
 		printers.conf.5
-MAN8=		accept.8 cups-lpd.8 cups-polld.8 cupsd.8 disable.8 \
-		enable.8 lpadmin.8 lpc.8 lpinfo.8 lpmove.8 \
-		cupsaddsmb.8
-MLINKS=		accept.8 reject.8
+MAN8=		cups-lpd.8 cups-polld.8 cupsd.8
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/conf/classes.conf \
diff --git a/print/cups-base/files/patch-Makefile b/print/cups-base/files/patch-Makefile
new file mode 100644
index 000000000000..5b307dcbe15c
--- /dev/null
+++ b/print/cups-base/files/patch-Makefile
@@ -0,0 +1,13 @@
+--- Makefile.orig	Wed Nov 28 20:24:11 2001
++++ Makefile	Wed Nov 28 21:46:19 2001
+@@ -28,8 +28,8 @@
+ # Directories to make...
+ #
+ 
+-DIRS	=	cups backend berkeley cgi-bin filter man pdftops pstoraster \
+-		scheduler systemv
++DIRS	=	cups backend cgi-bin filter man pdftops pstoraster \
++		scheduler
+ 
+ #
+ # Make all targets...
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index 26b5df53296d..f889da6d0052 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -5,13 +5,8 @@ Please read the documentation in %%PREFIX%%/share/doc/cups/ for information
 on how to set up your printer to use CUPS. Basic template configuration files
 have been installed in %%PREFIX%%/etc/cups/
 
-Please note that the cups port installs tools with conflicting names to the
-freebsd printing system. At a minimum users PATH environment should have
-%%PREFIX%%/bin before /usr/bin to use the correct tools. You may also
-consider removing the freebsd printing tools and set NO_LPR=true in your
-/etc/make.conf to prevent them building in future make world's. This would
-not of course prevent them from being reinstalled during a binary upgrade.
+To install the BSD and system V compatibility binaries look to the port
+print/cups-bin. These are no longer installed as part of the base cups port
+because they have conflicting names with the native print binaries, and with
+other ports, suck as lprNG.
 
-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]*
diff --git a/print/cups-base/pkg-plist b/print/cups-base/pkg-plist
index 30e9710873be..6221ce5d5854 100644
--- a/print/cups-base/pkg-plist
+++ b/print/cups-base/pkg-plist
@@ -1,14 +1,4 @@
-bin/cancel
 bin/cups-config
-bin/disable
-bin/enable
-bin/lp
-bin/lpoptions
-bin/lppasswd
-bin/lpq
-bin/lpr
-bin/lprm
-bin/lpstat
 etc/rc.d/cupsd.sh.sample
 @unexec if cmp -s %D/etc/cups/classes.conf %D/etc/cups/classes.conf.sample; then rm -f %D/etc/cups/classes.conf; fi
 etc/cups/classes.conf.sample
@@ -59,14 +49,7 @@ libexec/cups/filter/rastertodymo
 libexec/cups/filter/rastertoepson
 libexec/cups/filter/rastertohp
 libexec/cups/filter/texttops
-sbin/accept
-sbin/cupsaddsmb
 sbin/cupsd
-sbin/lpadmin
-sbin/lpc
-sbin/lpinfo
-sbin/lpmove
-sbin/reject
 share/cups/banners/classified
 share/cups/banners/confidential
 share/cups/banners/secret