diff options
| author | reed <reed@pkgsrc.org> | 2006-04-03 21:20:06 +0000 |
|---|---|---|
| committer | reed <reed@pkgsrc.org> | 2006-04-03 21:20:06 +0000 |
| commit | dc901fa0d12962f159f77867e4a0c147d8ddcb8e (patch) | |
| tree | a86519f823ff2c4941e1f5f7e134c4f77c6e5517 | |
| parent | 715e8939e09d43e773705b0babe5d0f541a18b28 (diff) | |
| download | pkgsrc-dc901fa0d12962f159f77867e4a0c147d8ddcb8e.tar.gz | |
Use pthread-stublib on NetBSD 1.x and 2.x.
Bump PKGREVISION.
Patch updated to use the library.
Thank you Joerg for the suggestion.
| -rw-r--r-- | print/poppler-utils/Makefile | 13 | ||||
| -rw-r--r-- | print/poppler/distinfo | 4 | ||||
| -rw-r--r-- | print/poppler/patches/patch-ab | 10 |
3 files changed, 20 insertions, 7 deletions
diff --git a/print/poppler-utils/Makefile b/print/poppler-utils/Makefile index d0277e8a547..cc723ebff46 100644 --- a/print/poppler-utils/Makefile +++ b/print/poppler-utils/Makefile @@ -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 @@ BUILD_DIRS= utils # implies INSTALL_DIRS too 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 --git a/print/poppler/distinfo b/print/poppler/distinfo index 7a24ab5abad..cac11b571b4 100644 --- a/print/poppler/distinfo +++ b/print/poppler/distinfo @@ -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 --git a/print/poppler/patches/patch-ab b/print/poppler/patches/patch-ab index c9d940150d7..d44325b0ae6 100644 --- a/print/poppler/patches/patch-ab +++ b/print/poppler/patches/patch-ab @@ -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 @@ $NetBSD: patch-ab,v 1.3 2006/04/01 19:09:59 reed Exp $ 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 |