From f6d5594a704d847d1a9076aa03e9af2fc474deaa Mon Sep 17 00:00:00 2001
From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>
Date: Wed, 29 Feb 2012 16:14:06 +0000
Subject: - Update to 1.03 - Add my LOCAL to MASTER_SITES - Use PLIST_FILES and
 PORTEXAMPLES instead of PLIST - Cosmetic change

Changes:	http://devel.ringlet.net/textproc/confget/CHANGES
---
 textproc/confget/Makefile  | 44 +++++++++++++++++++++++---------------------
 textproc/confget/distinfo  |  4 ++--
 textproc/confget/pkg-plist |  4 ----
 3 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 textproc/confget/pkg-plist

(limited to 'textproc/confget')

diff --git a/textproc/confget/Makefile b/textproc/confget/Makefile
index 789023cf5813..ed1d0a672472 100644
--- a/textproc/confget/Makefile
+++ b/textproc/confget/Makefile
@@ -6,40 +6,42 @@
 #
 
 PORTNAME=	confget
-PORTVERSION=	1.02
-PORTREVISION=	1
+PORTVERSION=	1.03
 CATEGORIES=	textproc
-MASTER_SITES=	http://devel.ringlet.net/textproc/confget/
+MASTER_SITES=	http://devel.ringlet.net/textproc/confget/ \
+		LOCAL/sunpoet
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Read variables from INI-style configuration files
 
 OPTIONS=	PCRE "Regular expression support" on
 
-.include <bsd.port.pre.mk>
-
-.if defined(WITH_PCRE)
-LIB_DEPENDS=	pcre.1:${PORTSDIR}/devel/pcre
-.else
-MAKE_ENV+=	PCRE_CFLAGS= PCRE_LIBS=
-.endif
-
+MAKE_ENV=	CFLAGS_CONF=-DHAVE_FGETLN
 USE_GMAKE=	yes
 
-MAKE_ENV+=	CFLAGS_CONF=-DHAVE_FGETLN
-
 MAN1=		confget.1
 MANCOMPRESSED=	yes
+PLIST_FILES=	bin/confget
+PORTEXAMPLES=	t1.ini t2.ini
 
-.if defined(NOPORTEXAMPLES)
-post-patch:
-		${REINPLACE_CMD} -E -e 's/([^n])install-examples/\1/' \
-			${WRKSRC}/Makefile
-.else
+.if !defined(NOPORTEXAMPLES)
 MAKE_ENV+=	EXAMPLESDIR=${EXAMPLESDIR}
 .endif
 
-test:		build
-		cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
+.include <bsd.port.options.mk>
+
+.if !defined(WITHOUT_PCRE)
+LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre
+.else
+MAKE_ENV+=	PCRE_CFLAGS="" PCRE_LIBS=""
+.endif
+
+post-patch:
+.if defined(NOPORTEXAMPLES)
+	@${REINPLACE_CMD} -e '/^install:/ s| install-examples||' ${WRKSRC}/Makefile
+.endif
+
+regression-test test: build
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} test
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/textproc/confget/distinfo b/textproc/confget/distinfo
index 8205ac663cb8..f398d448865d 100644
--- a/textproc/confget/distinfo
+++ b/textproc/confget/distinfo
@@ -1,2 +1,2 @@
-SHA256 (confget-1.02.tar.gz) = 15b5d97a97beff4daf5cbe6346b64c67bdcec36e64f163754c4657a66cc5f68b
-SIZE (confget-1.02.tar.gz) = 15310
+SHA256 (confget-1.03.tar.gz) = ae0c83e5eb25a3b74ea8cd9929e45f0ab238c2b187d6caad482750861ddf45a6
+SIZE (confget-1.03.tar.gz) = 15796
diff --git a/textproc/confget/pkg-plist b/textproc/confget/pkg-plist
deleted file mode 100644
index b8dcce86b2d2..000000000000
--- a/textproc/confget/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-bin/confget
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/t1.ini
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/t2.ini
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-- 
cgit v1.2.3