cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to psutils-1.21.

Browse Source 
Remove hardcoded papersize FLAVORs, use libpaper instead (default paper
size is set in /etc/papersize).
This commit is contained in:
ajacoutot 2013-11-02 08:38:58 +00:00
parent 05a465b0b0
commit 45a60e447f
7 changed files with 24 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
print/psutils/Makefile
View File

@ -1,43 +1,30 @@
# $OpenBSD: Makefile,v 1.37 2013/03/11 11:37:54 espie Exp $
# $OpenBSD: Makefile,v 1.38 2013/11/02 08:38:58 ajacoutot Exp $
COMMENT= utilities for manipulating PostScript documents
MINV= 17
DISTNAME= psutils-p${MINV}
PKGNAME= psutils-1.${MINV}
REVISION = 4
# tarball from Fedora SRPM
DISTNAME= psutils-1.21
EXTRACT_SUFX= .tar.xz
CATEGORIES= print
MASTER_SITES= ${MASTER_SITE_TEX_CTAN:=support/psutils/}
HOMEPAGE= http://gershwin.ens.fr/vdaniel/Doc-Locale/Outils-Gnu-Linux/PsUtils/
HOMEPAGE= https://github.com/rrthomas/psutils
MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# see LICENSE in WRKSRC
# Apple copyrighted files have been removed from the package
# BSD-like (${WRKSRC}/LICENSE)
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += c
WANTLIB += c paper
WRKDIST= ${WRKDIR}/psutils
USE_GROFF = Yes
MASTER_SITES= https://distfiles.bsdfrog.org/
FLAVORS= a4
FLAVOR?=
LIB_DEPENDS= print/libpaper
.if ${FLAVOR} == a4
PAPERSIZE= a4
.else
PAPERSIZE= letter
.endif
USE_GMAKE= Yes
MAKE_FLAGS= PAPER=${PAPERSIZE}
FAKE_FLAGS= PAPER=${PAPERSIZE}
MAKE_FILE= Makefile.unix
NO_TEST= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
.include <bsd.port.mk>

7
print/psutils/distinfo
View File

@ -1,5 +1,2 @@
MD5 (psutils-p17.tar.gz) = sWFSLzvRUHZVMmr6fbSgrQ==
RMD160 (psutils-p17.tar.gz) = FJTzfnroCfDkRtUtSzohzUhpDMA=
SHA1 (psutils-p17.tar.gz) = bx7LWEbP+2RIJqAr2RU/5dY4eps=
SHA256 (psutils-p17.tar.gz) = OFPreVhLqPvieoFUJbZan38Vsljg1DoFqFa9t11YiuQ=
SIZE (psutils-p17.tar.gz) = 62039
SHA256 (psutils-1.21.tar.xz) = WVft4Wi/0JsbjjEZBmctbU+MnLV1VSvoOGYpDtGZVKE=
SIZE (psutils-1.21.tar.xz) = 150796

109
print/psutils/patches/patch-Makefile_unix
View File

