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 /x11-themes | |
| 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 'x11-themes')
| -rw-r--r-- | x11-themes/kdmtheme/Makefile | 2 | ||||
| -rw-r--r-- | x11-themes/kdmtheme/files/patch-admin__cvs.sh | 19 |
2 files changed, 13 insertions, 8 deletions
diff --git a/x11-themes/kdmtheme/Makefile b/x11-themes/kdmtheme/Makefile index 8c570b304b71..45470ef376fe 100644 --- a/x11-themes/kdmtheme/Makefile +++ b/x11-themes/kdmtheme/Makefile @@ -20,7 +20,7 @@ USE_BZIP2= yes USE_PERL5_BUILD=yes USE_AUTOTOOLS= automake:env autoconf:env libtool autoheader:env USE_GMAKE= yes -AUTOTOOLSFILES= admin/detect-autoconf.sh +AUTOTOOLSFILES= admin/cvs.sh admin/detect-autoconf.sh pre-configure: @(cd ${WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} ${SH} admin/cvs.sh dist) diff --git a/x11-themes/kdmtheme/files/patch-admin__cvs.sh b/x11-themes/kdmtheme/files/patch-admin__cvs.sh index 1847813fb3f8..088bb15a71f6 100644 --- a/x11-themes/kdmtheme/files/patch-admin__cvs.sh +++ b/x11-themes/kdmtheme/files/patch-admin__cvs.sh @@ -1,17 +1,22 @@ ---- admin/cvs.sh.orig 2006-11-09 16:42:52.000000000 -0600 -+++ admin/cvs.sh 2010-09-28 11:40:53.000000000 -0500 +--- admin/cvs.sh.orig 2006-11-09 14:42:52.000000000 -0800 ++++ admin/cvs.sh 2012-04-23 23:09:35.000000000 -0700 @@ -34,3 +34,3 @@ case $AUTOCONF_VERSION in - Autoconf*2.5* | autoconf*2.5* ) : ;; -+ autoconf*2.6*) : ;; ++ autoconf*%%AUTOCONF_VERSION%%*) : ;; "" ) @@ -49,3 +49,3 @@ case $AUTOHEADER_VERSION in - Autoconf*2.5* | autoheader*2.5* ) : ;; -+ autoheader*2.6* ) : ;; ++ autoheader*%%AUTOCONF_VERSION%%* ) : ;; "" ) -@@ -70,3 +70,3 @@ - ;; +@@ -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.11* ) ++ automake*%%AUTOMAKE_VERSION%%* ) echo "*** $AUTOMAKE_STRING found." |