diff options
| author | pat <pat@FreeBSD.org> | 2002-01-03 09:49:33 +0800 |
|---|---|---|
| committer | pat <pat@FreeBSD.org> | 2002-01-03 09:49:33 +0800 |
| commit | 10efbbed853900e045a73308b1ac9fa9f5b18b18 (patch) | |
| tree | ed5c263f58ff26c1fc83cc18cacfa36503eabad0 | |
| parent | b287338aeb043780ee574afddf1963f6a767bcc7 (diff) | |
| download | freebsd-ports-gnome-10efbbed853900e045a73308b1ac9fa9f5b18b18.tar.gz freebsd-ports-gnome-10efbbed853900e045a73308b1ac9fa9f5b18b18.tar.zst freebsd-ports-gnome-10efbbed853900e045a73308b1ac9fa9f5b18b18.zip | |
Fix errors introduced by changes in auto{conf,make}
PR: 33462
Submitted by: maintainer
| -rw-r--r-- | x11-themes/mosfet-liquid/Makefile | 5 | ||||
| -rw-r--r-- | x11-themes/mosfet-liquid/files/patch-admin::Makefile.common | 26 | ||||
| -rw-r--r-- | x11-wm/mosfet-liquid/Makefile | 5 | ||||
| -rw-r--r-- | x11-wm/mosfet-liquid/files/patch-admin::Makefile.common | 26 |
4 files changed, 38 insertions, 24 deletions
diff --git a/x11-themes/mosfet-liquid/Makefile b/x11-themes/mosfet-liquid/Makefile index 56851c8c06ae..fb7f31cd2ea1 100644 --- a/x11-themes/mosfet-liquid/Makefile +++ b/x11-themes/mosfet-liquid/Makefile @@ -13,10 +13,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= michiel.dewilde@rug.ac.be -BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ - autoconf:${PORTSDIR}/devel/autoconf - -GNU_CONFIGURE= yes +USE_AUTOMAKE= yes USE_GMAKE= yes USE_KDELIBS_VER=2 INSTALLS_SHLIB= yes diff --git a/x11-themes/mosfet-liquid/files/patch-admin::Makefile.common b/x11-themes/mosfet-liquid/files/patch-admin::Makefile.common index 8b65d2b73225..55c5a99e68ee 100644 --- a/x11-themes/mosfet-liquid/files/patch-admin::Makefile.common +++ b/x11-themes/mosfet-liquid/files/patch-admin::Makefile.common @@ -1,28 +1,38 @@ ---- admin/Makefile.common.orig Wed Oct 31 15:17:47 2001 -+++ admin/Makefile.common Wed Oct 31 15:18:24 2001 -@@ -13,11 +13,11 @@ +--- admin/Makefile.common.orig Fri Jun 15 05:54:12 2001 ++++ admin/Makefile.common Wed Jan 2 09:41:45 2002 +@@ -13,15 +13,15 @@ $(MAKE) -f Makefile.am top_srcdir=. configure.in ;\ fi @echo "*** Retrieving configure tests needed by configure.in" - @aclocal + @aclocal14 @echo "*** Scanning for include statements" - @autoheader +- @autoheader ++ @autoheader213 @echo "*** Building Makefile templates" - @automake + @automake14 @echo "*** Scanning for moc files and kde tags" @perl admin/am_edit @echo "*** Building configure" -@@ -48,9 +48,9 @@ +- @autoconf ++ @autoconf213 + @if test -r configure.in.in ; then \ + perl -pi -e 'print "if test \"x\$$with_fast_perl\" = \"xyes\" ;\ + then\n perl -i.bak \$$ac_aux_dir/conf.change.pl \$$CONFIG_STATUS\ +@@ -48,11 +48,11 @@ @if test -r configure.in.in; then \ $(MAKE) -f Makefile.am top_srcdir=. subdirs configure.in; \ fi ;\ - aclocal; \ -+ aclocal14; \ - autoheader; \ +- autoheader; \ - automake --foreign --include-deps; \ ++ aclocal14; \ ++ autoheader213; \ + automake14 --foreign --include-deps; \ perl admin/am_edit; \ - autoconf; \ +- autoconf; \ ++ autoconf213; \ if test -r configure.in.in ; then \ + perl -pi -e 'print "if test \"x\$$with_fast_perl\" = \"xyes\" ;\ + then\n perl -i.bak \$$ac_aux_dir/conf.change.pl \$$CONFIG_STATUS\ diff --git a/x11-wm/mosfet-liquid/Makefile b/x11-wm/mosfet-liquid/Makefile index 56851c8c06ae..fb7f31cd2ea1 100644 --- a/x11-wm/mosfet-liquid/Makefile +++ b/x11-wm/mosfet-liquid/Makefile @@ -13,10 +13,7 @@ DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= michiel.dewilde@rug.ac.be -BUILD_DEPENDS= automake14:${PORTSDIR}/devel/automake14 \ - autoconf:${PORTSDIR}/devel/autoconf - -GNU_CONFIGURE= yes +USE_AUTOMAKE= yes USE_GMAKE= yes USE_KDELIBS_VER=2 INSTALLS_SHLIB= yes diff --git a/x11-wm/mosfet-liquid/files/patch-admin::Makefile.common b/x11-wm/mosfet-liquid/files/patch-admin::Makefile.common index 8b65d2b73225..55c5a99e68ee 100644 --- a/x11-wm/mosfet-liquid/files/patch-admin::Makefile.common +++ b/x11-wm/mosfet-liquid/files/patch-admin::Makefile.common @@ -1,28 +1,38 @@ ---- admin/Makefile.common.orig Wed Oct 31 15:17:47 2001 -+++ admin/Makefile.common Wed Oct 31 15:18:24 2001 -@@ -13,11 +13,11 @@ +--- admin/Makefile.common.orig Fri Jun 15 05:54:12 2001 ++++ admin/Makefile.common Wed Jan 2 09:41:45 2002 +@@ -13,15 +13,15 @@ $(MAKE) -f Makefile.am top_srcdir=. configure.in ;\ fi @echo "*** Retrieving configure tests needed by configure.in" - @aclocal + @aclocal14 @echo "*** Scanning for include statements" - @autoheader +- @autoheader ++ @autoheader213 @echo "*** Building Makefile templates" - @automake + @automake14 @echo "*** Scanning for moc files and kde tags" @perl admin/am_edit @echo "*** Building configure" -@@ -48,9 +48,9 @@ +- @autoconf ++ @autoconf213 + @if test -r configure.in.in ; then \ + perl -pi -e 'print "if test \"x\$$with_fast_perl\" = \"xyes\" ;\ + then\n perl -i.bak \$$ac_aux_dir/conf.change.pl \$$CONFIG_STATUS\ +@@ -48,11 +48,11 @@ @if test -r configure.in.in; then \ $(MAKE) -f Makefile.am top_srcdir=. subdirs configure.in; \ fi ;\ - aclocal; \ -+ aclocal14; \ - autoheader; \ +- autoheader; \ - automake --foreign --include-deps; \ ++ aclocal14; \ ++ autoheader213; \ + automake14 --foreign --include-deps; \ perl admin/am_edit; \ - autoconf; \ +- autoconf; \ ++ autoconf213; \ if test -r configure.in.in ; then \ + perl -pi -e 'print "if test \"x\$$with_fast_perl\" = \"xyes\" ;\ + then\n perl -i.bak \$$ac_aux_dir/conf.change.pl \$$CONFIG_STATUS\ |