@ -1,109 +0,0 @@
$OpenBSD: patch-Makefile_unix,v 1.3 2011/09/09 15:47:19 naddy Exp $
Remove Apple copyrighted files (from Fedora).
--- Makefile.unix.orig Tue Mar 11 23:52:59 1997
+++ Makefile.unix Thu Sep 8 21:24:35 2011
@@ -25,31 +25,29 @@ PAPER=a4
OS = UNIX
-BINDIR = /usr/local/bin
+BINDIR = ${PREFIX}/bin
SCRIPTDIR = $(BINDIR)
-INCLUDEDIR = /usr/local/share/psutils
-PERL = /usr/local/bin/perl
+INCLUDEDIR = ${PREFIX}/share/psutils
+PERL = /usr/bin/perl
BINMODE = 0755
MANMODE = 0644
CHMOD = chmod
-INSTALL = install -c -m $(BINMODE)
-INSTALLMAN = install -c -m $(MANMODE)
MANEXT = 1
-MANDIR = /usr/local/share/man/man$(MANEXT)
+MANDIR = ${PREFIX}/man/man$(MANEXT)
-CC = gcc
-CFLAGS = -DPAPER=\"$(PAPER)\" -DUNIX -O -Wall
+CC ?= gcc
+CFLAGS += -DPAPER=\"$(PAPER)\" -DUNIX -Wall
BIN = psbook psselect pstops epsffit psnup \
psresize
SHELLSCRIPTS = getafm showchar
-PERLSCRIPTS = fixfmps fixmacps fixpsditps fixpspps \
+PERLSCRIPTS = fixfmps fixpsditps fixpspps \
fixtpps fixwfwps fixwpps fixscribeps fixwwps \
fixdlsrps extractres includeres psmerge
MANPAGES = psbook.$(MANEXT) psselect.$(MANEXT) pstops.$(MANEXT) epsffit.$(MANEXT) psnup.$(MANEXT) \
psresize.$(MANEXT) psmerge.$(MANEXT) fixscribeps.$(MANEXT) getafm.$(MANEXT) \
- fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixmacps.$(MANEXT) fixpsditps.$(MANEXT) \
+ fixdlsrps.$(MANEXT) fixfmps.$(MANEXT) fixpsditps.$(MANEXT) \
fixpspps.$(MANEXT) fixtpps.$(MANEXT) fixwfwps.$(MANEXT) fixwpps.$(MANEXT) \
fixwwps.$(MANEXT) extractres.$(MANEXT) includeres.$(MANEXT)
INCLUDES = md68_0.ps md71_0.ps
@@ -106,9 +104,9 @@ fixfmps: fixfmps.pl
$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
$(CHMOD) $(BINMODE) $@
-fixmacps: fixmacps.pl
- $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
- $(CHMOD) $(BINMODE) $@
+#fixmacps: fixmacps.pl
+# $(PERL) maketext OS=$(OS) PERL=$(PERL) INCLUDE=$(INCLUDEDIR) $? > $@
+# $(CHMOD) $(BINMODE) $@
fixpsditps: fixpsditps.pl
$(PERL) maketext OS=$(OS) PERL=$(PERL) $? > $@
@@ -174,8 +172,8 @@ psmerge.$(MANEXT): psmerge.man
fixfmps.$(MANEXT): fixfmps.man
$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
-fixmacps.$(MANEXT): fixmacps.man
- $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
+#fixmacps.$(MANEXT): fixmacps.man
+# $(PERL) maketext "MAN=$(MANPAGES)" INCLUDE=$(INCLUDEDIR) $? > $@
fixpsditps.$(MANEXT): fixpsditps.man
$(PERL) maketext "MAN=$(MANPAGES)" $? > $@
@@ -216,33 +214,33 @@ clean:
veryclean realclean: clean
rm -f $(BIN) $(PERLSCRIPTS) $(MANPAGES)
-install: install.bin install.script install.man install.include
+install: install.bin install.script install.man
install.bin: $(BIN)
-mkdir $(BINDIR)
@for i in $(BIN); do \
echo Installing $$i; \
- $(INSTALL) $$i $(BINDIR); \
+ $(BSD_INSTALL_PROGRAM) $$i $(BINDIR); \
done
install.script: $(PERLSCRIPTS) $(SHELLSCRIPTS)
-mkdir $(SCRIPTDIR)
@for i in $(PERLSCRIPTS) $(SHELLSCRIPTS); do \
echo Installing $$i; \
- $(INSTALL) $$i $(SCRIPTDIR); \
+ $(BSD_INSTALL_SCRIPT) $$i $(SCRIPTDIR); \
done
install.include: $(INCLUDES)
-mkdir $(INCLUDEDIR)
@for i in $(INCLUDES); do \
echo Installing $$i; \
- $(INSTALLMAN) $$i $(INCLUDEDIR); \
+ $(BSD_INSTALL_DATA) $$i $(INCLUDEDIR); \
done
install.man: $(MANPAGES)
-mkdir $(MANDIR)
@for i in $(MANPAGES); do \
echo Installing manual page for $$i; \
- $(INSTALLMAN) $$i $(MANDIR)/$$i; \
+ $(BSD_INSTALL_MAN) $$i $(MANDIR)/$$i; \
done

