[pkgsrc/trunk]: pkgsrc/print Use pthread-stublib on NetBSD 1.x and 2.x.

[reed <reed%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/70022ed899f0
branches:  trunk
changeset: 510773:70022ed899f0
user:      reed <reed%pkgsrc.org@localhost>
date:      Mon Apr 03 21:20:06 2006 +0000

description:
Use pthread-stublib on NetBSD 1.x and 2.x.
Bump PKGREVISION.
Patch updated to use the library.

Thank you Joerg for the suggestion.

diffstat:

 print/poppler-utils/Makefile   |  13 ++++++++++++-
 print/poppler/distinfo         |   4 ++--
 print/poppler/patches/patch-ab |  10 ++++++----
 3 files changed, 20 insertions(+), 7 deletions(-)

diffs (73 lines):

diff -r 6931909af2ac -r 70022ed899f0 print/poppler-utils/Makefile
--- a/print/poppler-utils/Makefile      Mon Apr 03 20:15:43 2006 +0000
+++ b/print/poppler-utils/Makefile      Mon Apr 03 21:20:06 2006 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2006/04/01 19:11:39 reed Exp $
+# $NetBSD: Makefile,v 1.2 2006/04/03 21:20:06 reed Exp $
 #
 
 .include "../../print/poppler/Makefile.common"
 
 PKGNAME=               poppler-utils-${POPPLER_VERS}
+PKGREVISION=           1
 
 COMMENT=               PDF utilities (from poppler)
 
@@ -32,4 +33,14 @@
 BUILDLINK_DEPENDS.poppler+=     poppler>=${POPPLER_VERS}nb3
 .include "../../print/poppler/buildlink3.mk"
 
+.include "../../mk/bsd.prefs.mk"
+
+.if !empty(MACHINE_PLATFORM:MNetBSD-[12].*)
+.include "../../devel/pthread-stublib/buildlink3.mk"
+PTHREAD_STUBLIB=       "-L${LOCALBASE}/lib -Wl,-R${LOCALBASE}/lib -lpthstub"
+.else
+PTHREAD_STUBLIB=       # provided by libc
+.endif
+MAKE_ENV+=             PTHREAD_STUBLIB=${PTHREAD_STUBLIB}
+
 .include "../../mk/bsd.pkg.mk"
diff -r 6931909af2ac -r 70022ed899f0 print/poppler/distinfo
--- a/print/poppler/distinfo    Mon Apr 03 20:15:43 2006 +0000
+++ b/print/poppler/distinfo    Mon Apr 03 21:20:06 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.11 2006/04/01 19:09:59 reed Exp $
+$NetBSD: distinfo,v 1.12 2006/04/03 21:20:06 reed Exp $
 
 SHA1 (poppler-0.5.1.tar.gz) = 8d654a0f8eb6ad8c8cb08ced24a06f1f5b13c711
 RMD160 (poppler-0.5.1.tar.gz) = ffd39323da0e0c487a6e7de48d8a607385189ddd
 Size (poppler-0.5.1.tar.gz) = 954930 bytes
 SHA1 (patch-aa) = 49ddf46f27dd2df065f5122fcc1bdb2a5ce3e546
-SHA1 (patch-ab) = 54baaa560ff172cb8a0d5a6db03cd775ab1fb0a8
+SHA1 (patch-ab) = ae239eb4c7fbec78b54e6f68a9e21ddf3d95dc7d
diff -r 6931909af2ac -r 70022ed899f0 print/poppler/patches/patch-ab
--- a/print/poppler/patches/patch-ab    Mon Apr 03 20:15:43 2006 +0000
+++ b/print/poppler/patches/patch-ab    Mon Apr 03 21:20:06 2006 +0000
@@ -1,7 +1,7 @@
-$NetBSD: patch-ab,v 1.3 2006/04/01 19:09:59 reed Exp $
+$NetBSD: patch-ab,v 1.4 2006/04/03 21:20:06 reed Exp $
 
 --- utils/Makefile.in.orig     2006-02-28 14:51:35.000000000 -0800
-+++ utils/Makefile.in  2006-04-01 10:41:52.000000000 -0800
++++ utils/Makefile.in  2006-04-03 14:10:58.000000000 -0700
 @@ -52,7 +52,7 @@
  CONFIG_HEADER = $(top_builddir)/config.h \
        $(top_builddir)/poppler/poppler-config.h
@@ -80,12 +80,14 @@
  INCLUDES = \
        -I$(top_srcdir)                         \
        -I$(top_srcdir)/utils                   \
-@@ -294,7 +294,7 @@
+@@ -294,8 +294,8 @@
        $(UTILS_CFLAGS)
  
  LDADD = \
 -      $(top_builddir)/poppler/libpoppler.la   \
+-      $(UTILS_LIBS)
 +      $(prefix)/lib/libpoppler.la     \
-       $(UTILS_LIBS)
++      $(UTILS_LIBS) $(PTHREAD_STUBLIB)
  
  
+ # Yay, automake!  It should be able to figure out that it has to dist