Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 7 Mar 2014 14:02:38 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r347387 - head/graphics/xpdf
Message-ID:  <201403071402.s27E2cNt070801@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Fri Mar  7 14:02:37 2014
New Revision: 347387
URL: http://svnweb.freebsd.org/changeset/ports/347387
QAT: https://qat.redports.org/buildarchive/r347387/

Log:
  Support stage
  Use options helpers
  Modernise

Modified:
  head/graphics/xpdf/Makefile
  head/graphics/xpdf/pkg-plist

Modified: head/graphics/xpdf/Makefile
==============================================================================
--- head/graphics/xpdf/Makefile	Fri Mar  7 13:46:31 2014	(r347386)
+++ head/graphics/xpdf/Makefile	Fri Mar  7 14:02:37 2014	(r347387)
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	support/xpdf
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Display PDF files and convert them to other formats
 
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS=	libfreetype.so:${PORTSDIR}/print/freetype2
 
 GNU_CONFIGURE=	yes
 USES=		gmake
@@ -26,62 +26,35 @@ CONFIGURE_ARGS=	--enable-opi \
 
 MANPREFIX=	${PREFIX}/share/xpdf
 
-OPTIONS_DEFINE=	LIBPAPER TYPE1 X11
+OPTIONS_DEFINE=	LIBPAPER TYPE1 X11 DOCS
 LIBPAPER_DESC=	Enable libpaper
 TYPE1_DESC=	Ghostscript type1 fonts
 OPTIONS_DEFAULT=	TYPE1 X11
+OPTIONS_SUB=		yes
 
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+TYPE1_RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
 
-.if ${PORT_OPTIONS:MTYPE1}
-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/n021003l.pfb:${PORTSDIR}/print/gsfonts
-.endif
-
-.if ${PORT_OPTIONS:MLIBPAPER}
-LIB_DEPENDS+=	paper.2:${PORTSDIR}/print/libpaper
-CONFIGURE_ARGS+=--with-libpaper-library="${LOCALBASE}/lib" \
+LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
+LIBPAPER_CONFIGURE_ON=--with-libpaper-library="${LOCALBASE}/lib" \
 		--with-libpaper-includes="${LOCALBASE}/include"
-.else
-CONFIGURE_ARGS+=--without-libpaper-library
-.endif
+LIBPAPER_CONFIGURE_OFF=--without-libpaper-library
 
 .if defined(A4)
 CONFIGURE_ARGS+=	--enable-a4-paper
 .endif
 
-MAN1=		pdffonts.1 \
-		pdfimages.1 \
-		pdfinfo.1 \
-		pdfdetach.1 \
-		pdftoppm.1 \
-		pdftops.1 \
-		pdftotext.1
-MAN5=		xpdfrc.5
-
-.if ${PORT_OPTIONS:MX11}
-CONFIGURE_ARGS+=	--with-x
-USES+=			motif
-MAN1+=			xpdf.1
-PLIST_SUB+=		X11=""
-.else
-CONFIGURE_ARGS+=	--without-x
-PLIST_SUB+=		X11="@comment "
-.endif
+X11_CONFIGURE_WITH=	x
+X11_USES=		motif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|undef USE_COMBO_BOX|define USE_COMBO_BOX 1|' \
 		${WRKSRC}/xpdf/XPDFViewer.h
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ANNOUNCE CHANGES README misc/hello.pdf
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
-.if ${PORT_OPTIONS:MX11}
-	${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${PREFIX}/bin/xpdf
-.endif
+	${LN} -sf ${PREFIX}/libexec/xpdf/xpdf ${STAGEDIR}${PREFIX}/bin/xpdf
 
 .include <bsd.port.mk>

Modified: head/graphics/xpdf/pkg-plist
==============================================================================
--- head/graphics/xpdf/pkg-plist	Fri Mar  7 13:46:31 2014	(r347386)
+++ head/graphics/xpdf/pkg-plist	Fri Mar  7 14:02:37 2014	(r347387)
@@ -8,6 +8,15 @@ libexec/xpdf/pdftotext
 %%X11%%libexec/xpdf/xpdf
 %%X11%%bin/xpdf
 etc/xpdfrc
+%%DATADIR%%/man/man1/pdfdetach.1.gz
+%%DATADIR%%/man/man1/pdffonts.1.gz
+%%DATADIR%%/man/man1/pdfimages.1.gz
+%%DATADIR%%/man/man1/pdfinfo.1.gz
+%%DATADIR%%/man/man1/pdftoppm.1.gz
+%%DATADIR%%/man/man1/pdftops.1.gz
+%%DATADIR%%/man/man1/pdftotext.1.gz
+%%X11%%%%DATADIR%%/man/man1/xpdf.1.gz
+%%DATADIR%%/man/man5/xpdfrc.5.gz
 %%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES
 %%PORTDOCS%%%%DOCSDIR%%/README



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