Update port print/cups to 1.1.6

Changes:
     o PORTREVISION removed (two typos fixed in source distribution
       which were fixed by patches for cups-1.1.5).
       Incidentally, PORTREVISION is spelled wrong in r1.2 of the
        port's Makefile.
     o patch-aa and patch-ad now obsolete
     o MD5 checksum

PR:		24650
Submitted by:	George Reid <greid@ukug.uk.freebsd.org> MAINTAINER

15 files changed, 12 insertions, 81 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 089e37768682..0b481ff2f235 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.1.5
-PORTREVESION=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp2.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2-source
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
 
 USE_BZIP2=	yes
+INSTALLS_SHLIB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/print/cups-base/distinfo b/print/cups-base/distinfo
index 07b7d5ea5988..9ba76e81f25f 100644
--- a/print/cups-base/distinfo
+++ b/print/cups-base/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.5-2-source.tar.bz2) = b8c25a0f01a887b5584d1e2166beff03
+MD5 (cups-1.1.6-source.tar.bz2) = b2749cc248096d0ce69eb1c9c2b75517
diff --git a/print/cups-base/files/patch-aa b/print/cups-base/files/patch-aa
deleted file mode 100644
index 5fa905c94242..000000000000
--- a/print/cups-base/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/serial.c.orig	Fri Jan  5 15:28:01 2001
-+++ backend/serial.c	Fri Jan  5 15:28:17 2001
-@@ -800,7 +800,7 @@
-              device, i + 1);
-     }
-   }
--+#elif defined(__NetBSD__)
-+#elif defined(__NetBSD__)
-   int	i, j;		/* Looping vars */
-   int	fd;		/* File descriptor */
-   char	device[255];	/* Device filename */
diff --git a/print/cups-base/files/patch-ad b/print/cups-base/files/patch-ad
deleted file mode 100644
index 68bd339f4295..000000000000
--- a/print/cups-base/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jan 10 14:49:07 2001
-+++ configure	Wed Jan 10 14:49:22 2001
-@@ -3615,7 +3615,7 @@
- 
- 
- 
--CUPS_SERVERROOT='${sysconfdif}/cups'
-+CUPS_SERVERROOT='${sysconfdir}/cups'
- CUPS_LOGDIR='${localstatedir}/log/cups'
- CUPS_REQUESTS='${localstatedir}/spool/cups'
- 
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index 77e0a7249a9f..2935218a830c 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -4,4 +4,3 @@ CUPS is now installed.
 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/
-
diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index 089e37768682..0b481ff2f235 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.1.5
-PORTREVESION=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp2.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2-source
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
 
 USE_BZIP2=	yes
+INSTALLS_SHLIB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/print/cups-lpr/distinfo b/print/cups-lpr/distinfo
index 07b7d5ea5988..9ba76e81f25f 100644
--- a/print/cups-lpr/distinfo
+++ b/print/cups-lpr/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.5-2-source.tar.bz2) = b8c25a0f01a887b5584d1e2166beff03
+MD5 (cups-1.1.6-source.tar.bz2) = b2749cc248096d0ce69eb1c9c2b75517
diff --git a/print/cups-lpr/files/patch-aa b/print/cups-lpr/files/patch-aa
deleted file mode 100644
index 5fa905c94242..000000000000
--- a/print/cups-lpr/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/serial.c.orig	Fri Jan  5 15:28:01 2001
-+++ backend/serial.c	Fri Jan  5 15:28:17 2001
-@@ -800,7 +800,7 @@
-              device, i + 1);
-     }
-   }
--+#elif defined(__NetBSD__)
-+#elif defined(__NetBSD__)
-   int	i, j;		/* Looping vars */
-   int	fd;		/* File descriptor */
-   char	device[255];	/* Device filename */
diff --git a/print/cups-lpr/files/patch-ad b/print/cups-lpr/files/patch-ad
deleted file mode 100644
index 68bd339f4295..000000000000
--- a/print/cups-lpr/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jan 10 14:49:07 2001
-+++ configure	Wed Jan 10 14:49:22 2001
-@@ -3615,7 +3615,7 @@
- 
- 
- 
--CUPS_SERVERROOT='${sysconfdif}/cups'
-+CUPS_SERVERROOT='${sysconfdir}/cups'
- CUPS_LOGDIR='${localstatedir}/log/cups'
- CUPS_REQUESTS='${localstatedir}/spool/cups'
- 
diff --git a/print/cups-lpr/pkg-message b/print/cups-lpr/pkg-message
index 77e0a7249a9f..2935218a830c 100644
--- a/print/cups-lpr/pkg-message
+++ b/print/cups-lpr/pkg-message
@@ -4,4 +4,3 @@ CUPS is now installed.
 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/
-
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 089e37768682..0b481ff2f235 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -6,18 +6,18 @@
 #
 
 PORTNAME=	cups
-PORTVERSION=	1.1.5
-PORTREVESION=	1
+PORTVERSION=	1.1.6
 CATEGORIES=	print
 MASTER_SITES=	ftp://ftp.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp2.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/cups/${PORTVERSION}/ \
 		ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${PORTVERSION}/
-DISTNAME=	${PORTNAME}-${PORTVERSION}-2-source
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 
 MAINTAINER=	greid@ukug.uk.freebsd.org
 
 USE_BZIP2=	yes
+INSTALLS_SHLIB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 07b7d5ea5988..9ba76e81f25f 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1 +1 @@
-MD5 (cups-1.1.5-2-source.tar.bz2) = b8c25a0f01a887b5584d1e2166beff03
+MD5 (cups-1.1.6-source.tar.bz2) = b2749cc248096d0ce69eb1c9c2b75517
diff --git a/print/cups/files/patch-aa b/print/cups/files/patch-aa
deleted file mode 100644
index 5fa905c94242..000000000000
--- a/print/cups/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- backend/serial.c.orig	Fri Jan  5 15:28:01 2001
-+++ backend/serial.c	Fri Jan  5 15:28:17 2001
-@@ -800,7 +800,7 @@
-              device, i + 1);
-     }
-   }
--+#elif defined(__NetBSD__)
-+#elif defined(__NetBSD__)
-   int	i, j;		/* Looping vars */
-   int	fd;		/* File descriptor */
-   char	device[255];	/* Device filename */
diff --git a/print/cups/files/patch-ad b/print/cups/files/patch-ad
deleted file mode 100644
index 68bd339f4295..000000000000
--- a/print/cups/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Wed Jan 10 14:49:07 2001
-+++ configure	Wed Jan 10 14:49:22 2001
-@@ -3615,7 +3615,7 @@
- 
- 
- 
--CUPS_SERVERROOT='${sysconfdif}/cups'
-+CUPS_SERVERROOT='${sysconfdir}/cups'
- CUPS_LOGDIR='${localstatedir}/log/cups'
- CUPS_REQUESTS='${localstatedir}/spool/cups'
- 
diff --git a/print/cups/pkg-message b/print/cups/pkg-message
index 77e0a7249a9f..2935218a830c 100644
--- a/print/cups/pkg-message
+++ b/print/cups/pkg-message
@@ -4,4 +4,3 @@ CUPS is now installed.
 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/
-