aboutsummaryrefslogtreecommitdiff
path: root/textproc
diff options
context:
space:
mode:
authorMatthias Andree <mandree@FreeBSD.org>2013-01-24 22:11:04 +0000
committerMatthias Andree <mandree@FreeBSD.org>2013-01-24 22:11:04 +0000
commit31d7e80a536538d40275975ff71bb1496421c709 (patch)
treefe91aaf5ea89eb7a999fc1e49c9f1de41fcbcc98 /textproc
parentad39f5552fbfbc4dec506d65853168346d90ae12 (diff)
downloadports-31d7e80a536538d40275975ff71bb1496421c709.tar.gz
ports-31d7e80a536538d40275975ff71bb1496421c709.zip
Notes
Diffstat (limited to 'textproc')
-rw-r--r--textproc/wiggle/Makefile32
-rw-r--r--textproc/wiggle/distinfo4
-rw-r--r--textproc/wiggle/pkg-descr2
3 files changed, 17 insertions, 21 deletions
diff --git a/textproc/wiggle/Makefile b/textproc/wiggle/Makefile
index 178932d1f47c..1156cb80ebc9 100644
--- a/textproc/wiggle/Makefile
+++ b/textproc/wiggle/Makefile
@@ -1,16 +1,12 @@
-# New ports collection Makefile for: wiggle
-# Date created: 2012-02-15
-# Whom: mandree@FreeBSD.org
-#
+# Created by: mandree@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@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/
diff --git a/textproc/wiggle/distinfo b/textproc/wiggle/distinfo
index 0d63e424d264..3f3581d32362 100644
--- a/textproc/wiggle/distinfo
+++ b/textproc/wiggle/distinfo
@@ -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
diff --git a/textproc/wiggle/pkg-descr b/textproc/wiggle/pkg-descr
index 8ac8151fafcc..7644708a2a87 100644
--- a/textproc/wiggle/pkg-descr
+++ b/textproc/wiggle/pkg-descr
@@ -12,4 +12,4 @@ Also, wiggle will (in some cases) detect changes that have already been
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