Date: Tue, 13 Sep 2005 01:58:01 -0400 (EDT) From: "Mikhail T." <mi@aldan.algebra.com> To: ade@FreeBSD.org Cc: gnome@FreeBSD.org Subject: improving devel/m4 Message-ID: <200509130558.j8D5w1Ha088160@blue.virtual-estates.net>
next in thread | raw e-mail | index | archive | help
Hello!
I'd like to commit the patch below to teach gm4 to use our own
getopt(), getopt_long, and gnu/regex.h instead of compiling its
warning-prone own.
I'm not sure, whether switch to bz2 is justified right now -- perhaps,
it should wait until the next new release, so as not to force people to
download another copy of the same thing.
Please, review and approve :-) Thank you,
-mi
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/m4/Makefile,v
retrieving revision 1.26
diff -U2 -r1.26 Makefile
--- Makefile 2 Sep 2005 19:46:54 -0000 1.26
+++ Makefile 13 Sep 2005 05:56:21 -0000
@@ -8,4 +8,5 @@
PORTNAME= m4
PORTVERSION= 1.4.3
+PORTREVISION= 1
CATEGORIES= devel
MASTER_SITES= ${MASTER_SITE_GNU}
@@ -15,4 +16,5 @@
COMMENT= GNU m4
+USE_BZIP2= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --program-prefix=g
@@ -25,4 +27,18 @@
EXAMPLESDIR= share/examples/gm4
+USE_REINPLACE= yes
+USE_GETOPT_LONG=yes
+EXCLUDE=lib/getopt* lib/regex*
+EXTRACT_AFTER_ARGS= |${TAR} -xf - \
+ ${EXCLUDE:S,^,--exclude ${PORTNAME}-${PORTVERSION}/,}
+
+post-patch:
+ @if [ -f /usr/include/gnu/regex.h ]; then \
+ header=gnu/regex.h; \
+ else \
+ header=gnuregex.h; \
+ fi; \
+ ${GREP} -Fl '"regex.h"' ${WRKSRC}/*/*.[ch] | \
+ ${XARGS} ${REINPLACE_CMD} "s,\"regex.h\",<$$header>,"
post-install:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/m4/distinfo,v
retrieving revision 1.5
diff -U2 -r1.5 distinfo
--- distinfo 5 Apr 2005 07:39:55 -0000 1.5
+++ distinfo 13 Sep 2005 05:56:21 -0000
@@ -1,2 +1,2 @@
-MD5 (m4-1.4.3.tar.gz) = 073048d747f2dbb3298e713059dd9ab3
-SIZE (m4-1.4.3.tar.gz) = 383347
+MD5 (m4-1.4.3.tar.bz2) = 1f7d7eba70a0525c44c2edc3998925c7
+SIZE (m4-1.4.3.tar.bz2) = 305598
Index: files/patch-no-redundancy
===================================================================
RCS file: files/patch-no-redundancy
diff -N files/patch-no-redundancy
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-no-redundancy 13 Sep 2005 05:56:21 -0000
@@ -0,0 +1,31 @@
+--- lib/Makefile.in Wed Feb 9 15:48:35 2005
++++ lib/Makefile.in Tue Sep 13 00:46:36 2005
+@@ -39,8 +39,8 @@
+ INCLUDES = -I.. -I$(srcdir)
+
+-HEADERS = getopt.h obstack.h regex.h
+-SOURCES = regex.c getopt.c getopt1.c error.c obstack.c xmalloc.c \
++HEADERS = obstack.h
++SOURCES = error.c obstack.c xmalloc.c \
+ xstrdup.c alloca.c strtol.c
+-OBJECTS = regex.o getopt.o getopt1.o error.o obstack.o xmalloc.o \
++OBJECTS = error.o obstack.o xmalloc.o \
+ xstrdup.o @ALLOCA@ @LIBOBJS@
+
+--- src/Makefile.in Thu Mar 31 04:46:09 2005
++++ src/Makefile.in Tue Sep 13 01:25:38 2005
+@@ -79,5 +79,4 @@
+
+ $(OBJECTS): $(ANSI2KNR) ../config.h m4.h ../lib/obstack.h
+-builtin$O: ../lib/regex.h
+
+ ansi2knr: ansi2knr.o
+--- Makefile.in Thu Mar 31 06:56:34 2005
++++ Makefile.in Tue Sep 13 01:39:46 2005
+@@ -37,5 +37,5 @@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
+ LDFLAGS = @LDFLAGS@
+-LIBS = @LIBS@
++LIBS = @LIBS@ -lgnuregex
+
+ prefix = @prefix@
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200509130558.j8D5w1Ha088160>