Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jul 2019 09:02:15 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r506647 - head/print/cups-pdf
Message-ID:  <201907150902.x6F92F7X013086@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Mon Jul 15 09:02:15 2019
New Revision: 506647
URL: https://svnweb.freebsd.org/changeset/ports/506647

Log:
  - Whitespace and cosmetic fixes
  - Switch to options helpers
  - Respect LDFLAGS
  - Update WWW

Modified:
  head/print/cups-pdf/Makefile
  head/print/cups-pdf/pkg-descr

Modified: head/print/cups-pdf/Makefile
==============================================================================
--- head/print/cups-pdf/Makefile	Mon Jul 15 08:56:40 2019	(r506646)
+++ head/print/cups-pdf/Makefile	Mon Jul 15 09:02:15 2019	(r506647)
@@ -12,8 +12,8 @@ DISTNAME=	${PORTNAME}_${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Virtual printer for CUPS to produce PDF files
 
-LICENSE=GPLv2
-LICENSE_FILE=${WRKSRC}/COPYING
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 RUN_DEPENDS=	${LOCALBASE}/sbin/cupsd:print/cups
 
@@ -21,15 +21,15 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USES=		ghostscript:run
 
-OPTIONS_DEFINE=		DOCS
+OPTIONS_DEFINE=	DOCS
 
+SUBST_CMD=	-e "s,\#GhostScript /usr/bin/gs,GhostScript ${LOCALBASE}/bin/gs," \
+		-e 's,\#GSTmp /var/tmp,GSTmp /tmp,' \
+		-e 's,\#Grp lp,Grp daemon,' \
+		-e 's,\#Spool /var/spool/cups-pdf/SPOOL,Spool /var/spool/cups-pdf,'
+
 .include <bsd.port.options.mk>
 
-SUBST_CMD=		-e "s,\#GhostScript /usr/bin/gs,GhostScript ${LOCALBASE}/bin/gs," \
-			-e 's,\#GSTmp /var/tmp,GSTmp /tmp,' \
-			-e 's,\#Grp lp,Grp daemon,' \
-			-e 's,\#Spool /var/spool/cups-pdf/SPOOL,Spool /var/spool/cups-pdf,'
-
 .ifdef(PDF_VERSION)
 .if ${PDF_VERSION} == 1.2
 .elif ${PDF_VERSION} == 1.3
@@ -78,23 +78,24 @@ pre-everything::
 post-configure:
 	@${REINPLACE_CMD} ${SUBST_CMD} ${WRKSRC}/extra/cups-pdf.conf
 	@${REINPLACE_CMD} -e \
-	's,CPCONFIG "/etc/cups/cups-pdf.conf",CPCONFIG "${PREFIX}/etc/cups/cups-pdf.conf",' \
-	${WRKSRC}/src/cups-pdf.h
+		's,CPCONFIG "/etc/cups/cups-pdf.conf",CPCONFIG "${PREFIX}/etc/cups/cups-pdf.conf",' \
+		${WRKSRC}/src/cups-pdf.h
 
 do-build:
-	cd ${WRKSRC}/src; ${CC} ${CFLAGS} -o cups-pdf cups-pdf.c
+	cd ${WRKSRC}/src && ${CC} ${CFLAGS} ${LDFLAGS} -o cups-pdf cups-pdf.c
 
 do-install:
-	${MKDIR} ${STAGEDIR}${PREFIX}/libexec/cups/backend
-	${INSTALL} ${WRKSRC}/src/cups-pdf ${STAGEDIR}${PREFIX}/libexec/cups/backend
-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/cups/backend/cups-pdf
-	${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model
+	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/cups/backend
+	${INSTALL_PROGRAM} ${WRKSRC}/src/cups-pdf ${STAGEDIR}${PREFIX}/libexec/cups/backend
+	@${MKDIR} ${STAGEDIR}${PREFIX}/share/cups/model
 	${INSTALL_DATA} ${WRKSRC}/extra/CUPS-PDF.ppd \
 		${STAGEDIR}${PREFIX}/share/cups/model/CUPS-PDF.ppd
-	${MKDIR} ${STAGEDIR}${PREFIX}/etc/cups
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
+	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/cups
 	${INSTALL_DATA} ${WRKSRC}/extra/cups-pdf.conf \
 		${STAGEDIR}${PREFIX}/etc/cups/cups-pdf.conf.sample
+
+do-install-DOCS-on:
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/
 
 .include <bsd.port.mk>

Modified: head/print/cups-pdf/pkg-descr
==============================================================================
--- head/print/cups-pdf/pkg-descr	Mon Jul 15 08:56:40 2019	(r506646)
+++ head/print/cups-pdf/pkg-descr	Mon Jul 15 09:02:15 2019	(r506647)
@@ -4,4 +4,4 @@ will be able to choose "CUPS-PDF (Virtual PDF Printer)
 printer in CUPS. Once you print to the new device all converted PDF files will
 be placed in the specified directory.
 
-WWW: http://www.cups-pdf.de/
+WWW: https://www.cups-pdf.de/



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201907150902.x6F92F7X013086>