Fix a breakage introduced in the previous commit. I'd appreciate if people

will at least try to contact GNOME team before doing any changes to ports
maintained by gnome@FreeBSD.org, especially when those changes are obviously
untested.

8 files changed, 228 insertions, 8 deletions

diff --git a/editors/AbiWord/Makefile b/editors/AbiWord/Makefile
index 19bf90018b18..3023db296245 100644
--- a/editors/AbiWord/Makefile
+++ b/editors/AbiWord/Makefile
@@ -29,8 +29,10 @@ DIST_SUBDIR=	AbiWord
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 
+USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
+AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgiconv"
 MAKEFILE=	GNUmakefile
@@ -42,8 +44,6 @@ pre-configure:
 	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog
 	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
 	@${RM} -f ${WRKSRC}/configure.ac
-	@cd ${WRKSRC} ; ${WRKSRC}/autogen.sh
-	@cd ${WRKSRC} ; ${FIXME}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/editors/AbiWord/files/patch-autogen.sh b/editors/AbiWord/files/patch-autogen.sh
new file mode 100644
index 000000000000..465e7f9f4047
--- /dev/null
+++ b/editors/AbiWord/files/patch-autogen.sh
@@ -0,0 +1,55 @@
+
+$FreeBSD$
+
+--- autogen.sh	2001/10/30 10:05:41	1.1
++++ autogen.sh	2001/10/30 10:05:42
+@@ -10,20 +10,20 @@
+ 
+ set -e
+ 
+-automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
++automake14 --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
+ 
+ if [ $? -ne 0 ]; then
+     echo "Error: you need automake 1.4 or later.  Please upgrade."
+     exit 1
+ fi
+ 
+-if test ! -d `aclocal --print-ac-dir`; then
++if test ! -d `aclocal14 --print-ac-dir`; then
+   echo "Bad aclocal (automake) installation"
+   exit 1
+ fi
+ 
+ for script in `cd ac-helpers/fallback; echo *.m4`; do
+-  if test -r `aclocal --print-ac-dir`/$script; then
++  if test -r `aclocal14 --print-ac-dir`/$script; then
+     # Perhaps it was installed recently
+     rm -f ac-helpers/$script
+   else
+@@ -34,13 +34,13 @@
+ 
+ # Produce aclocal.m4, so autoconf gets the automake macros it needs
+ echo "Creating aclocal.m4..."
+-aclocal -I ac-helpers
++aclocal14 -I ac-helpers
+ 
+-autoheader
++autoheader213
+ 
+ # Produce all the `Makefile.in's, verbosely, and create neat missing things
+ # like `libtool', `install-sh', etc.
+-automake --add-missing --verbose --foreign
++automake14 --add-missing --verbose --foreign
+ 
+ # If there's a config.cache file, we may need to delete it.  
+ # If we have an existing configure script, save a copy for comparison.
+@@ -50,7 +50,7 @@
+ 
+ # Produce ./configure
+ echo "Creating configure..."
+-autoconf
++autoconf213
+ 
+ echo ""
+ echo "You can run ./configure now."
diff --git a/editors/AbiWord2/Makefile b/editors/AbiWord2/Makefile
index 19bf90018b18..3023db296245 100644
--- a/editors/AbiWord2/Makefile
+++ b/editors/AbiWord2/Makefile
@@ -29,8 +29,10 @@ DIST_SUBDIR=	AbiWord
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 
+USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
+AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgiconv"
 MAKEFILE=	GNUmakefile
@@ -42,8 +44,6 @@ pre-configure:
 	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog
 	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
 	@${RM} -f ${WRKSRC}/configure.ac
