svn commit: r329594 - in head/devel/m4: . files

[Johan van Selst]

Author: johans
Date: Sun Oct  6 15:26:15 2013
New Revision: 329594
URL: http://svnweb.freebsd.org/changeset/ports/329594

Log:
  - Update GNU m4 to 1.4.17 (bugfix release)
  - Enable stage support
  - Rename patch files

Added:
  head/devel/m4/files/patch-doc_m4.texi
     - copied, changed from r329591, head/devel/m4/files/patch-ab
  head/devel/m4/files/patch-lib_Makefile.in
     - copied unchanged from r329591, head/devel/m4/files/patch-aa
Deleted:
  head/devel/m4/files/patch-aa
  head/devel/m4/files/patch-ab
Modified:
  head/devel/m4/Makefile
  head/devel/m4/distinfo
  head/devel/m4/pkg-plist

Modified: head/devel/m4/Makefile
==============================================================================
--- head/devel/m4/Makefile	Sun Oct  6 15:25:58 2013	(r329593)
+++ head/devel/m4/Makefile	Sun Oct  6 15:26:15 2013	(r329594)
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	m4
-PORTVERSION=	1.4.16
-PORTREVISION=	1
+PORTVERSION=	1.4.17
 PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=	m4
+MASTER_SITES=	GNU
 
 MAINTAINER=	johans at FreeBSD.org
 COMMENT=	GNU m4
@@ -18,22 +16,21 @@ CONFIGURE_ARGS=	--program-prefix=g
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 
 INFO=	m4
-MAN1=	gm4.1
 
 EXAMPLESDIR=	share/examples/gm4
 
 OPTIONS_DEFINE=		LIBSIGSEGV
 LIBSIGSEGV_DESC=	Use libsigsegv for better diagnostics
 
-NO_STAGE=	yes
 post-install:
-	@${MKDIR} ${PREFIX}/${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 ${PREFIX}/${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${PREFIX}/${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/*.m4 \
+		${STAGEDIR}${PREFIX}/${EXAMPLESDIR}
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MLIBSIGSEGV}
-LIB_DEPENDS+=		sigsegv:${PORTSDIR}/devel/libsigsegv
+LIB_DEPENDS+=		libsigsegv.so:${PORTSDIR}/devel/libsigsegv
 CONFIGURE_ARGS+=	--with-libsigsegv-prefix=${LOCALBASE}
 .else
 CONFIGURE_ARGS+=	--without-libsigsegv-prefix

Modified: head/devel/m4/distinfo
==============================================================================
--- head/devel/m4/distinfo	Sun Oct  6 15:25:58 2013	(r329593)
+++ head/devel/m4/distinfo	Sun Oct  6 15:26:15 2013	(r329594)
@@ -1,2 +1,2 @@
-SHA256 (m4-1.4.16.tar.bz2) = 42500c1fddd90bcb161e6b58de931d769929c495c124112d67428a23543db90c
-SIZE (m4-1.4.16.tar.bz2) = 1258362
+SHA256 (m4-1.4.17.tar.bz2) = 8e4e1f963932136ed45dcd5afb0c6e237e96a6fcdcd2a2fa6755040859500d70
+SIZE (m4-1.4.17.tar.bz2) = 1438525

Copied and modified: head/devel/m4/files/patch-doc_m4.texi (from r329591, head/devel/m4/files/patch-ab)
==============================================================================
--- head/devel/m4/files/patch-ab	Sun Oct  6 15:22:10 2013	(r329591, copy source)
+++ head/devel/m4/files/patch-doc_m4.texi	Sun Oct  6 15:26:15 2013	(r329594)
@@ -1,5 +1,5 @@
---- doc/m4.texinfo.orig	Mon Nov 20 05:55:43 2006
-+++ doc/m4.texinfo	Sun Dec  3 17:15:41 2006
+--- doc/m4.texi.orig	Mon Nov 20 05:55:43 2006
++++ doc/m4.texi	Sun Dec  3 17:15:41 2006
 @@ -60,3 +60,3 @@
  @direntry
 -* M4: (m4).                     A powerful macro processor.

Copied: head/devel/m4/files/patch-lib_Makefile.in (from r329591, head/devel/m4/files/patch-aa)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/m4/files/patch-lib_Makefile.in	Sun Oct  6 15:26:15 2013	(r329594, copy of r329591, head/devel/m4/files/patch-aa)
@@ -0,0 +1,7 @@
+--- lib/Makefile.in.orig	Fri Mar 23 06:32:35 2007
++++ lib/Makefile.in	Wed Apr 25 02:48:45 2007
+@@ -564,3 +564,3 @@
+ install-am: all-am
+-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++	@$(MAKE) $(AM_MAKEFLAGS) install-data-am
+ 

Modified: head/devel/m4/pkg-plist
==============================================================================
--- head/devel/m4/pkg-plist	Sun Oct  6 15:25:58 2013	(r329593)
+++ head/devel/m4/pkg-plist	Sun Oct  6 15:26:15 2013	(r329594)
@@ -1,4 +1,5 @@
 bin/gm4
+man/man1/gm4.1.gz
 %%EXAMPLESDIR%%/capitalize.m4
 %%EXAMPLESDIR%%/capitalize2.m4
 %%EXAMPLESDIR%%/comments.m4