Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 6 Jul 2014 13:40:29 +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: r360900 - head/print/hp2xx
Message-ID:  <201407061340.s66DeTKt003123@svn.freebsd.org>

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

Log:
  - Add staging support
  - Convert to new LIB_DEPENDS format, options framework
  - Switch to PLIST_FILES

Deleted:
  head/print/hp2xx/pkg-plist
Modified:
  head/print/hp2xx/Makefile

Modified: head/print/hp2xx/Makefile
==============================================================================
--- head/print/hp2xx/Makefile	Sun Jul  6 13:38:01 2014	(r360899)
+++ head/print/hp2xx/Makefile	Sun Jul  6 13:40:29 2014	(r360900)
@@ -9,10 +9,10 @@ MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A HPGL to vector- and raster formats converter and previewer for X11
+COMMENT=	HPGL to vector and raster formats converter and previewer for X11
 
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
-		tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png \
+		libtiff.so:${PORTSDIR}/graphics/tiff
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/sources
 
@@ -20,21 +20,29 @@ USES=		makeinfo
 MAKE_ENV=	DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" \
 		PREVIEWER="${PREVIEWER}"
 
-MAN1=		hp2xx.1
+PLIST_FILES=	bin/hp2xx man/man1/hp2xx.1.gz
 INFO=		hp2xx
 
 CPPFLAGS+=	-DUNIX -I${LOCALBASE}/include
 LDFLAGS+=	-lm -L${LOCALBASE}/lib -ltiff -lpng -lz
 
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
-PREVIEWER=	no_prev
-.else
-USE_XORG=	x11
-CPPFLAGS+=	-DHAS_UNIX_X11 -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lX11
+OPTIONS_DEFINE=	X11
+OPTIONS_DEFAULT=X11
+
+X11_USE=	XORG=x11
+X11_CPPFLAGS=	-DHAS_UNIX_X11 -I${LOCALBASE}/include
+X11_LDFLAGS=	-L${LOCALBASE}/lib -lX11
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
 PREVIEWER=	to_x11
+.else
+PREVIEWER=	no_prev
 .endif
 
-NO_STAGE=	yes
+post-patch:
+	@${REINPLACE_CMD} -E 's,(bin|info|man1)dir),DESTDIR)$$(&,' \
+		${WRKSRC}/Makefile
+
 .include <bsd.port.mk>



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