svn commit: r324269 - head/print/cups-base

[Chris Rees]

Author: crees
Date: Mon Aug  5 10:32:31 2013
New Revision: 324269
URL: http://svnweb.freebsd.org/changeset/ports/324269

Log:
  Fix reinstall
  
  Correct IGNORE messages
  
  INSTALLS_ICONS
  
  PR:		ports/174815
  Submitted by:	nemysis <nemysis at gmx.ch>
  Approved by:	Chris Petrik <c.petrik.sosa at gmail.com> (maintainer)

Modified:
  head/print/cups-base/Makefile

Modified: head/print/cups-base/Makefile
==============================================================================
--- head/print/cups-base/Makefile	Mon Aug  5 09:29:19 2013	(r324268)
+++ head/print/cups-base/Makefile	Mon Aug  5 10:32:31 2013	(r324269)
@@ -21,6 +21,7 @@ UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+INSTALLS_ICONS=	yes
 CFLAGS+=	${PTHREAD_CFLAGS}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
@@ -148,7 +149,7 @@ PLIST_SUB+=		PHP="@comment "
 
 .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
@@ -175,7 +176,7 @@ LIB_DEPENDS+=		paper:${PORTSDIR}/print/l
 
 .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
@@ -231,7 +232,7 @@ CONFIGURE_ARGS+=	LIBS="-lssp_nonshared"
 MAN1=	cups-config.1
 .elif defined(CUPS_IMAGE)
 .else
-MAN1=	cancel.1 \
+MAN1+=	cancel.1 \
 	cupstestdsc.1 \
 	cupstestppd.1 \
 	ipptool.1 \
@@ -387,7 +388,7 @@ post-install:
 .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