-	@cd ${WRKSRC} ; ${WRKSRC}/autogen.sh
-	@cd ${WRKSRC} ; ${FIXME}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/editors/AbiWord2/files/patch-autogen.sh b/editors/AbiWord2/files/patch-autogen.sh
new file mode 100644
index 000000000000..465e7f9f4047
--- /dev/null
+++ b/editors/AbiWord2/files/patch-autogen.sh
@@ -0,0 +1,55 @@
+
+$FreeBSD$
+
+--- autogen.sh	2001/10/30 10:05:41	1.1
++++ autogen.sh	2001/10/30 10:05:42
+@@ -10,20 +10,20 @@
+ 
+ set -e
+ 
+-automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
++automake14 --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
+ 
+ if [ $? -ne 0 ]; then
+     echo "Error: you need automake 1.4 or later.  Please upgrade."
+     exit 1
+ fi
+ 
+-if test ! -d `aclocal --print-ac-dir`; then
++if test ! -d `aclocal14 --print-ac-dir`; then
+   echo "Bad aclocal (automake) installation"
+   exit 1
+ fi
+ 
+ for script in `cd ac-helpers/fallback; echo *.m4`; do
+-  if test -r `aclocal --print-ac-dir`/$script; then
++  if test -r `aclocal14 --print-ac-dir`/$script; then
+     # Perhaps it was installed recently
+     rm -f ac-helpers/$script
+   else
+@@ -34,13 +34,13 @@
+ 
+ # Produce aclocal.m4, so autoconf gets the automake macros it needs
+ echo "Creating aclocal.m4..."
+-aclocal -I ac-helpers
++aclocal14 -I ac-helpers
+ 
+-autoheader
++autoheader213
+ 
+ # Produce all the `Makefile.in's, verbosely, and create neat missing things
+ # like `libtool', `install-sh', etc.
+-automake --add-missing --verbose --foreign
++automake14 --add-missing --verbose --foreign
+ 
+ # If there's a config.cache file, we may need to delete it.  
+ # If we have an existing configure script, save a copy for comparison.
+@@ -50,7 +50,7 @@
+ 
+ # Produce ./configure
+ echo "Creating configure..."
+-autoconf
++autoconf213
+ 
+ echo ""
+ echo "You can run ./configure now."
diff --git a/editors/abiword-devel/Makefile b/editors/abiword-devel/Makefile
index 19bf90018b18..3023db296245 100644
--- a/editors/abiword-devel/Makefile
+++ b/editors/abiword-devel/Makefile
@@ -29,8 +29,10 @@ DIST_SUBDIR=	AbiWord
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 
+USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
+AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgiconv"
 MAKEFILE=	GNUmakefile
@@ -42,8 +44,6 @@ pre-configure:
 	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog
 	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
 	@${RM} -f ${WRKSRC}/configure.ac
-	@cd ${WRKSRC} ; ${WRKSRC}/autogen.sh
-	@cd ${WRKSRC} ; ${FIXME}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/editors/abiword-devel/files/patch-autogen.sh b/editors/abiword-devel/files/patch-autogen.sh
new file mode 100644
index 000000000000..465e7f9f4047
--- /dev/null
+++ b/editors/abiword-devel/files/patch-autogen.sh
@@ -0,0 +1,55 @@
+
+$FreeBSD$
+
+--- autogen.sh	2001/10/30 10:05:41	1.1
++++ autogen.sh	2001/10/30 10:05:42
+@@ -10,20 +10,20 @@
+ 
+ set -e
+ 
+-automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
++automake14 --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
+ 
+ if [ $? -ne 0 ]; then
+     echo "Error: you need automake 1.4 or later.  Please upgrade."
+     exit 1
+ fi
+ 
+-if test ! -d `aclocal --print-ac-dir`; then
++if test ! -d `aclocal14 --print-ac-dir`; then
+   echo "Bad aclocal (automake) installation"
+   exit 1
+ fi
+ 
+ for script in `cd ac-helpers/fallback; echo *.m4`; do
+-  if test -r `aclocal --print-ac-dir`/$script; then
++  if test -r `aclocal14 --print-ac-dir`/$script; then
+     # Perhaps it was installed recently
+     rm -f ac-helpers/$script
+   else
+@@ -34,13 +34,13 @@
+ 
+ # Produce aclocal.m4, so autoconf gets the automake macros it needs
+ echo "Creating aclocal.m4..."
+-aclocal -I ac-helpers
++aclocal14 -I ac-helpers
+ 
+-autoheader
++autoheader213
+ 
+ # Produce all the `Makefile.in's, verbosely, and create neat missing things
+ # like `libtool', `install-sh', etc.
+-automake --add-missing --verbose --foreign
++automake14 --add-missing --verbose --foreign
+ 
+ # If there's a config.cache file, we may need to delete it.  
+ # If we have an existing configure script, save a copy for comparison.
+@@ -50,7 +50,7 @@
+ 
+ # Produce ./configure
+ echo "Creating configure..."
+-autoconf
++autoconf213
+ 
+ echo ""
+ echo "You can run ./configure now."
diff --git a/editors/abiword/Makefile b/editors/abiword/Makefile
index 19bf90018b18..3023db296245 100644
--- a/editors/abiword/Makefile
+++ b/editors/abiword/Makefile
@@ -29,8 +29,10 @@ DIST_SUBDIR=	AbiWord
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/abi
 
+USE_AUTOMAKE=	yes
 USE_GMAKE=	yes
 USE_GTK=	yes
+AUTOMAKE=	${WRKSRC}/autogen.sh && ${FIXME}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgiconv"
 MAKEFILE=	GNUmakefile
@@ -42,8 +44,6 @@ pre-configure:
 	@cd ${WRKSRC} && ${TOUCH} NEWS README AUTHORS ChangeLog
 	@cd ${WRKSRC}/ac-helpers && ${RM} -f install-sh mkinstalldirs missing
 	@${RM} -f ${WRKSRC}/configure.ac
-	@cd ${WRKSRC} ; ${WRKSRC}/autogen.sh
-	@cd ${WRKSRC} ; ${FIXME}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/editors/abiword/files/patch-autogen.sh b/editors/abiword/files/patch-autogen.sh
new file mode 100644
index 000000000000..465e7f9f4047
--- /dev/null
+++ b/editors/abiword/files/patch-autogen.sh
@@ -0,0 +1,55 @@
+
+$FreeBSD$
+
+--- autogen.sh	2001/10/30 10:05:41	1.1
++++ autogen.sh	2001/10/30 10:05:42
+@@ -10,20 +10,20 @@
+ 
+ set -e
+ 
+-automake --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
++automake14 --version | perl -ne 'if (/\(GNU automake\) ([0-9].[0-9])/) {print;  if ($1 < 1.4) {exit 1;}}'
+ 
+ if [ $? -ne 0 ]; then
+     echo "Error: you need automake 1.4 or later.  Please upgrade."
+     exit 1
+ fi
+ 
+-if test ! -d `aclocal --print-ac-dir`; then
++if test ! -d `aclocal14 --print-ac-dir`; then
+   echo "Bad aclocal (automake) installation"
+   exit 1
+ fi
+ 
+ for script in `cd ac-helpers/fallback; echo *.m4`; do
+-  if test -r `aclocal --print-ac-dir`/$script; then
++  if test -r `aclocal14 --print-ac-dir`/$script; then
+     # Perhaps it was installed recently
+     rm -f ac-helpers/$script
+   else
+@@ -34,13 +34,13 @@
+ 
+ # Produce aclocal.m4, so autoconf gets the automake macros it needs
+ echo "Creating aclocal.m4..."
+-aclocal -I ac-helpers
++aclocal14 -I ac-helpers
+ 
+-autoheader
++autoheader213
+ 
+ # Produce all the `Makefile.in's, verbosely, and create neat missing things
+ # like `libtool', `install-sh', etc.
+-automake --add-missing --verbose --foreign
++automake14 --add-missing --verbose --foreign
+ 
+ # If there's a config.cache file, we may need to delete it.  
+ # If we have an existing configure script, save a copy for comparison.
+@@ -50,7 +50,7 @@
+ 
+ # Produce ./configure
+ echo "Creating configure..."
+-autoconf
++autoconf213
+ 
+ echo ""
+ echo "You can run ./configure now."