Update to 1.1.22, which was released on 29 October and is the

latest version. While I'm here, make pkg-message print the
actual prefix when the port is installed, and a nicer message
for package installs.

This version of the software also includes 'es' man pages to
go with the 'fr' ones.

5 files changed, 11 insertions, 9 deletions

diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile
index 013fa55814e8..0c6d23c176e2 100644
--- a/print/cups-base/Makefile
+++ b/print/cups-base/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	cups-base
 PORTVERSION=	${CUPS_PORTVER}
-PORTREVISION=	1
 PORTREVISION=	${CUPS_PORTREV}
 PORTEPOCH=	${CUPS_PORTEPOCH}
 CATEGORIES=	print
@@ -27,6 +26,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '/SILENT/d' \
 		${WRKSRC}/Makedefs.in
 	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
+		${WRKSRC}/man/Makefile ${WRKSRC}/man/es/Makefile
+	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
 		${WRKSRC}/man/Makefile ${WRKSRC}/man/fr/Makefile
 	@${REINPLACE_CMD} -e 's|/etc/cups|/usr/local/etc/cups|g' \
 		${WRKSRC}/man/*.man
@@ -49,7 +50,7 @@ post-install:
 	${MKDIR} ${CUPS_SPOOLDIR} ${CUPS_SPOOLDIR}/tmp
 	${CHOWN} -R ${CUPSOWN}:${CUPSGRP} ${CUPS_SPOOLDIR}
 	${CHMOD} -R g+w ${CUPS_SPOOLDIR}
-	@${CAT} ${PKGMESSAGE}
+	@${SED} -e 's#PREFIX#${PREFIX}#' ${PKGMESSAGE}
 
 .include "${.CURDIR}/../../print/cups/Makefile.common"
 .include <bsd.port.pre.mk>
diff --git a/print/cups-base/pkg-message b/print/cups-base/pkg-message
index 6a5db01f7f4d..69d111549eca 100644
--- a/print/cups-base/pkg-message
+++ b/print/cups-base/pkg-message
@@ -2,9 +2,9 @@
 
 CUPS is now installed.
 
-Please read the documentation in %%PREFIX%%/share/doc/cups/ for information
+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/
+have been installed in PREFIX/etc/cups/
 
 To install the BSD and System V compatibility binaries look to the port
 print/cups-lpr. These are no longer installed as part of the base cups port
diff --git a/print/cups-lpr/Makefile b/print/cups-lpr/Makefile
index 9bc47fc02195..2c2f4628a308 100644
--- a/print/cups-lpr/Makefile
+++ b/print/cups-lpr/Makefile
@@ -9,7 +9,6 @@
 
 PORTNAME=	cups-lpr
 PORTVERSION=	${CUPS_PORTVER}
-PORTREVISION=	1
 PORTREVISION=	${CUPS_PORTREV}
 PORTEPOCH=	${CUPS_PORTEPOCH}
 CATEGORIES=	print
@@ -43,6 +42,8 @@ post-patch:
 	@${REINPLACE_CMD} -e '/SILENT/d' \
 		${WRKSRC}/Makedefs.in
 	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
+		${WRKSRC}/man/Makefile ${WRKSRC}/man/es/Makefile
+	@${REINPLACE_CMD} -e '/LN/d' -e '/cat/d' \
 		${WRKSRC}/man/Makefile ${WRKSRC}/man/fr/Makefile
 
 post-install:
diff --git a/print/cups/Makefile.common b/print/cups/Makefile.common
index 2d6c9a403d42..0a52302fc1af 100644
--- a/print/cups/Makefile.common
+++ b/print/cups/Makefile.common
@@ -9,7 +9,7 @@ CUPS_MASTER_SITES=\
   ftp://ftp.fisek.com.tr/pub/cups/${CUPS_VERSION}/ \
   ftp://ftp.mpg.goe.ni.schule.de/pub/internet/printing/cups/${CUPS_VERSION}/
 
-CUPS_VERSION=	1.1.21
+CUPS_VERSION=	1.1.22
 CUPS_REVISION=	0
 CUPS_PORTVER=	${CUPS_VERSION}.${CUPS_REVISION}
 CUPS_PORTREV=	0
@@ -30,7 +30,7 @@ CUPSOWN=	root
 
 .if ${PORTNAME} == "cups-base" || ${PORTNAME} == "cups-lpr"
 
-MANLANG=	"" fr
+MANLANG=	"" es fr
 
 .if ${CUPS_REVISION} < 1
 DISTNAME=	cups-${CUPS_VERSION}-source
diff --git a/print/cups/distinfo b/print/cups/distinfo
index 4a3ea32eb163..8ae69ef45da8 100644
--- a/print/cups/distinfo
+++ b/print/cups/distinfo
@@ -1,2 +1,2 @@
-MD5 (cups-1.1.21-source.tar.bz2) = 54e9b0d9c0bdb45b956f88c14793ef65
-SIZE (cups-1.1.21-source.tar.bz2) = 8549181
+MD5 (cups-1.1.22-source.tar.bz2) = fe0a1b0fedccfe8b2e35e0cea1e5f0a9
+SIZE (cups-1.1.22-source.tar.bz2) = 8527045