From owner-svn-ports-head@FreeBSD.ORG Mon Aug 5 10:32:32 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id EF7D84BD; Mon, 5 Aug 2013 10:32:32 +0000 (UTC) (envelope-from crees@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id C308423E5; Mon, 5 Aug 2013 10:32:32 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r75AWWTr040741; Mon, 5 Aug 2013 10:32:32 GMT (envelope-from crees@svn.freebsd.org) Received: (from crees@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r75AWW3g040740; Mon, 5 Aug 2013 10:32:32 GMT (envelope-from crees@svn.freebsd.org) Message-Id: <201308051032.r75AWW3g040740@svn.freebsd.org> From: Chris Rees Date: Mon, 5 Aug 2013 10:32:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r324269 - head/print/cups-base X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 05 Aug 2013 10:32:33 -0000 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 Approved by: Chris Petrik (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