svn commit: r359832 - in head/print/cups-pstoraster: . files

[Jason E. Hale]

Author: jhale
Date: Mon Jun 30 12:06:19 2014
New Revision: 359832
URL: http://svnweb.freebsd.org/changeset/ports/359832
QAT: https://qat.redports.org/buildarchive/r359832/

Log:
  - Support staging [1]
  - Simplify MASTER_SITES
  - Add LICENSE (GPLv2)
  - Convert CJK knob to an option
  - Strip binaries
  - Rename patch with ':' in filename
  
  PR:		190078 [1] (based on)
  Submitted by:	Matthieu Volat <mazhe at alkumuna.eu> [1]
  Approved by:	maintainer timeout / portmgr blanket

Added:
  head/print/cups-pstoraster/files/patch-src__unixinst.mk
     - copied unchanged from r359830, head/print/cups-pstoraster/files/patch-src:unixinst.mak
Deleted:
  head/print/cups-pstoraster/files/patch-src:unixinst.mak
Modified:
  head/print/cups-pstoraster/Makefile

Modified: head/print/cups-pstoraster/Makefile
==============================================================================
--- head/print/cups-pstoraster/Makefile	Mon Jun 30 12:04:09 2014	(r359831)
+++ head/print/cups-pstoraster/Makefile	Mon Jun 30 12:06:19 2014	(r359832)
@@ -3,23 +3,18 @@
 
 PORTNAME=	cups-pstoraster
 PORTVERSION=	8.15.4
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_EASYSW}
-MASTER_SITE_SUBDIR=	ghostscript/${PORTVERSION}
+MASTER_SITES=	EASYSW/ghostscript/${PORTVERSION}
 DISTNAME=	espgs-${ESPGS_VER}-source
 DIST_SUBDIR=	ghostscript
 
 MAINTAINER=	rea at FreeBSD.org
 COMMENT=	Postscript interpreter for CUPS printing to non-PS printers
 
-LIB_DEPENDS=	cupsimage.2:${PORTSDIR}/print/cups-image
+LICENSE=	GPLv2
 
-.if defined(WITH_CJK)
-RUN_DEPENDS+=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std \
-		${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
-EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-lib_cidfmap
-.endif
+LIB_DEPENDS=	libcupsimage.so:${PORTSDIR}/print/cups-image
 
 ESPGS_VER=	${PORTVERSION}
 GS_VERSION=	8.15
@@ -39,13 +34,12 @@ MAKE_ARGS=	CFLAGS_STANDARD="${CFLAGS} -D
 		DEVICE_DEVS="\$$(DD)cups.dev \$$(DD)pxlcolor.dev \$$(DD)pxlmono.dev"
 PLIST_SUB=	GS_VERSION="${GS_VERSION}"
 
-NO_STAGE=	yes
-pre-everything::
-.if !defined(WITH_CJK)
-	@${ECHO_MSG} ""
-	@${ECHO_MSG} "Define WITH_CJK to enable Japanese PostScript documents processing"
-	@${ECHO_MSG} ""
-.endif
+OPTIONS_DEFINE=	CJK
+
+CJK_DESC=		Japanese PostScript documents processing
+CJK_RUN_DEPENDS=	${LOCALBASE}/share/fonts/std.ja_JP/Ryumin-Light:${PORTSDIR}/japanese/font-std \
+			${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+CJK_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-lib_cidfmap
 
 pre-configure:
 	${RM} -f ${WRKSRC}/ijs/config.guess ${WRKSRC}/ijs/missing ${WRKSRC}/ijs/config.sub ${WRKSRC}/ijs/install-sh ${WRKSRC}/ijs/ltmain.sh
@@ -54,6 +48,8 @@ pre-configure:
 post-patch:
 	${LN} -sf ${WRKSRC}/pstoraster/gdevcups.c ${WRKSRC}/src
 	${CAT} ${FILESDIR}/cups.contrib.mak >> ${WRKSRC}/src/contrib.mak
+	${FIND} ${WRKSRC} -name "*.mak" -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's|$$(install_prefix)|$$(DESTDIR)$$(install_prefix)|g'
 .for file in pstopxl pstoraster
 	${REINPLACE_CMD} -e 's:@prefix@:${PREFIX}:g ; \
 		 s:@exec_prefix@:${PREFIX}:g ; \
@@ -73,4 +69,7 @@ pre-build:
 	${MKDIR} ${WRKSRC}/bin
 	${MKDIR} ${WRKSRC}/obj
 
+post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/espgs
+
 .include <bsd.port.mk>

Copied: head/print/cups-pstoraster/files/patch-src__unixinst.mk (from r359830, head/print/cups-pstoraster/files/patch-src:unixinst.mak)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/print/cups-pstoraster/files/patch-src__unixinst.mk	Mon Jun 30 12:06:19 2014	(r359832, copy of r359830, head/print/cups-pstoraster/files/patch-src:unixinst.mak)
@@ -0,0 +1,20 @@
+--- src/unixinst.mak.orig	Fri Dec  1 21:54:25 2006
++++ src/unixinst.mak	Fri Dec  1 21:55:49 2006
+@@ -18,7 +18,7 @@
+ # containing the `install' targets.
+ # This is the very last part of the makefile for these configurations.
+ 
+-install: install-exec install-scripts install-data $(INSTALL_SHARED) install-addons-extras
++install: install-exec install-data $(INSTALL_SHARED) install-addons-extras
+ 
+ # The sh -c in the rules below is required because Ultrix's implementation
+ # of sh -e terminates execution of a command if any error occurs, even if
+@@ -53,7 +53,7 @@
+ PSEXDIR=$(PSLIBDIR)/../examples
+ PSMANDIR=$(PSLIBDIR)/../man
+ 
+-install-data: install-libdata install-resdata install-doc install-man install-examples
++install-data: install-libdata install-resdata
+ 
+ # There's no point in providing a complete dependency list: we include
+ # one file from each subdirectory just as a sanity check.