svn commit: r310951 - head/textproc/wiggle

[Matthias Andree]

Author: mandree
Date: Thu Jan 24 22:11:04 2013
New Revision: 310951
URL: http://svnweb.freebsd.org/changeset/ports/310951

Log:
  Update to new upstream release 0.9.

Modified:
  head/textproc/wiggle/Makefile   (contents, props changed)
  head/textproc/wiggle/distinfo   (contents, props changed)
  head/textproc/wiggle/pkg-descr   (contents, props changed)

Modified: head/textproc/wiggle/Makefile
==============================================================================
--- head/textproc/wiggle/Makefile	Thu Jan 24 21:55:59 2013	(r310950)
+++ head/textproc/wiggle/Makefile	Thu Jan 24 22:11:04 2013	(r310951)
@@ -1,16 +1,12 @@
-# New ports collection Makefile for:	wiggle
-# Date created:				2012-02-15
-# Whom:					mandree at FreeBSD.org
-#
+# Created by: mandree at FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	wiggle
-PORTVERSION=	0.8.0.${_GITDATE}
+PORTVERSION=	0.9
 CATEGORIES=	textproc
-#MASTER_SITES=	http://neil.brown.name/wiggle/
-MASTER_SITES=	LOCAL/mandree
-DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.xz
+MASTER_SITES=	http://neil.brown.name/wiggle/
+#MASTER_SITES=	LOCAL/mandree
+#DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.xz
 
 MAINTAINER=	mandree at FreeBSD.org
 COMMENT=	Apply rejected patches and perform word-wise diffs
@@ -19,23 +15,21 @@ LICENSE=	GPLv2
 
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
 
-_GITDATE=	20111208
-_GITVERSION=	405d8fe
+#_GITDATE=	20111208
+#_GITVERSION=	405d8fe
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${_GITVERSION}
+#WRKSRC=		${WRKDIR}/${PORTNAME}-${_GITVERSION}
 USE_GMAKE=	yes
-USE_XZ=		yes
+#USE_XZ=		yes
 
-CFLAGS+=	-Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter
-MAKE_ENV+=	CFLAGS="${CFLAGS}"
-MAKE_ARGS+=	-e
+MAKE_ARGS+=	CFLAGS="${CFLAGS} -I. -Wall -Wstrict-prototypes -Wextra -Wno-unused-parameter"
 
 MAN1=		wiggle.1
 PLIST_FILES=	bin/wiggle
 
 build-tarball: ${DISTFILES}
 ${DISTFILES}.gz:
-		${FETCH_CMD} -o ${DISTFILES}.gz 'http://neil.brown.name/git?p=wiggle;a=snapshot;h=${_GITVERSION};sf=tgz'
+		${FETCH_CMD} -o ${DISTFILES}.gz 'http://git.neil.brown.name/git?p=wiggle;a=snapshot;h=${_GITVERSION};sf=tgz'
 ${DISTFILES}: ${DISTFILES}.gz
 		${GZIP_CMD} -cd ${DISTFILES}.gz | ${XZ_CMD} -c --best >${DISTFILES}
 
@@ -43,9 +37,11 @@ upload-tarball: build-tarball
 		scp ${DISTFILES} freefall.freebsd.org:public_distfiles/
 
 pre-patch:
-		${REINPLACE_CMD} -Ee 's/#include.*<malloc.h>/#include <stdlib.h>/' ${WRKSRC}/*.[ch]
 		${REINPLACE_CMD} -Ee 's,\./dotest,bash ./dotest,' ${WRKSRC}/Makefile
 		${REINPLACE_CMD} -Ee "s,/usr/bin/time -o .time -f '%U',," ${WRKSRC}/dotest
+		${REINPLACE_CMD} -Ee 's|#include.*<endian.h>|#include <sys/endian.h>|' ${WRKSRC}/config.h
+		# fix clang warning:
+		${REINPLACE_CMD} -Ee 's|(^[[:space:]]+[[:<:]])cols = cols;|\1(void)cols;|' ${WRKSRC}/vpatch.c
 
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/wiggle ${PREFIX}/bin/

Modified: head/textproc/wiggle/distinfo
==============================================================================
--- head/textproc/wiggle/distinfo	Thu Jan 24 21:55:59 2013	(r310950)
+++ head/textproc/wiggle/distinfo	Thu Jan 24 22:11:04 2013	(r310951)
@@ -1,2 +1,2 @@
-SHA256 (wiggle-0.8.0.20111208.tar.xz) = cd6fd35ff47dff4a36367d93ea982e79664402162156390a71e369e349f80882
-SIZE (wiggle-0.8.0.20111208.tar.xz) = 286000
+SHA256 (wiggle-0.9.tar.gz) = fe3dcf05a2cda07f42db2099ae8407acdb4d58bb9cfdc58c72395b7ae4a4e6b5
+SIZE (wiggle-0.9.tar.gz) = 809756

Modified: head/textproc/wiggle/pkg-descr
==============================================================================
--- head/textproc/wiggle/pkg-descr	Thu Jan 24 21:55:59 2013	(r310950)
+++ head/textproc/wiggle/pkg-descr	Thu Jan 24 22:11:04 2013	(r310951)
@@ -12,4 +12,4 @@ Also, wiggle will (in some cases) detect
 applied, and will ignore them.
 							-- Neil Brown
 
-WWW:	http://neil.brown.name/git?p=wiggle;a=summary
+WWW:	http://git.neil.brown.name/git?p=wiggle.git;a=summary