Bug 174815 - [PATCH] print/cups-base: Fixed 3 fatal errors, icons, ldconfig
Summary: [PATCH] print/cups-base: Fixed 3 fatal errors, icons, ldconfig
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Chris Rees
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2012-12-29 22:10 UTC by nemysis
Modified: 2013-08-05 11:40 UTC (History)
0 users

See Also:


Attachments
cups-base-1.5.4.patch (2.54 KB, patch)
2012-12-29 22:10 UTC, nemysis
no flags Details | Diff
cups-base.diff (1.75 KB, patch)
2013-06-02 15:24 UTC, nemysis
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description nemysis 2012-12-29 22:10:00 UTC
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
Comment 1 Mark Linimon freebsd_committer freebsd_triage 2013-03-10 02:26:40 UTC
State Changed
From-To: open->feedback

Set to feedback to notify new maintainer.
Comment 2 Chris Petrik 2013-05-26 17:36:00 UTC
Thia patch can be approved.
Comment 3 Mark Linimon freebsd_committer freebsd_triage 2013-05-26 21:46:41 UTC
State Changed
From-To: feedback->open

Maintainer approved.
Comment 4 nemysis 2013-06-02 15:24:10 UTC
- Trim ignore
- Trim man
- Fix reinstall
Comment 5 Chris Rees freebsd_committer freebsd_triage 2013-06-03 17:46:19 UTC
Responsible Changed
From-To: freebsd-ports-bugs->crees

I prefer to use "requires" in IGNORE messages like that. 
http://www.bayofrum.net/~crees/patches/174815 .  Is that OK Chris?
Comment 6 Chris Petrik 2013-07-21 18:17:12 UTC
Approved
Comment 7 dfilter service freebsd_committer freebsd_triage 2013-08-05 11:32:40 UTC
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@gmx.ch>
  Approved by:	Chris Petrik <c.petrik.sosa@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
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 8 Chris Rees freebsd_committer freebsd_triage 2013-08-05 11:32:41 UTC
State Changed
From-To: open->closed

Committed. Thanks!