diff options
| author | jlam <jlam@pkgsrc.org> | 2002-09-23 20:39:21 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2002-09-23 20:39:21 +0000 |
| commit | a8a2f3e6352bd1c127bea816ba3fa565e01c9af3 (patch) | |
| tree | caf9310a69046bd77ede900e683fd2e2f682c8a5 /converters | |
| parent | 569f4d898d45b159a05afc557085bc1f6f67550f (diff) | |
| download | pkgsrc-a8a2f3e6352bd1c127bea816ba3fa565e01c9af3.tar.gz | |
Don't add -rpath to the libtool command used to create the uninstalled
libcompat.la, as that makes libtool think that package will be installed.
This was causing libpsiconv.la to depend on libcompat.la, even though the
latter was never installed. Bump the PKGREVISION.
Diffstat (limited to 'converters')
| -rw-r--r-- | converters/psiconv/Makefile | 10 | ||||
| -rw-r--r-- | converters/psiconv/distinfo | 3 | ||||
| -rw-r--r-- | converters/psiconv/patches/patch-ac | 13 |
3 files changed, 7 insertions, 19 deletions
diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index a39c05b404d..b74b3e9a9eb 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2002/09/10 12:35:07 markd Exp $ +# $NetBSD: Makefile,v 1.19 2002/09/23 20:39:21 jlam Exp $ # DISTNAME= psiconv-0.8.2 -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= converters MASTER_SITES= http://huizen.dds.nl/~frodol/psiconv/ @@ -11,12 +11,14 @@ HOMEPAGE= http://huizen.dds.nl/~frodol/psiconv/ COMMENT= PSION 5 file format data conversion utilities USE_BUILDLINK2= YES -USE_LIBTOOL= YES USE_X11= YES -LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig + GNU_CONFIGURE= YES CPPFLAGS+= -DIMAGEMAGICK +USE_LIBTOOL= YES +LIBTOOL_OVERRIDE= ${WRKSRC}/libtool + DOCDIR= ${PREFIX}/share/doc/psiconv post-install: diff --git a/converters/psiconv/distinfo b/converters/psiconv/distinfo index 7cda0d1f138..a12aecf2410 100644 --- a/converters/psiconv/distinfo +++ b/converters/psiconv/distinfo @@ -1,10 +1,9 @@ -$NetBSD: distinfo,v 1.4 2002/09/10 12:35:08 markd Exp $ +$NetBSD: distinfo,v 1.5 2002/09/23 20:39:21 jlam Exp $ SHA1 (psiconv-0.8.2.tar.gz) = 4512aac15db4e1a129a3131a2b0b3fa149e88811 Size (psiconv-0.8.2.tar.gz) = 304322 bytes SHA1 (patch-aa) = b7ef8a4916df1c13324b00a2fefff620dc99fa32 SHA1 (patch-ab) = cff4e1d6bbfadb5c47b69b07cde8896f5b423c9a -SHA1 (patch-ac) = 05769fdcb271937396fd9cd9929e46ab77e7a852 SHA1 (patch-ad) = af772d87f3764081d717f07e4b0ac9f8a20cf47e SHA1 (patch-ae) = 9a79cddedca2d14e6e8aa43016b196354ba639d1 SHA1 (patch-af) = 59e098cf8ea3a44bae13a970822bacb7d4177e30 diff --git a/converters/psiconv/patches/patch-ac b/converters/psiconv/patches/patch-ac deleted file mode 100644 index c8e3ed7a532..00000000000 --- a/converters/psiconv/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.2 2001/12/19 20:08:51 wiz Exp $ - ---- compat/Makefile.in.orig Mon Jul 16 19:53:56 2001 -+++ compat/Makefile.in -@@ -103,7 +103,7 @@ - COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - LTCOMPILE = $(LIBTOOL) --mode=compile $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) - CCLD = $(CC) --LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -+LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@ -rpath $(PREFIX)/lib - DIST_COMMON = Makefile.am Makefile.in strdup.c - - |