diff options
| author | Ade Lovett <ade@FreeBSD.org> | 2012-05-11 20:38:09 +0000 |
|---|---|---|
| committer | Ade Lovett <ade@FreeBSD.org> | 2012-05-11 20:38:09 +0000 |
| commit | 6d726b6c09094afd97f1528cfff8b27850279b0d (patch) | |
| tree | ef9d4da0741b49a6a207e85f9ad78b89c296fdf5 /comms/klog | |
| parent | 9b4e4e3b2292946bd774693494465751f44fca20 (diff) | |
| download | ports-6d726b6c09094afd97f1528cfff8b27850279b0d.tar.gz ports-6d726b6c09094afd97f1528cfff8b27850279b0d.zip | |
Update autoconf to 2.69 and automake to 1.12
PR: 166836
Tested by: Multiple -exp runs (pav)
Notes
Notes:
svn path=/head/; revision=296454
Diffstat (limited to 'comms/klog')
| -rw-r--r-- | comms/klog/Makefile | 2 | ||||
| -rw-r--r-- | comms/klog/files/patch-admin__cvs.sh | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/comms/klog/Makefile b/comms/klog/Makefile index 7fb110f8dff6..d2283810cc24 100644 --- a/comms/klog/Makefile +++ b/comms/klog/Makefile @@ -21,6 +21,8 @@ USE_AUTOTOOLS= autoconf:env automake:env libtool:env GNU_CONFIGURE= yes INSTALLS_ICONS= yes +AUTOTOOLSFILES= admin/cvs.sh + post-extract: @${RM} -f ${WRKSRC}/po/gl.po diff --git a/comms/klog/files/patch-admin__cvs.sh b/comms/klog/files/patch-admin__cvs.sh index 89907240cb3d..8e57006be0b2 100644 --- a/comms/klog/files/patch-admin__cvs.sh +++ b/comms/klog/files/patch-admin__cvs.sh @@ -1,7 +1,12 @@ ---- admin/cvs.sh.orig 2007-08-28 11:56:00.000000000 -0500 -+++ admin/cvs.sh 2010-10-02 13:46:42.000000000 -0500 -@@ -70,3 +70,3 @@ - ;; +--- admin/cvs.sh.orig 2007-08-28 09:56:00.000000000 -0700 ++++ admin/cvs.sh 2012-04-24 09:19:01.000000000 -0700 +@@ -65,8 +65,3 @@ + case $AUTOMAKE_STRING in +- automake*1.5d* | automake*1.5* | automake*1.5-* ) +- echo "*** YOU'RE USING $AUTOMAKE_STRING." +- echo "*** KDE requires automake $required_automake_version" +- exit 1 +- ;; - automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10*) -+ automake*1.6.* | automake*1.7* | automake*1.8* | automake*1.9* | automake*1.10* | automake*1.11* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." |