Date: Sun, 2 Nov 2014 14:24:08 +0000 (UTC) From: Bartek Rutkowski <robak@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r372071 - in head/print/hp2xx: . files Message-ID: <201411021424.sA2EO8NX039298@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: robak Date: Sun Nov 2 14:24:07 2014 New Revision: 372071 URL: https://svnweb.freebsd.org/changeset/ports/372071 QAT: https://qat.redports.org/buildarchive/r372071/ Log: print/hp2xx: multiple fixes - Fix building on -CURRENT - Add LICENSE - Pet portlint PR: 194500 Submitted by: Kato Tsuguru <tkato432@yahoo.com> Approved by: mentors (implicit) Modified: head/print/hp2xx/Makefile head/print/hp2xx/files/patch-Makefile head/print/hp2xx/files/patch-doc_hp2xxinf.tex Modified: head/print/hp2xx/Makefile ============================================================================== --- head/print/hp2xx/Makefile Sun Nov 2 14:13:59 2014 (r372070) +++ head/print/hp2xx/Makefile Sun Nov 2 14:24:07 2014 (r372071) @@ -3,39 +3,36 @@ PORTNAME= hp2xx PORTVERSION= 3.4.4 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= print x11 -MASTER_SITES= ${MASTER_SITE_GNU} -MASTER_SITE_SUBDIR= ${PORTNAME} +MASTER_SITES= GNU MAINTAINER= ports@FreeBSD.org COMMENT= HPGL to vector and raster formats converter and previewer for X11 +LICENSE= GPLv2 # (or later) + LIB_DEPENDS= libpng15.so:${PORTSDIR}/graphics/png \ libtiff.so:${PORTSDIR}/graphics/tiff -WRKSRC= ${WRKDIR}/${DISTNAME}/sources +WRKSRC_SUBDIR= sources USES= makeinfo MAKE_ENV= DEFINES="${CPPFLAGS}" ALL_LIBS="${LDFLAGS}" -PLIST_FILES= bin/hp2xx man/man1/hp2xx.1.gz -INFO= hp2xx - CPPFLAGS+= -DUNIX -I${LOCALBASE}/include LDFLAGS+= -lm -L${LOCALBASE}/lib -ltiff -lpng -lz -OPTIONS_DEFINE= X11 -OPTIONS_DEFAULT=X11 +INFO= hp2xx +PLIST_FILES= bin/hp2xx man/man1/hp2xx.1.gz -X11_USE= XORG=x11 -X11_CPPFLAGS= -DHAS_UNIX_X11 -I${LOCALBASE}/include -X11_LDFLAGS= -L${LOCALBASE}/lib -lX11 +OPTIONS_DEFINE= X11 +OPTIONS_DEFAULT= X11 + +X11_USE= XORG=x11 X11_MAKE_ENV= PREVIEWER=to_x11 X11_MAKE_ENV_OFF= PREVIEWER=no_prev - -post-patch: - @${REINPLACE_CMD} -E 's,(bin|info|man1)dir),DESTDIR)$$(&,' \ - ${WRKSRC}/Makefile +X11_CPPFLAGS= -DHAS_UNIX_X11 -I${LOCALBASE}/include +X11_LDFLAGS= -L${LOCALBASE}/lib -lX11 .include <bsd.port.mk> Modified: head/print/hp2xx/files/patch-Makefile ============================================================================== --- head/print/hp2xx/files/patch-Makefile Sun Nov 2 14:13:59 2014 (r372070) +++ head/print/hp2xx/files/patch-Makefile Sun Nov 2 14:24:07 2014 (r372071) @@ -86,15 +86,15 @@ - -$(STRIP) $(PROGRAM) - -$(CP) $(PROGRAM) $(bindir) - -$(CHMOD) 755 $(bindir)/$(PROGRAM) -+ ${BSD_INSTALL_PROGRAM} $(PROGRAM) $(bindir) ++ ${BSD_INSTALL_PROGRAM} $(PROGRAM) $(DESTDIR)$(bindir) install-info: hp2xx.info - -$(CP) hp2xx.info $(infodir) - -$(CHMOD) 644 $(infodir)/hp2xx.info -+ ${BSD_INSTALL_DATA} hp2xx.info $(infodir) ++ ${BSD_INSTALL_DATA} hp2xx.info $(DESTDIR)$(infodir) install-man: ../doc/hp2xx.1 - -$(CP) ../doc/hp2xx.1 $(man1dir) - -$(CHMOD) 644 $(man1dir)/hp2xx.1 -+ ${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(man1dir) ++ ${BSD_INSTALL_MAN} ../doc/hp2xx.1 $(DESTDIR)$(man1dir) Modified: head/print/hp2xx/files/patch-doc_hp2xxinf.tex ============================================================================== --- head/print/hp2xx/files/patch-doc_hp2xxinf.tex Sun Nov 2 14:13:59 2014 (r372070) +++ head/print/hp2xx/files/patch-doc_hp2xxinf.tex Sun Nov 2 14:24:07 2014 (r372071) @@ -12,8 +12,8 @@ @c @smallbook @c @cropmarks @c %**end of header -@@ -35,14 +40,6 @@ - @c 00/09/20 V 1.2 MK fixed INFO-DIR-ENTRY, updates for 3.4.0 +@@ -36,14 +41,6 @@ + @c 03/06/21 V 1.4 MK updates and fixes for 3.4.4 @c THIS MANUAL REQUIRES TEXINFO-2 macros and info-makers to format properly. -@ifinfo @@ -27,3 +27,12 @@ @c @ifinfo This file documents the HP-GL converter HP2XX +@@ -92,7 +89,7 @@ + @page + @tex + {\parskip=0pt +-\hfill mk\@daveg.com\par ++\hfill mk@@daveg.com\par + \hfill {\it Using HP2XX}, \manvers\par + \hfill \TeX{}info \texinfoversion\par + }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201411021424.sA2EO8NX039298>