svn commit: r395039 - in head/graphics: . peps xpeps

[Hiroki Sato]

Author: hrs
Date: Sat Aug 22 15:43:04 2015
New Revision: 395039
URL: https://svnweb.freebsd.org/changeset/ports/395039

Log:
  - Split X11 part into graphics/xpeps from graphics/peps.
  - Add LICENSE.
  - doceng@ takes maintainership becuase this is used in textproc/docproj.

Added:
  head/graphics/xpeps/
     - copied from r395030, head/graphics/peps/
Modified:
  head/graphics/Makefile
  head/graphics/peps/Makefile
  head/graphics/xpeps/Makefile
  head/graphics/xpeps/pkg-descr

Modified: head/graphics/Makefile
==============================================================================
--- head/graphics/Makefile	Sat Aug 22 15:34:34 2015	(r395038)
+++ head/graphics/Makefile	Sat Aug 22 15:43:04 2015	(r395039)
@@ -1051,6 +1051,7 @@
     SUBDIR += xoris
     SUBDIR += xournal
     SUBDIR += xpaint
+    SUBDIR += xpeps
     SUBDIR += xpdf
     SUBDIR += xpx
     SUBDIR += xsane

Modified: head/graphics/peps/Makefile
==============================================================================
--- head/graphics/peps/Makefile	Sat Aug 22 15:34:34 2015	(r395038)
+++ head/graphics/peps/Makefile	Sat Aug 22 15:43:04 2015	(r395039)
@@ -3,41 +3,37 @@
 
 PORTNAME=	peps
 PORTVERSION=	2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	graphics
 MASTER_SITES=	http://peps.redprince.net/peps/ \
 		ftp://ftp.peps.redprince.net/unix/peps/
 
-MAINTAINER=	ports at FreeBSD.org
+MAINTAINER=	doceng at FreeBSD.org
 COMMENT=	Converts EPS images to anti-aliased bitmaps
 
+LICENSE=	BSD2CLAUSE
+
 USES=		ghostscript:run
 MAKE_ENV=	GSPATH="${LOCALBASE}/bin/gs" GZPATH="/usr/bin/gzip" \
 		ETC="${PREFIX}/etc"
 
+ALL_TARGET=	peps
 PLIST_FILES=	bin/peps \
 		etc/peps.mime \
 		man/man1/peps.1.gz
 PORTDOCS=	peps.pdf
 
-OPTIONS_DEFINE=	DOCS X11
-OPTIONS_DEFAULT=	X11
-
-X11_PLIST_FILES=	bin/xpeps
+OPTIONS_DEFINE=	DOCS
+OPTIONS_DEFAULT=DOCS
 
 .include <bsd.port.options.mk>
 
-.if ! ${PORT_OPTIONS:MX11}
-ALL_TARGET=	peps
-.endif
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/peps ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MX11}
-	${INSTALL_PROGRAM} ${WRKSRC}/xpeps ${STAGEDIR}${PREFIX}/bin
-.endif
 	${INSTALL_MAN} ${WRKSRC}/peps.1 ${STAGEDIR}${MANPREFIX}/man/man1
 	${INSTALL_DATA} ${WRKSRC}/peps.mime ${STAGEDIR}${PREFIX}/etc
+
+post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/peps.pdf ${STAGEDIR}${DOCSDIR}
 

Modified: head/graphics/xpeps/Makefile
==============================================================================
--- head/graphics/peps/Makefile	Sat Aug 22 13:27:34 2015	(r395030)
+++ head/graphics/xpeps/Makefile	Sat Aug 22 15:43:04 2015	(r395039)
@@ -3,42 +3,26 @@
 
 PORTNAME=	peps
 PORTVERSION=	2.0
-PORTREVISION=	5
 CATEGORIES=	graphics
 MASTER_SITES=	http://peps.redprince.net/peps/ \
 		ftp://ftp.peps.redprince.net/unix/peps/
+PKGNAMEPREFIX=	x
 
-MAINTAINER=	ports at FreeBSD.org
-COMMENT=	Converts EPS images to anti-aliased bitmaps
+MAINTAINER=	doceng at FreeBSD.org
+COMMENT=	Converts EPS images to anti-aliased bitmaps with X11 support
 
-USES=		ghostscript:run
-MAKE_ENV=	GSPATH="${LOCALBASE}/bin/gs" GZPATH="/usr/bin/gzip" \
-		ETC="${PREFIX}/etc"
-
-PLIST_FILES=	bin/peps \
-		etc/peps.mime \
-		man/man1/peps.1.gz
-PORTDOCS=	peps.pdf
+LICENSE=	BSD2CLAUSE
 
-OPTIONS_DEFINE=	DOCS X11
-OPTIONS_DEFAULT=	X11
+RUN_DEPENDS=	peps>=2.0_6:${PORTSDIR}/graphics/peps
 
-X11_PLIST_FILES=	bin/xpeps
-
-.include <bsd.port.options.mk>
+USES=		ghostscript:x11,run
+MAKE_ENV=	GSPATH="${LOCALBASE}/bin/gs" GZPATH="/usr/bin/gzip" \
+		ETC="${PREFIX}/etc"
+ALL_TARGET=	xpeps
 
-.if ! ${PORT_OPTIONS:MX11}
-ALL_TARGET=	peps
-.endif
+PLIST_FILES=	bin/xpeps
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/peps ${STAGEDIR}${PREFIX}/bin
-.if ${PORT_OPTIONS:MX11}
 	${INSTALL_PROGRAM} ${WRKSRC}/xpeps ${STAGEDIR}${PREFIX}/bin
-.endif
-	${INSTALL_MAN} ${WRKSRC}/peps.1 ${STAGEDIR}${MANPREFIX}/man/man1
-	${INSTALL_DATA} ${WRKSRC}/peps.mime ${STAGEDIR}${PREFIX}/etc
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/peps.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Modified: head/graphics/xpeps/pkg-descr
==============================================================================
--- head/graphics/peps/pkg-descr	Sat Aug 22 13:27:34 2015	(r395030)
+++ head/graphics/xpeps/pkg-descr	Sat Aug 22 15:43:04 2015	(r395039)
@@ -5,4 +5,6 @@ conversion program, or use it on-line to
 them out to a web browser, even compressing them if the browser supports
 gzip compression.
 
+Xpeps is peps with X11 support.
+
 WWW: http://peps.redprince.net/peps/