19
print/psutils/patches/patch-psutil_c
View File

@ -1,19 +0,0 @@
$OpenBSD: patch-psutil_c,v 1.1 2010/02/06 11:26:29 ajacoutot Exp $
Add support for B4 paper size, from FreeBSD.
--- psutil.c.orig Tue Mar 11 23:53:04 1997
+++ psutil.c Sat Feb 6 11:28:24 2010
@@ -48,10 +48,12 @@ static Paper papersizes[] = {
{ "a4", 595, 842 }, /* 21cm * 29.7cm */
{ "a5", 421, 595 }, /* 14.85cm * 21cm */
{ "b5", 516, 729 }, /* 18.2cm * 25.72cm */
+ { "b4", 729, 1032 }, /* 25.72cm * 36.4cm */
{ "A3", 842, 1191 }, /* 29.7cm * 42cm */
{ "A4", 595, 842 }, /* 21cm * 29.7cm */
{ "A5", 421, 595 }, /* 14.85cm * 21cm */
{ "B5", 516, 729 }, /* 18.2cm * 25.72cm */
+ { "B4", 729, 1032 }, /* 25.72cm * 36.4cm */
{ "letter", 612, 792 }, /* 8.5in * 11in */
{ "legal", 612, 1008 }, /* 8.5in * 14in */
{ "ledger", 1224, 792 }, /* 17in * 11in */

9
print/psutils/pkg/DESCR
View File

@ -1,7 +1,2 @@
This package contains some utilities for manipulating PostScript
documents. Page selection and rearrangement are supported, including
arrangement into signatures for booklet printing, and page merging for
n-up printing.
Available flavor(s):
a4 - set the default paper size to A4 (default is letter)
PSUtils is a suite of utilities for manipulating PostScript documents
produced according to the Document Structuring Conventions.

4
print/psutils/pkg/PFRAG.no-a4
View File

@ -1,4 +0,0 @@
@comment $OpenBSD: PFRAG.no-a4,v 1.1 2012/04/28 12:16:29 espie Exp $
@pkgpath print/psutils[,a3][,a5][,b5][,b4][,letter][,legal][,ledger]
@pkgpath print/psutils[,tabloid][,statement][,executive][,folio]
@pkgpath print/psutils[,quarto][,s10x14]

32
print/psutils/pkg/PLIST
View File

@ -1,41 +1,23 @@
@comment $OpenBSD: PLIST,v 1.9 2012/04/28 12:16:29 espie Exp $
!%%a4%%
@comment $OpenBSD: PLIST,v 1.10 2013/11/02 08:38:58 ajacoutot Exp $
@pkgpath print/psutils[,a3][,a4][,a5][,b5][,b4][,letter][,legal]
@pkgpath print/psutils[,ledger][,tabloid][,statement][,executive]
@pkgpath print/psutils[,folio][,quarto][,s10x14]
@bin bin/epsffit
bin/extractres
bin/fixdlsrps
bin/fixfmps
bin/fixpsditps
bin/fixpspps
bin/fixscribeps
bin/fixtpps
bin/fixwfwps
bin/fixwpps
bin/fixwwps
bin/getafm
bin/includeres
@bin bin/psbook
bin/psmerge
bin/psjoin
@bin bin/psnup
@bin bin/psresize
@bin bin/psselect
@bin bin/pstops
bin/showchar
@man man/man1/epsffit.1
@man man/man1/extractres.1
@man man/man1/fixdlsrps.1
@man man/man1/fixfmps.1
@man man/man1/fixpsditps.1
@man man/man1/fixpspps.1
@man man/man1/fixscribeps.1
@man man/man1/fixtpps.1
@man man/man1/fixwfwps.1
@man man/man1/fixwpps.1
@man man/man1/fixwwps.1
@man man/man1/getafm.1
@man man/man1/includeres.1
@man man/man1/psbook.1
@man man/man1/psmerge.1
@man man/man1/psjoin.1
@man man/man1/psnup.1
@man man/man1/psresize.1
@man man/man1/psselect.1
@man man/man1/pstops.1
@man man/man1/psutils.1