OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web openpkg$ Date: 11-Dec-2003 09:15:17
Branch: HEAD Handle: 2003121108151304
Modified files:
openpkg-re/vcheck vc.automake
openpkg-src/automake automake.patch automake.spec
openpkg-web news.txt
Log:
upgrading package: automake 1.7.9 -> 1.8
Summary:
Revision Changes Path
1.15 +1 -1 openpkg-re/vcheck/vc.automake
1.2 +50 -80 openpkg-src/automake/automake.patch
1.44 +4 -4 openpkg-src/automake/automake.spec
1.7721 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-re/vcheck/vc.automake
============================================================================
$ cvs diff -u -r1.14 -r1.15 vc.automake
--- openpkg-re/vcheck/vc.automake 10 Nov 2003 08:12:17 -0000 1.14
+++ openpkg-re/vcheck/vc.automake 11 Dec 2003 08:15:13 -0000 1.15
@@ -2,7 +2,7 @@
}
prog automake = {
- version = 1.7.9
+ version = 1.8
url = ftp://sources.redhat.com/pub/automake/
regex = automake-(__VER__)\.tar\.gz
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/automake/automake.patch
============================================================================
$ cvs diff -u -r1.1 -r1.2 automake.patch
--- openpkg-src/automake/automake.patch 8 Nov 2003 12:40:54 -0000 1.1
+++ openpkg-src/automake/automake.patch 11 Dec 2003 08:15:17 -0000 1.2
@@ -1,103 +1,73 @@
-Index: m4/Makefile.in
---- m4/Makefile.in.orig 2003-10-07 00:24:44.000000000 +0200
-+++ m4/Makefile.in 2003-11-08 13:38:11.000000000 +0100
-@@ -94,7 +94,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
-
--m4datadir = $(datadir)/aclocal-$(APIVERSION)
-+m4datadir = $(datadir)/aclocal
-
- dist_m4data_DATA = \
- as.m4 \
-@@ -196,7 +196,7 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
- top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+distdir = $(top_distdir)/$(PACKAGE)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-Index: lib/Makefile.in
---- lib/Makefile.in.orig 2003-10-07 00:24:44.000000000 +0200
-+++ lib/Makefile.in 2003-11-08 13:38:11.000000000 +0100
-@@ -294,7 +294,7 @@
+Index: Makefile.in
+--- Makefile.in.orig 2003-12-10 19:35:11.000000000 +0100
++++ Makefile.in 2003-12-11 09:12:47.000000000 +0100
+@@ -68,7 +68,7 @@
+ CTAGS = ctags
+ DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-
- top_distdir = ..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
-+distdir = $(top_distdir)/$(PACKAGE)
-
- distdir: $(DISTFILES)
- @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+-distdir = $(PACKAGE)-$(VERSION)
++distdir = $(PACKAGE)
+ top_distdir = $(distdir)
+ am__remove_distdir = \
+ { test ! -d $(distdir) \
Index: aclocal.in
---- aclocal.in.orig 2003-10-07 00:30:46.000000000 +0200
-+++ aclocal.in 2003-11-08 13:38:43.000000000 +0100
+--- aclocal.in.orig 2003-12-05 22:19:39.000000000 +0100
++++ aclocal.in 2003-12-11 09:11:05.000000000 +0100
@@ -29,7 +29,7 @@
BEGIN
{
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@[EMAIL
PROTECTED]@APIVERSION@';
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
- unshift @INC, $perllibdir;
+ unshift @INC, (split ':', $perllibdir);
}
-@@ -188,12 +188,6 @@
- $default_dirlist="$acdir/dirlist"
- if $acdir ne $default_acdir;
-
-- # Search the versioned directory near the end, and then the
-- # unversioned directory last. Only do this if the user didn't
-- # override acdir.
-- push (@dirlist, "$acdir-$APIVERSION")
-- if $acdir eq $default_acdir;
+@@ -519,12 +519,6 @@
+ $default_dirlist="$acdir/dirlist"
+ if $acdir ne $default_acdir;
+
+- # Search the versioned directory near the end, and then the
+- # unversioned directory last. Only do this if the user didn't
+- # override acdir.
+- push (@dirlist, "$acdir-$APIVERSION")
+- if $acdir eq $default_acdir;
-
- # By default $(datadir)/aclocal doesn't exist. We don't want to
- # get an error in the case where we are searching the default
- # directory and it hasn't been created.
-Index: configure
---- configure.orig 2003-10-07 00:24:46.000000000 +0200
-+++ configure 2003-11-08 13:38:11.000000000 +0100
-@@ -1623,7 +1623,7 @@
-
-
- # A versioned directory, defined here for convenience.
--pkgvdatadir="\${datadir}/automake-${APIVERSION}"
-+pkgvdatadir="\${datadir}/automake"
-
-
- # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
+ # By default $(datadir)/aclocal doesn't exist. We don't want to
+ # get an error in the case where we are searching the default
+ # directory and it hasn't been created.
Index: automake.in
---- automake.in.orig 2003-10-07 00:11:08.000000000 +0200
-+++ automake.in 2003-11-08 13:38:11.000000000 +0100
+--- automake.in.orig 2003-12-08 18:53:57.000000000 +0100
++++ automake.in 2003-12-11 09:12:04.000000000 +0100
@@ -31,7 +31,7 @@
BEGIN
{
- my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@[EMAIL
PROTECTED]@APIVERSION@';
+ my $perllibdir = $ENV{'perllibdir'} || '@datadir@/@PACKAGE@';
- unshift @INC, $perllibdir;
+ unshift @INC, (split ':', $perllibdir);
# Override SHELL. This is required on DJGPP so that system() uses
-@@ -135,7 +135,7 @@
- # VERSION as string so that eg version 0.30 will print correctly.
- my $VERSION = '@VERSION@';
- my $PACKAGE = '@PACKAGE@';
--my $libdir = '@datadir@/@[EMAIL PROTECTED]@APIVERSION@';
-+my $libdir = '@datadir@/@PACKAGE@';
+Index: configure
+--- configure.orig 2003-12-10 19:35:10.000000000 +0100
++++ configure 2003-12-11 09:08:23.000000000 +0100
+@@ -1710,7 +1710,7 @@
- # Some regular expressions. One reason to put them here is that it
- # makes indentation work better in Emacs.
-Index: Makefile.in
---- Makefile.in.orig 2003-10-07 00:24:44.000000000 +0200
-+++ Makefile.in 2003-11-08 13:38:11.000000000 +0100
-@@ -415,7 +415,7 @@
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
- top_distdir = .
--distdir = $(PACKAGE)-$(VERSION)
-+distdir = $(PACKAGE)
+ # A versioned directory, defined here for convenience.
+-pkgvdatadir="\${datadir}/automake-${APIVERSION}"
++pkgvdatadir="\${datadir}/automake"
- am__remove_distdir = \
- { test ! -d $(distdir) \
+
+ # $AUTOMAKE and $ACLOCAL are always run after a `cd $top_srcdir',
+Index: m4/Makefile.in
+--- m4/Makefile.in.orig 2003-12-10 19:35:12.000000000 +0100
++++ m4/Makefile.in 2003-12-11 09:09:07.000000000 +0100
+@@ -119,7 +119,7 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-m4datadir = $(datadir)/aclocal-$(APIVERSION)
++m4datadir = $(datadir)/aclocal
+ dist_m4data_DATA = \
+ $(top_srcdir)/m4/amversion.m4 \
+ as.m4 \
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/automake/automake.spec
============================================================================
$ cvs diff -u -r1.43 -r1.44 automake.spec
--- openpkg-src/automake/automake.spec 21 Nov 2003 21:35:41 -0000 1.43
+++ openpkg-src/automake/automake.spec 11 Dec 2003 08:15:17 -0000 1.44
@@ -32,8 +32,8 @@
Distribution: OpenPKG [BASE]
Group: Development
License: GPL
-Version: 1.7.9
-Release: 20031121
+Version: 1.8
+Release: 20031211
# list of sources
Source0: ftp://sources.redhat.com/pub/automake/automake-%{version}.tar.gz
@@ -42,8 +42,8 @@
# build information
Prefix: %{l_prefix}
BuildRoot: %{l_buildroot}
-BuildPreReq: OpenPKG, openpkg >= 20020206, perl, autoconf
-PreReq: OpenPKG, openpkg >= 20020206, perl, autoconf
+BuildPreReq: OpenPKG, openpkg >= 20020206, perl, autoconf >= 2.58
+PreReq: OpenPKG, openpkg >= 20020206, perl, autoconf >= 2.58
AutoReq: no
AutoReqProv: no
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7720 -r1.7721 news.txt
--- openpkg-web/news.txt 11 Dec 2003 08:14:03 -0000 1.7720
+++ openpkg-web/news.txt 11 Dec 2003 08:15:14 -0000 1.7721
@@ -1,3 +1,4 @@
+11-Dec-2003: Upgraded package: P<automake-1.8-20031211>
11-Dec-2003: Upgraded package: P<cdk-4.9.11.20031210-20031211>
10-Dec-2003: Upgraded package: P<tcl-8.4.5-20031210>
10-Dec-2003: Upgraded package: P<libxml-2.6.3-20031210>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
