ports/174815: [PATCH] print/cups-base: Fixed 3 fatal errors, icons, ldconfig

[nemysis]

>Number:         174815
>Category:       ports
>Synopsis:       [PATCH] print/cups-base: Fixed 3 fatal errors, icons, ldconfig
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 29 22:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:

Makefile changed:
changed place UNIQUENAME=
+INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
-CONFLICTS+=	cupsddk-* not more existent, forom MOVED print/cupsddk||2010-09-09|Now part of print/cups-base
- 
changed +IGNORE= to not use Y but y
+MAN1+=

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: change, diff: ports)
>How-To-Repeat:

portlint -A
looks better, fixed 3 fatal errors
FATAL: Makefile: extra item "UNIQUENAME" placed in the PORTNAME section
FATAL: Makefile: extra item "CONFLICTS" placed in the LICENSE section.
FATAL: Makefile: duplicate MAN1 macro.  Only the last MAN1 macro will be processed.  Use MAN1+=... instead to append man pages.

port test: clean

>Fix:

--- cups-base-1.5.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/print/cups-base/Makefile ./Makefile
--- /usr/ports/print/cups-base/Makefile	2012-12-29 12:16:54.000000000 +0100
+++ ./Makefile	2012-12-29 22:59:52.000000000 +0100
@@ -7,17 +7,20 @@
 CATEGORIES=	print
 MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
 PKGNAMESUFFIX=	${CUPS_SUFFIX}${PKGNAMESUFFIX2}
-UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Common UNIX Printing System: ${COMMENT2}
 
 LICENSE=	GPLv2
+
+UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 CONFLICTS=	LPRng-[0-9]*
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
+USE_LDCONFIG=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -66,7 +69,6 @@
 .else
 PORTREVISION=	0
 CUPS_SUFFIX=	-base
-CONFLICTS+=	cupsddk-*
 OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM LDAP DBUS LIBUSB XDG_OPEN GHOSTSCRIPT XPDF AVAHI MDNSRESPONDER
 OPTIONS_DEFAULT=	LIBPAPER GHOSTSCRIPT
 NO_OPTIONS_SORT=	yes
@@ -122,7 +124,7 @@
 PLIST_SUB+=		OVERWRITE="@comment "
 CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
 .endif
- 
+
 .if ${PORT_OPTIONS:MGNUTLS}
 CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
 LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
@@ -146,7 +148,7 @@
 
 .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MGHOSTSCRIPT}
 .if ${PORT_OPTIONS:MXPDF}
-IGNORE=			You must select one and only one option to build pdftops
+IGNORE=			you must select one and only one option to build pdftops
 .endif
 USE_GHOSTSCRIPT=	yes
 CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/bin/gs
@@ -173,7 +175,7 @@
 
 .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}
 .if ${PORT_OPTIONS:MAVAHI}
-IGNORE=			You must select one and only one option to build for Zeroconf
+IGNORE=			you must select one and only one option to build for Zeroconf
 .endif
 LIB_DEPENDS+=		dns_sd:${PORTSDIR}/net/mDNSResponder
 CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include
@@ -233,7 +235,7 @@
 MAN1=	cups-config.1
 .elif defined(CUPS_IMAGE)
 .else
-MAN1=	cancel.1 \
+MAN1+=	cancel.1 \
 	cupstestdsc.1 \
 	cupstestppd.1 \
 	ipptool.1 \
@@ -389,7 +391,7 @@
 .if  ${PORT_OPTIONS:MGHOSTSCRIPT} || ${PORT_OPTIONS:MXPDF}
 	${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${PREFIX}/libexec/cups/filter/
 .endif
-	${LN} -s ${PREFIX}/bin/lpr ${PREFIX}/bin/lpr-cups
+	${LN} -sf ${PREFIX}/bin/lpr ${PREFIX}/bin/lpr-cups
 	${INSTALL} -d ${CUPS_ETCDIR}/
 	${CP} -p ${WRKSRC}/conf/snmp.conf ${WRKSRC}/conf/snmp.conf.N
 .for f in cupsd.conf mime.convs mime.types snmp.conf
--- cups-base-1.5.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: