1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-20 04:02:27 +00:00

Add new files that got accidently missed during autoconf update patch.

PR:		116639
This commit is contained in:
Ade Lovett 2007-09-30 05:19:51 +00:00
parent 81dd862bc6
commit 1f63d4fac8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=200416
5 changed files with 161 additions and 0 deletions

View File

@ -0,0 +1,64 @@
--- admin/cvs.sh.orig 2005-05-27 12:57:46.000000000 -0700
+++ admin/cvs.sh 2007-09-22 22:42:52.000000000 -0700
@@ -31,61 +31,5 @@
{
-required_autoconf_version="2.53 or newer"
AUTOCONF_VERSION=`$AUTOCONF --version | head -n 1`
-case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
- "" )
- echo "*** AUTOCONF NOT FOUND!."
- echo "*** KDE requires autoconf $required_autoconf_version"
- exit 1
- ;;
- * )
- echo "*** YOU'RE USING $AUTOCONF_VERSION."
- echo "*** KDE requires autoconf $required_autoconf_version"
- exit 1
- ;;
-esac
-
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -n 1`
-case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
- "" )
- echo "*** AUTOHEADER NOT FOUND!."
- echo "*** KDE requires autoheader $required_autoconf_version"
- exit 1
- ;;
- * )
- echo "*** YOU'RE USING $AUTOHEADER_VERSION."
- echo "*** KDE requires autoheader $required_autoconf_version"
- exit 1
- ;;
-esac
-
-unset UNSERMAKE || :
-
AUTOMAKE_STRING=`$AUTOMAKE --version | head -n 1`
-required_automake_version="1.6.1 or newer"
-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*) : ;;
- "" )
- echo "*** AUTOMAKE NOT FOUND!."
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
- *unsermake* ) :
- echo "*** YOU'RE USING UNSERMAKE."
- echo "*** GOOD LUCK!! :)"
- UNSERMAKE=unsermake
- ;;
- * )
- echo "*** YOU'RE USING $AUTOMAKE_STRING."
- echo "*** KDE requires automake $required_automake_version"
- exit 1
- ;;
-esac
-unset required_automake_version
}

View File

@ -0,0 +1,57 @@
--- admin/cvs.sh.orig 2003-05-25 06:51:54.000000000 -0700
+++ admin/cvs.sh 2007-09-22 19:53:05.000000000 -0700
@@ -30,54 +30,4 @@
AUTOCONF_VERSION=`$AUTOCONF --version | head -1`
-case $AUTOCONF_VERSION in
- Autoconf*2.5* | autoconf*2.5* ) : ;;
- "" )
- echo "*** AUTOCONF NOT FOUND!."
- echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
- exit 1
- ;;
- * )
- echo "*** YOU'RE USING $AUTOCONF_VERSION."
- echo "*** KDE requires autoconf 2.52, 2.53 or 2.54"
- exit 1
- ;;
-esac
-
AUTOHEADER_VERSION=`$AUTOHEADER --version | head -1`
-case $AUTOHEADER_VERSION in
- Autoconf*2.5* | autoheader*2.5* ) : ;;
- "" )
- echo "*** AUTOHEADER NOT FOUND!."
- echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
- exit 1
- ;;
- * )
- echo "*** YOU'RE USING $AUTOHEADER_VERSION."
- echo "*** KDE requires autoheader 2.52 or 2.53 (part of autoconf)"
- exit 1
- ;;
-esac
-
AUTOMAKE_STRING=`$AUTOMAKE --version | head -1`
-case $AUTOMAKE_STRING in
- automake*1.5d* )
- echo "*** YOU'RE USING $AUTOMAKE_STRING."
- echo "*** KDE requires automake 1.5"
- exit 1
- ;;
- automake*1.4* | automake*1.5* | automake*1.5-* | automake*1.6.* | automake*1.7* ) : ;;
- "" )
- echo "*** AUTOMAKE NOT FOUND!."
- echo "*** KDE requires automake 1.5"
- exit 1
- ;;
- unsermake* ) :
- echo "*** YOU'RE USING UNSERMAKE."
- echo "*** GOOD LUCK!! :)"
- ;;
- * )
- echo "*** YOU'RE USING $AUTOMAKE_STRING."
- echo "*** KDE requires automake 1.5"
- exit 1
- ;;
-esac
}

View File

@ -0,0 +1,11 @@
--- aclocal.m4.orig 2003-04-12 20:59:34.000000000 -0700
+++ aclocal.m4 2007-09-22 20:58:23.000000000 -0700
@@ -6989,8 +6989 @@
])
-
-dnl *
-dnl * Check for ssize_t.
-dnl *
-AC_DEFUN(AC_TYPE_SSIZE_T,
-[AC_CHECK_TYPE(ssize_t, int)])
-

View File

@ -0,0 +1,16 @@
--- configure.orig 2005-01-15 11:17:17.000000000 -0800
+++ configure 2007-09-22 18:17:38.000000000 -0700
@@ -6368,4 +6368,4 @@
else
- if test -f /usr/include/tcl${TCL_VERSION}/tk.h ; then
- TK_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+ if test -f ${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}/tk.h ; then
+ TK_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tk${TCL_VERSION}
fi
@@ -6375,4 +6375,4 @@
else
- if test -f /usr/include/tcl${TCL_VERSION}/tcl.h ; then
- TCL_INCLUDE=-I/usr/include/tcl${TCL_VERSION}
+ if test -f ${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}/tcl.h ; then
+ TCL_INCLUDE=-I${TK_CONFIG_PREFIX}/../../include/tcl${TCL_VERSION}
fi

View File

@ -0,0 +1,13 @@
--- configure.ac.orig 2007-02-08 09:38:58.000000000 -0800
+++ configure.ac 2007-09-22 18:29:24.000000000 -0700
@@ -412,9 +412,3 @@
-AC_ARG_VAR( [docdir], [Documentation direcotry] )
-
-if test -z $docdir; then
- AC_SUBST(docdir, [$datadir/doc/fish] )
-else
- AC_SUBST(docdir, [$docdir])
-fi
+AC_SUBST(docdir, [$datadir/doc/fish] )