From owner-svn-ports-head@FreeBSD.ORG  Sun Jul  6 13:40:29 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id E99D444F;
 Sun,  6 Jul 2014 13:40:29 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id D761622B5;
 Sun,  6 Jul 2014 13:40:29 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s66DeTRD003124;
 Sun, 6 Jul 2014 13:40:29 GMT (envelope-from pawel@svn.freebsd.org)
Received: (from pawel@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s66DeTKt003123;
 Sun, 6 Jul 2014 13:40:29 GMT (envelope-from pawel@svn.freebsd.org)
Message-Id: <201407061340.s66DeTKt003123@svn.freebsd.org>
From: Pawel Pekala <pawel@FreeBSD.org>
Date: Sun, 6 Jul 2014 13:40:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360900 - head/print/hp2xx
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 06 Jul 2014 13:40:30 -0000

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>