Fri Apr 1 11:09:47 2016 UTC ()
Use PKGMANDIR.  Add patch comments.


(jperkin)
diff -r1.5 -r1.6 pkgsrc/print/epstool/distinfo
diff -r1.3 -r1.4 pkgsrc/print/epstool/patches/patch-aa
diff -r1.1 -r1.2 pkgsrc/print/epstool/patches/patch-ab
cvs diff -r1.5 -r1.6 pkgsrc/print/epstool/distinfo (expand / switch to unified diff)

--- pkgsrc/print/epstool/distinfo 2015/11/04 01:01:32 1.5
+++ pkgsrc/print/epstool/distinfo 2016/04/01 11:09:47 1.6
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.5 2015/11/04 01:01:32 agc Exp $ 1$NetBSD: distinfo,v 1.6 2016/04/01 11:09:47 jperkin Exp $
2 2
3SHA1 (epstool-3.08.tar.gz) = dc495934f06d3ea8b3209e8b02ea96c66c34f614 3SHA1 (epstool-3.08.tar.gz) = dc495934f06d3ea8b3209e8b02ea96c66c34f614
4RMD160 (epstool-3.08.tar.gz) = 5594fee09e105745b390de0d2e7144034d83b8e0 4RMD160 (epstool-3.08.tar.gz) = 5594fee09e105745b390de0d2e7144034d83b8e0
5SHA512 (epstool-3.08.tar.gz) = d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1 5SHA512 (epstool-3.08.tar.gz) = d6d70825c7d08cca318503bd8c12b48408b6d6cd3a64f26df94890373a3e73b68dc09a4eb454b81893c7ee3c11da791cdfed7466eb1410414cd1b97d80e8abf1
6Size (epstool-3.08.tar.gz) = 191567 bytes 6Size (epstool-3.08.tar.gz) = 191567 bytes
7SHA1 (patch-aa) = 27ba994b57144cc075262557d68381429d732858 7SHA1 (patch-aa) = 3a1f9b1985c02c1ed9934c93b36e9932a08e9233
8SHA1 (patch-ab) = 73e4665fbabb254846c331e4939b7c67ba341bc9 8SHA1 (patch-ab) = 6227e56896cb30b93196fae34301f79321d6bbb1
cvs diff -r1.3 -r1.4 pkgsrc/print/epstool/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/print/epstool/patches/patch-aa 2013/05/18 20:50:36 1.3
+++ pkgsrc/print/epstool/patches/patch-aa 2016/04/01 11:09:47 1.4
@@ -1,16 +1,20 @@ @@ -1,16 +1,20 @@
1$NetBSD: patch-aa,v 1.3 2013/05/18 20:50:36 shattered Exp $ 1$NetBSD: patch-aa,v 1.4 2016/04/01 11:09:47 jperkin Exp $
 2
 3Use pkgsrc layout.
2 4
3--- makefile.orig 2005-06-10 09:41:00.000000000 +0000 5--- makefile.orig 2005-06-10 09:41:00.000000000 +0000
4+++ makefile 6+++ makefile
5@@ -45,9 +45,9 @@ TARGET=epstool 7@@ -45,10 +45,10 @@ TARGET=epstool
6  8
7 include $(SRCDIR)/common.mak 9 include $(SRCDIR)/common.mak
8  10
9-EPSTOOL_ROOT=/usr/local 11-EPSTOOL_ROOT=/usr/local
10+EPSTOOL_ROOT=${DESTDIR}${PREFIX} 12+EPSTOOL_ROOT=${DESTDIR}${PREFIX}
11 EPSTOOL_BASE=$(prefix)$(EPSTOOL_ROOT) 13 EPSTOOL_BASE=$(prefix)$(EPSTOOL_ROOT)
12-EPSTOOL_DOCDIR=$(EPSTOOL_BASE)/share/doc/epstool-$(EPSTOOL_VERSION) 14-EPSTOOL_DOCDIR=$(EPSTOOL_BASE)/share/doc/epstool-$(EPSTOOL_VERSION)
 15-EPSTOOL_MANDIR=$(EPSTOOL_BASE)/man
13+EPSTOOL_DOCDIR=$(EPSTOOL_BASE)/share/doc/epstool 16+EPSTOOL_DOCDIR=$(EPSTOOL_BASE)/share/doc/epstool
14 EPSTOOL_MANDIR=$(EPSTOOL_BASE)/man 17+EPSTOOL_MANDIR=$(EPSTOOL_BASE)/${PKGMANDIR}
15 EPSTOOL_BINDIR=$(EPSTOOL_BASE)/bin 18 EPSTOOL_BINDIR=$(EPSTOOL_BASE)/bin
16  19
 20 epstool: $(BD)epstool$(EXE)
cvs diff -r1.1 -r1.2 pkgsrc/print/epstool/patches/patch-ab (expand / switch to unified diff)

--- pkgsrc/print/epstool/patches/patch-ab 2005/06/16 22:06:51 1.1
+++ pkgsrc/print/epstool/patches/patch-ab 2016/04/01 11:09:47 1.2
@@ -1,14 +1,16 @@ @@ -1,14 +1,16 @@
1$NetBSD: patch-ab,v 1.1 2005/06/16 22:06:51 kristerw Exp $ 1$NetBSD: patch-ab,v 1.2 2016/04/01 11:09:47 jperkin Exp $
 2
 3Portability fixes.
2 4
3--- src/cplat.h.orig Thu Jun 16 23:44:42 2005 5--- src/cplat.h.orig Thu Jun 16 23:44:42 2005
4+++ src/cplat.h Thu Jun 16 23:48:06 2005 6+++ src/cplat.h Thu Jun 16 23:48:06 2005
5@@ -101,8 +101,6 @@ 7@@ -101,8 +101,6 @@
6 # endif 8 # endif
7 # include <unistd.h> 9 # include <unistd.h>
8 # define __USE_GNU /* we might need recursive mutex */ 10 # define __USE_GNU /* we might need recursive mutex */
9-# include <semaphore.h> 11-# include <semaphore.h>
10-# include <pthread.h> 12-# include <pthread.h>
11 # define ZLIBNAME "libz.so" 13 # define ZLIBNAME "libz.so"
12 # define BZIP2NAME "libbz2.so" 14 # define BZIP2NAME "libbz2.so"
13 # define PATHSEP "/" 15 # define PATHSEP "/"
14@@ -113,9 +111,9 @@ 16@@ -113,9 +111,9 @@