diff options
author | wiz <wiz@pkgsrc.org> | 2000-09-09 14:58:49 +0000 |
---|---|---|
committer | wiz <wiz@pkgsrc.org> | 2000-09-09 14:58:49 +0000 |
commit | 147be8ef01914c83053377f7a2538871669e7db5 (patch) | |
tree | c72be23af361cbd1aac9dc41da860f5b92ced2e1 /devel | |
parent | 12a4c55ff8a72198ef99559621e4c47202e8f852 (diff) | |
download | pkgsrc-147be8ef01914c83053377f7a2538871669e7db5.tar.gz |
Don't use internal libdb, use NetBSD's, as suggested by Patrick Welche in
pkg/10340.
While I'm here: set MANCOMPRESSED_IF_MANZ; and fix .El in another man page.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/global/Makefile | 3 | ||||
-rw-r--r-- | devel/global/files/patch-sum | 6 | ||||
-rw-r--r-- | devel/global/patches/patch-aa | 9 | ||||
-rw-r--r-- | devel/global/patches/patch-ac | 12 | ||||
-rw-r--r-- | devel/global/patches/patch-ad | 26 | ||||
-rw-r--r-- | devel/global/pkg/PLIST | 5 |
6 files changed, 44 insertions, 17 deletions
diff --git a/devel/global/Makefile b/devel/global/Makefile index 885b51a5109..67ac7d83a23 100644 --- a/devel/global/Makefile +++ b/devel/global/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2000/04/21 06:46:11 sakamoto Exp $ +# $NetBSD: Makefile,v 1.5 2000/09/09 14:58:49 wiz Exp $ # DISTNAME= global-3.55 @@ -9,6 +9,7 @@ MAINTAINER= abs@netbsd.org HOMEPAGE= http://www.tamacom.com/global/ USE_PERL5= yes +MANCOMPRESSED_IF_MANZ= yes LDFLAGS+= -L../libutil MAKE_ENV+= LIBDIR="${PREFIX}/lib" diff --git a/devel/global/files/patch-sum b/devel/global/files/patch-sum index 6c8131602a9..2e0f09af197 100644 --- a/devel/global/files/patch-sum +++ b/devel/global/files/patch-sum @@ -1,6 +1,8 @@ -$NetBSD: patch-sum,v 1.2 2000/04/21 06:46:12 sakamoto Exp $ +$NetBSD: patch-sum,v 1.3 2000/09/09 14:58:49 wiz Exp $ +MD5 (patch-aa) = e1f0ce2be24fe52da7380e0e98a7c27c MD5 (patch-ab) = 2f7523143a210005f0e07eb4438de3f5 -MD5 (patch-ad) = accc2f336781aac950919c289e45376a +MD5 (patch-ac) = 8e1f6d255141a8164598c07ba19c2249 +MD5 (patch-ad) = ab1df613c3cb9f2bd7cff2d75e676082 MD5 (patch-ae) = 017926d41b47acb52f2145b86614daf4 MD5 (patch-af) = 92d7819dee02267f3da86f0e60a1b74e diff --git a/devel/global/patches/patch-aa b/devel/global/patches/patch-aa new file mode 100644 index 00000000000..95985eaa073 --- /dev/null +++ b/devel/global/patches/patch-aa @@ -0,0 +1,9 @@ +$NetBSD: patch-aa,v 1.3 2000/09/09 14:58:49 wiz Exp $ + +--- Makefile.orig Sat Sep 18 08:37:53 1999 ++++ Makefile +@@ -1,3 +1,3 @@ +-SUBDIR= libdb libutil global gtags gctags btreeop htags ++SUBDIR= libutil global gtags gctags btreeop htags + + .include <bsd.subdir.mk> diff --git a/devel/global/patches/patch-ac b/devel/global/patches/patch-ac new file mode 100644 index 00000000000..b4be8ea8941 --- /dev/null +++ b/devel/global/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.3 2000/09/09 14:58:49 wiz Exp $ + +--- gctags/gctags.1.orig Fri Aug 27 10:25:42 1999 ++++ gctags/gctags.1 +@@ -128,7 +128,6 @@ + .Ar Yyparse + is the start + of the second section of the yacc file. +-.El + .Sh DIAGNOSTICS + .Nm Gctags + exits with a non 0 value if an error occurred, 0 otherwise. diff --git a/devel/global/patches/patch-ad b/devel/global/patches/patch-ad index 362977f1bd4..46b9c23e172 100644 --- a/devel/global/patches/patch-ad +++ b/devel/global/patches/patch-ad @@ -1,17 +1,23 @@ -$NetBSD: patch-ad,v 1.1 2000/04/21 06:46:12 sakamoto Exp $ +$NetBSD: patch-ad,v 1.2 2000/09/09 14:58:49 wiz Exp $ ---- Makefile.inc.orig Sat Sep 18 15:42:34 1999 -+++ Makefile.inc Fri Apr 21 14:35:11 2000 -@@ -3,10 +3,10 @@ +--- Makefile.inc.orig Sat Sep 18 08:42:34 1999 ++++ Makefile.inc +@@ -2,14 +2,11 @@ + GLOBAL_MAKEFILE_INC_BEEN_HERE=yes BINDIR?= /usr/bin -LDDESTDIR= -L${.OBJDIR}/../libutil \ -+LDFLAGS+= -L${.OBJDIR}/../libutil \ - -L${.OBJDIR}/../libdb - LDADD= -lgloutil -lglodb - DPADD= ${.OBJDIR}/../libutil/libgloutil.a \ - ${.OBJDIR}/../libdb/libglodb.a +- -L${.OBJDIR}/../libdb +-LDADD= -lgloutil -lglodb +-DPADD= ${.OBJDIR}/../libutil/libgloutil.a \ +- ${.OBJDIR}/../libdb/libglodb.a -CFLAGS+= -I${.CURDIR} \ ++LDFLAGS+= -L${.OBJDIR}/../libutil ++LDADD= -lgloutil ++DPADD= ${.OBJDIR}/../libutil/libgloutil.a +CPPFLAGS+= -I${.CURDIR} \ -I${.CURDIR}/../libutil \ - -I${.CURDIR}/../libdb \ +- -I${.CURDIR}/../libdb \ + -I${.CURDIR}/../machine \ + -O + # -Wall -Wwrite-strings -Wmissing-prototypes diff --git a/devel/global/pkg/PLIST b/devel/global/pkg/PLIST index 9bb92c44709..8927c32bd79 100644 --- a/devel/global/pkg/PLIST +++ b/devel/global/pkg/PLIST @@ -1,14 +1,11 @@ -@comment $NetBSD: PLIST,v 1.2 2000/04/21 06:46:13 sakamoto Exp $ +@comment $NetBSD: PLIST,v 1.3 2000/09/09 14:58:50 wiz Exp $ bin/btreeop bin/gctags bin/global bin/gtags bin/htags -lib/libglodb.a -lib/libglodb_pic.a lib/libgloutil.a lib/libgloutil_pic.a -libdata/lint/llib-lglodb.ln libdata/lint/llib-lgloutil.ln man/cat1/btreeop.0 man/cat1/gctags.0 |