Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Jul 2014 12:29:22 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360889 - in head/print/epsonepl: . files
Message-ID:  <201407061229.s66CTMoi069498@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Sun Jul  6 12:29:21 2014
New Revision: 360889
URL: http://svnweb.freebsd.org/changeset/ports/360889
QAT: https://qat.redports.org/buildarchive/r360889/

Log:
  - Add staging support, allow it as regular user
  - Convert to new LIB_DEPENDS format
  - Use SUB_FILES for path substitution
  - Unmute install commands

Added:
  head/print/epsonepl/files/pkg-message.in
     - copied, changed from r360738, head/print/epsonepl/pkg-message
Deleted:
  head/print/epsonepl/pkg-message
Modified:
  head/print/epsonepl/Makefile
  head/print/epsonepl/files/Makefile
  head/print/epsonepl/pkg-plist

Modified: head/print/epsonepl/Makefile
==============================================================================
--- head/print/epsonepl/Makefile	Sun Jul  6 12:27:22 2014	(r360888)
+++ head/print/epsonepl/Makefile	Sun Jul  6 12:29:21 2014	(r360889)
@@ -12,20 +12,21 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Printer filter for EPSON EPL-5700L etc
 
-USE_GHOSTSCRIPT_RUN=	yes
+LIB_DEPENDS=	libijs.so:${PORTSDIR}/print/libijs
 
-LIB_DEPENDS=	ijs.1:${PORTSDIR}/print/libijs
+USES=		uidfix
+USE_GHOSTSCRIPT_RUN=	yes
 
 MAKEFILE=	${FILESDIR}/Makefile
+SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 post-extract:
 	@cd ${WRKSRC} && ${LS} ijs* | ${GREP} -v ${PORTNAME} | ${XARGS} ${RM}
 
 post-install:
-	@${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample ${PREFIX}/etc
-	@${MKDIR} ${DATADIR}
-	@${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.apsfilter ${DATADIR}
-	@${SED} -e 's#%%PREFIX%%#${PREFIX}#' ${PKGMESSAGE}
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample \
+		${STAGEDIR}${PREFIX}/etc
+	@${MKDIR} ${STAGEDIR}${DATADIR}
+	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.apsfilter ${STAGEDIR}${DATADIR}
 
 .include <bsd.port.mk>

Modified: head/print/epsonepl/files/Makefile
==============================================================================
--- head/print/epsonepl/files/Makefile	Sun Jul  6 12:27:22 2014	(r360888)
+++ head/print/epsonepl/files/Makefile	Sun Jul  6 12:29:21 2014	(r360889)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
-DESTDIR=	${PREFIX}
-BINDIR=	/bin
+DESTDIR=
+BINDIR=	${PREFIX}/bin
 
 CFLAGS+=	-I${LOCALBASE}/include/ijs
 LDADD=	-L${LOCALBASE}/lib -lijs

Copied and modified: head/print/epsonepl/files/pkg-message.in (from r360738, head/print/epsonepl/pkg-message)
==============================================================================
--- head/print/epsonepl/pkg-message	Sat Jul  5 12:19:32 2014	(r360738, copy source)
+++ head/print/epsonepl/files/pkg-message.in	Sun Jul  6 12:29:21 2014	(r360889)
@@ -4,6 +4,6 @@ You need to copy and customize 
 %%PREFIX%%/etc/epsonepl.conf[.sample]
 
 If you're using apsfilter then have a look 
-at %%PREFIX%%/share/epsonepl/epsonepl.apsfilter
+at %%DATADIR%%/epsonepl.apsfilter
 
 -------------------------------------------------------------------------

Modified: head/print/epsonepl/pkg-plist
==============================================================================
--- head/print/epsonepl/pkg-plist	Sun Jul  6 12:27:22 2014	(r360888)
+++ head/print/epsonepl/pkg-plist	Sun Jul  6 12:29:21 2014	(r360889)
@@ -1,5 +1,5 @@
 bin/ijs_server_epsonepl
 bin/ps2epl
 etc/epsonepl.conf.sample
-share/epsonepl/epsonepl.apsfilter
+%%DATADIR%%/epsonepl.apsfilter
 @dirrm share/epsonepl



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