diff --git a/print/psutils/Makefile b/print/psutils/Makefile index e11821191ca..7137274bd32 100644 --- a/print/psutils/Makefile +++ b/print/psutils/Makefile @@ -1,11 +1,9 @@ -# $OpenBSD: Makefile,v 1.39 2014/02/01 16:27:59 espie Exp $ +# $OpenBSD: Makefile,v 1.40 2014/03/18 13:17:48 ajacoutot Exp $ COMMENT= utilities for manipulating PostScript documents -# tarball from Fedora SRPM -DISTNAME= psutils-1.21 +DISTNAME= psutils-1.23 EXTRACT_SUFX= .tar.xz -REVISION = 0 CATEGORIES= print @@ -16,11 +14,11 @@ MAINTAINER= Antoine Jacoutot # BSD-like (${WRKSRC}/LICENSE) PERMIT_PACKAGE_CDROM= Yes -WANTLIB += c paper +WANTLIB += c -MASTER_SITES= https://distfiles.bsdfrog.org/ +MASTER_SITES= http://pkgs.fedoraproject.org/repo/pkgs/psutils/psutils-1.23.tar.xz/eedd282973a58ac6bbf890316a3b02d8/ -LIB_DEPENDS= print/libpaper +RUN_DEPENDS= print/libpaper USE_GMAKE= Yes diff --git a/print/psutils/distinfo b/print/psutils/distinfo index e8ca291fe69..d973bee362f 100644 --- a/print/psutils/distinfo +++ b/print/psutils/distinfo @@ -1,2 +1,2 @@ -SHA256 (psutils-1.21.tar.xz) = WVft4Wi/0JsbjjEZBmctbU+MnLV1VSvoOGYpDtGZVKE= -SIZE (psutils-1.21.tar.xz) = 150796 +SHA256 (psutils-1.23.tar.xz) = 2FQGbbWYKCDultVlYLQRQO0RbsBZ6CgfP9jHcAZM3+o= +SIZE (psutils-1.23.tar.xz) = 301136 diff --git a/print/psutils/patches/patch-configure b/print/psutils/patches/patch-configure new file mode 100644 index 00000000000..f691216dfe7 --- /dev/null +++ b/print/psutils/patches/patch-configure @@ -0,0 +1,15 @@ +$OpenBSD: patch-configure,v 1.1 2014/03/18 13:17:48 ajacoutot Exp $ + +https://bugzilla.redhat.com/show_bug.cgi?id=1072371 + +--- configure.orig Wed Jan 22 10:31:58 2014 ++++ configure Tue Mar 18 14:13:33 2014 +@@ -15700,7 +15700,7 @@ fi + + + if test -z "$PAPER"; then +- PAPER=paper ++ PAPER=paperconf + fi + + diff --git a/print/psutils/patches/patch-psutil_c b/print/psutils/patches/patch-psutil_c new file mode 100644 index 00000000000..4e1f4a6e433 --- /dev/null +++ b/print/psutils/patches/patch-psutil_c @@ -0,0 +1,15 @@ +$OpenBSD: patch-psutil_c,v 1.3 2014/03/18 13:17:48 ajacoutot Exp $ + +https://bugzilla.redhat.com/show_bug.cgi?id=1072371 + +--- psutil.c.orig Thu Jan 16 11:20:54 2014 ++++ psutil.c Tue Mar 18 14:13:36 2014 +@@ -88,7 +88,7 @@ int paper_size(const char *paper_name, double *width, + int res = 0; + if (paper_name == NULL) /* Use default paper name */ + paper_name = pgetline(PAPER); +- if (paper_name && (cmd = xasprintf(PAPER " --unit=pt --size %s", paper_name)) && (l = pgetline(cmd))) ++ if (paper_name && (cmd = xasprintf(PAPER " -s %s", paper_name)) && (l = pgetline(cmd))) + res = sscanf(l, "%lg %lg", width, height); + free(l); + free(cmd); diff --git a/print/psutils/pkg/PLIST b/print/psutils/pkg/PLIST index 4bcff730bf5..21505effbdb 100644 --- a/print/psutils/pkg/PLIST +++ b/print/psutils/pkg/PLIST @@ -1,8 +1,8 @@ -@comment $OpenBSD: PLIST,v 1.11 2014/02/01 16:27:59 espie Exp $ +@comment $OpenBSD: PLIST,v 1.12 2014/03/18 13:17:48 ajacoutot Exp $ +@conflict texlive_texmf-minimal-<=2012p0 @pkgpath print/psutils[,a3][,a4][,a5][,b5][,b4][,letter][,legal] @pkgpath print/psutils[,ledger][,tabloid][,statement][,executive] @pkgpath print/psutils[,folio][,quarto][,s10x14] -@conflict texlive_texmf-minimal-<=2012p0 @bin bin/epsffit bin/extractres bin/includeres