diff options
author | wiz <wiz> | 2003-07-12 07:04:32 +0000 |
---|---|---|
committer | wiz <wiz> | 2003-07-12 07:04:32 +0000 |
commit | 5ccc6cd3348d6a918ab9652b337f1a0640296370 (patch) | |
tree | ec52cff56144aacc391407463c1538cc976d28c2 /devel | |
parent | 2560145a55e5e43970309fc8879bdffeafc91dee (diff) | |
download | pkgsrc-5ccc6cd3348d6a918ab9652b337f1a0640296370.tar.gz |
Update to 15.4: bugfix release.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/cscope/Makefile | 5 | ||||
-rw-r--r-- | devel/cscope/distinfo | 11 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ab | 27 | ||||
-rw-r--r-- | devel/cscope/patches/patch-ad | 46 |
4 files changed, 43 insertions, 46 deletions
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile index 20d874c27b0..5ffbb678b74 100644 --- a/devel/cscope/Makefile +++ b/devel/cscope/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.22 2003/06/02 01:20:55 jschauma Exp $ +# $NetBSD: Makefile,v 1.23 2003/07/12 07:04:32 wiz Exp $ # -DISTNAME= cscope-15.3 -PKGREVISION= 1 +DISTNAME= cscope-15.4 CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cscope/} diff --git a/devel/cscope/distinfo b/devel/cscope/distinfo index 181b13aa163..0f0d91e6135 100644 --- a/devel/cscope/distinfo +++ b/devel/cscope/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.6 2003/03/22 06:05:26 wiz Exp $ +$NetBSD: distinfo,v 1.7 2003/07/12 07:04:32 wiz Exp $ -SHA1 (cscope-15.3.tar.gz) = ece72d2ede173dec0536003c4f8ab0fe7b0b3f11 -Size (cscope-15.3.tar.gz) = 196580 bytes +SHA1 (cscope-15.4.tar.gz) = 4b70bc0b3c87e5b3f032f9bd93af09ac861ca539 +Size (cscope-15.4.tar.gz) = 224057 bytes SHA1 (patch-aa) = 0212dd5ee9777bb2987cc57dca3747299b065f4f -SHA1 (patch-ab) = 6390a64ebb7b03b9b29af1f71fac3137b5d7957c +SHA1 (patch-ab) = 66042af02a5af64111a914aebcb4d7a74f421442 SHA1 (patch-ac) = 46fb2edc1ddec03c0ac50f87acde2b59f907e12b -SHA1 (patch-ad) = 4864f8afa7b6090d60d5509d1544b913cb4fcd51 -SHA1 (patch-ae) = ec8cc3c59f6a765a903e62ad4b1e391c74052fee +SHA1 (patch-ad) = b3975c7abfcbd2081fc63b9857b0f162400dc075 diff --git a/devel/cscope/patches/patch-ab b/devel/cscope/patches/patch-ab index 079202aa6ec..9a08f3b34c4 100644 --- a/devel/cscope/patches/patch-ab +++ b/devel/cscope/patches/patch-ab @@ -1,29 +1,24 @@ -$NetBSD: patch-ab,v 1.7 2002/06/12 13:16:50 seb Exp $ +$NetBSD: patch-ab,v 1.8 2003/07/12 07:04:33 wiz Exp $ ---- configure.orig Wed Jun 12 12:47:17 2002 +--- configure.orig Sun Jul 28 18:50:35 2002 +++ configure -@@ -1344,9 +1344,8 @@ +@@ -2431,7 +2431,6 @@ fi flex*) ac_lib=fl ;; *) ac_lib=l ;; esac - LDFLAGS='-L/usr/local/lib' - echo $ac_n "checking for yywrap in -l$ac_lib""... $ac_c" 1>&6 --echo "configure:1350: checking for yywrap in -l$ac_lib" >&5 -+echo "configure:1349: checking for yywrap in -l$ac_lib" >&5 - ac_lib_var=`echo $ac_lib'_'yywrap | sed 'y%./+-%__p_%'` - if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -@@ -1380,12 +1379,11 @@ - fi - if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then - echo "$ac_t""yes" 1>&6 + as_ac_Lib=`echo "ac_cv_lib_$ac_lib''_yywrap" | $as_tr_sh` + echo "$as_me:2436: checking for yywrap in -l$ac_lib" >&5 + echo $ECHO_N "checking for yywrap in -l$ac_lib... $ECHO_C" >&6 +@@ -2483,10 +2482,9 @@ fi + echo "$as_me:2483: result: `eval echo '${'$as_ac_Lib'}'`" >&5 + echo "${ECHO_T}`eval echo '${'$as_ac_Lib'}'`" >&6 + if test `eval echo '${'$as_ac_Lib'}'` = yes; then - LEXLIB="-L/usr/local/lib -l$ac_lib" + LEXLIB="-l$ac_lib" - else - echo "$ac_t""no" 1>&6 fi - LDFLAGS= fi - + echo "$as_me:2492: checking lex output file root" >&5 diff --git a/devel/cscope/patches/patch-ad b/devel/cscope/patches/patch-ad index 5de5366f305..3dc6220c706 100644 --- a/devel/cscope/patches/patch-ad +++ b/devel/cscope/patches/patch-ad @@ -1,17 +1,8 @@ -$NetBSD: patch-ad,v 1.3 2001/10/03 14:57:21 seb Exp $ +$NetBSD: patch-ad,v 1.4 2003/07/12 07:04:33 wiz Exp $ ---- contrib/Makefile.in.orig Mon Jul 2 23:56:55 2001 +--- contrib/Makefile.in.orig Sun Jul 28 18:58:23 2002 +++ contrib/Makefile.in -@@ -1,6 +1,6 @@ --# Makefile.in generated automatically by automake 1.4 from Makefile.am -+# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am - --# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. -+# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. - # This Makefile.in is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, - # with or without modifications, as long as this notice is preserved. -@@ -70,20 +70,20 @@ +@@ -71,13 +71,13 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ YACC = @YACC@ @@ -27,15 +18,16 @@ $NetBSD: patch-ad,v 1.3 2001/10/03 14:57:21 seb Exp $ DIST_COMMON = README Makefile.am Makefile.in - - DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST) - --TAR = gtar -+TAR = tar - GZIP_ENV = --best +@@ -89,30 +89,30 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: -@@ -95,23 +95,23 @@ + $(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +- cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps contrib/Makefile ++ cd $(top_srcdir) && $(AUTOMAKE) --gnu contrib/Makefile + +-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status ++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) + cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -72,7 +64,19 @@ $NetBSD: patch-ad,v 1.3 2001/10/03 14:57:21 seb Exp $ done tags: TAGS TAGS: -@@ -140,23 +140,23 @@ +@@ -123,6 +123,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(V + subdir = contrib + + distdir: $(DISTFILES) ++ here=`cd $(top_builddir) && pwd`; \ ++ top_distdir=`cd $(top_distdir) && pwd`; \ ++ distdir=`cd $(distdir) && pwd`; \ ++ cd $(top_srcdir) \ ++ && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu contrib/Makefile + @for file in $(DISTFILES); do \ + d=$(srcdir); \ + if test -d $$d/$$file; then \ +@@ -141,23 +146,23 @@ check-am: all-am check: check-am installcheck-am: installcheck: installcheck-am @@ -101,7 +105,7 @@ $NetBSD: patch-ad,v 1.3 2001/10/03 14:57:21 seb Exp $ mostlyclean-generic: -@@ -186,7 +186,7 @@ +@@ -187,7 +192,7 @@ maintainer-clean-am: maintainer-clean-g maintainer-clean: maintainer-clean-am |