cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autoconf WITHOUT gnu-m4

Browse Source
This commit is contained in:
espie 2000-03-18 15:54:22 +00:00
parent 6d57a47c9e
commit 07b374d7c1
6 changed files with 79 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
devel/autoconf/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.17 2000/03/06 03:56:07 espie Exp $
# $OpenBSD: Makefile,v 1.18 2000/03/18 15:54:22 espie Exp $
DISTNAME= autoconf-2.13
CATEGORIES= devel
@ -6,24 +6,26 @@ NEED_VERSION= 1.223
MASTER_SITES= ${MASTER_SITE_GNU}
MASTER_SITE_SUBDIR= autoconf
MAINTAINER= espie@openbsd.org
MAINTAINER= espie@cvs.openbsd.org
LICENSE_TYPE= GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
# GPL
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
# Both are needed for now as bsd.port.mk does not cause RUN_DEPENDS to
# be created before running configure, which causes the build to do the
# wrong thing. The RUN_DEPENDS is needed for packages.
BUILD_DEPENDS= gm4:devel/m4
RUN_DEPENDS= gm4:devel/m4
FAKE= Yes
SEPARATE_BUILD= concurrent
HAS_CONFIGURE= Yes
CONFIGURE_ARGS=--prefix='$${DESTDIR}${PREFIX}' --sysconfdir='$${DESTDIR}/etc'
CONFIGURE_ENV=M4=/usr/bin/m4
FAKE= Yes
pre-configure:
# Check if /usr/bin/m4 recognizes option -g, and has builtin __line__
@if [ `echo "__line__"|/usr/bin/m4 -g` \
!= "1" ]; then \
echo >&2 "Your m4 is not current enough, sorry"; \
exit 1; \
fi
.include <bsd.port.mk>

15
devel/autoconf/patches/patch-aa
View File

@ -1,5 +1,5 @@
--- Makefile.in.orig Wed Nov 17 15:22:11 1999
+++ Makefile.in Wed Nov 17 15:22:43 1999
--- Makefile.in.orig Tue Jan 5 14:27:16 1999
+++ Makefile.in Wed Nov 17 16:41:36 1999
@@ -22,6 +22,7 @@ srcdir = @srcdir@
VPATH = @srcdir@
@ -8,6 +8,17 @@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
MAKEINFO = makeinfo
@@ -33,8 +34,8 @@ PERL = @PERL@
# Programs that are ALWAYS installed (and are created in the build dir).
ASCRIPTS = autoconf autoheader autoreconf autoupdate ifnames
-# M4 input that is frozen.
-M4FROZEN = autoconf.m4f autoheader.m4f
+# Don't freeze anything with OpenBSD m4
+M4FROZEN=
# All programs, including those only installed if you have perl.
SCRIPTS = $(ASCRIPTS) @SCRIPTS@
@@ -141,7 +142,7 @@ installdirs:
install: all $(M4FILES) acconfig.h installdirs install-info

20
devel/autoconf/patches/patch-ad Normal file
View File

@ -0,0 +1,20 @@
--- autoconf.sh.orig Wed Nov 17 16:43:04 1999
+++ autoconf.sh Wed Nov 17 16:43:39 1999
@@ -112,16 +112,7 @@ else
use_localdir=
fi
-# Use the frozen version of Autoconf if available.
-r= f=
-# Some non-GNU m4's don't reject the --help option, so give them /dev/null.
-case `$M4 --help < /dev/null 2>&1` in
-*reload-state*) test -r $AC_MACRODIR/autoconf.m4f && { r=--reload f=f; } ;;
-*traditional*) ;;
-*) echo Autoconf requires GNU m4 1.1 or later >&2; rm -f $tmpin; exit 1 ;;
-esac
-
-$M4 -I$AC_MACRODIR $use_localdir $r autoconf.m4$f $infile > $tmpout ||
+$M4 -g -D__gnu__ -I$AC_MACRODIR $use_localdir autoconf.m4 $infile > $tmpout ||
{ rm -f $tmpin $tmpout; exit 2; }
# You could add your own prefixes to pattern if you wanted to check for

24
devel/autoconf/patches/patch-ae Normal file
View File

@ -0,0 +1,24 @@
--- acgeneral.m4.orig Wed Nov 17 21:52:30 1999
+++ acgeneral.m4 Wed Nov 17 21:52:48 1999
@@ -733,8 +733,8 @@ ac_help="$ac_help
[$2]"
AC_DIVERT_POP()dnl
[#] Check whether --enable-[$1] or --disable-[$1] was given.
-if test "[${enable_]patsubst([$1], -, _)+set}" = set; then
- enableval="[$enable_]patsubst([$1], -, _)"
+if test "[${enable_]translit([$1], -, _)+set}" = set; then
+ enableval="[$enable_]translit([$1], -, _)"
ifelse([$3], , :, [$3])
ifelse([$4], , , [else
$4
@@ -758,8 +758,8 @@ ac_help="$ac_help
[$2]"
AC_DIVERT_POP()dnl
[#] Check whether --with-[$1] or --without-[$1] was given.
-if test "[${with_]patsubst([$1], -, _)+set}" = set; then
- withval="[$with_]patsubst([$1], -, _)"
+if test "[${with_]translit([$1], -, _)+set}" = set; then
+ withval="[$with_]translit([$1], -, _)"
ifelse([$3], , :, [$3])
ifelse([$4], , , [else
$4

4
devel/autoconf/pkg/DESCR
View File

@ -5,3 +5,7 @@ systems without manual user intervention. Autoconf creates a
configuration script for a package from a template file that lists the
operating system features that the package can use, in the form of m4
macro calls.
The FSF would make you believe that only gnu-m4 can handle autoconf.
As of OpenBSD 2.7, this is no longer true. This package does not depend
on gnu-m4.

10
devel/autoconf/pkg/PLIST
View File

@ -1,15 +1,13 @@
@unexec install-info --delete --info-dir=%D/info %D/info/autoconf.info
@unexec install-info --delete --info-dir=%D/info %D/info/standards.info
bin/autoconf
bin/autoheader
bin/autoreconf
bin/autoscan
bin/autoupdate
bin/ifnames
@unexec install-info --delete --info-dir=%D/info %D/info/autoconf.info
@unexec install-info --delete --info-dir=%D/info %D/info/standards.info
info/autoconf.info
info/standards.info
@exec install-info --info-dir=%D/info %D/info/autoconf.info
@exec install-info --info-dir=%D/info %D/info/standards.info
share/autoconf/acconfig.h
share/autoconf/acfunctions
share/autoconf/acgeneral.m4
@ -20,7 +18,7 @@ share/autoconf/acoldnames.m4
share/autoconf/acprograms
share/autoconf/acspecific.m4
share/autoconf/autoconf.m4
share/autoconf/autoconf.m4f
share/autoconf/autoheader.m4
share/autoconf/autoheader.m4f
@dirrm share/autoconf
@exec install-info --info-dir=%D/info %D/info/autoconf.info
@exec install-info --info-dir=%D/info %D/info/standards.info