From owner-svn-ports-head@FreeBSD.ORG  Fri Nov 30 23:52:31 2012
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id EE5E0F30;
 Fri, 30 Nov 2012 23:52:30 +0000 (UTC)
 (envelope-from sperber@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 0BF278FC18;
 Fri, 30 Nov 2012 23:52:30 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qAUNqTHF080141;
 Fri, 30 Nov 2012 23:52:29 GMT (envelope-from sperber@svn.freebsd.org)
Received: (from sperber@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qAUNqTYo080138;
 Fri, 30 Nov 2012 23:52:29 GMT (envelope-from sperber@svn.freebsd.org)
Message-Id: <201211302352.qAUNqTYo080138@svn.freebsd.org>
From: Armin Pirkovitsch <sperber@FreeBSD.org>
Date: Fri, 30 Nov 2012 23:52:29 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308046 - in head/devel/bcpp: . files
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 30 Nov 2012 23:52:31 -0000

Author: sperber
Date: Fri Nov 30 23:52:29 2012
New Revision: 308046
URL: http://svnweb.freebsd.org/changeset/ports/308046

Log:
  - Update to version 20120318
  - Convert to optionsng
  
  PR:           ports/171979
  Submitted by: KATO Tsuguru <tkato432 _at_ yahoo.com>
  Approved by:  beat (mentor)
  Feature safe: yes

Deleted:
  head/devel/bcpp/files/patch-code__bcpp.cpp
  head/devel/bcpp/pkg-message
Modified:
  head/devel/bcpp/Makefile
  head/devel/bcpp/distinfo
  head/devel/bcpp/pkg-plist

Modified: head/devel/bcpp/Makefile
==============================================================================
--- head/devel/bcpp/Makefile	Fri Nov 30 23:52:21 2012	(r308045)
+++ head/devel/bcpp/Makefile	Fri Nov 30 23:52:29 2012	(r308046)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bcpp
-PORTVERSION=	20050725
+PORTVERSION=	20120318
 CATEGORIES=	devel
 MASTER_SITES=	ftp://invisible-island.net/bcpp/
 EXTRACT_SUFX=	.tgz
@@ -10,27 +10,30 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A utility similar to indent for C++ code
 
-WRKSRC=		${WRKDIR}/${DISTNAME}
-MAKEFILE=	makefile
+OPTIONS_DEFINE=	DOCS
+
 GNU_CONFIGURE=	yes
+MAKEFILE=	makefile
+
+CFLAGS+=	-DBCPP_CONFIG_DIR=\\\"${PREFIX}/etc/${PORTNAME}\\\"
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},g' \
-		${WRKSRC}/code/bcpp.cpp
+	@${REINPLACE_CMD} -e \
+		's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/code/bcpp.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/code/${PORTNAME} ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/code/${PORTNAME}.cfg \
 		${PREFIX}/etc/${PORTNAME}.cfg.sample
-
-post-install:
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+.if !exists(${PREFIX}/etc/${PORTNAME}.cfg)
+	cd ${PREFIX}/etc && ${CP} -p ${PORTNAME}.cfg.sample ${PORTNAME}.cfg
+.endif
+.if ${PORT_OPTIONS:MDOCS}
+	@@${MKDIR} ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/txtdocs/hirachy.txt ${DOCSDIR}
 	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/txtdocs/manual.txt ${DOCSDIR}
 .endif
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}
 
 .include <bsd.port.mk>

Modified: head/devel/bcpp/distinfo
==============================================================================
--- head/devel/bcpp/distinfo	Fri Nov 30 23:52:21 2012	(r308045)
+++ head/devel/bcpp/distinfo	Fri Nov 30 23:52:29 2012	(r308046)
@@ -1,2 +1,2 @@
-SHA256 (bcpp-20050725.tgz) = 1a4b5e8e741d6be400eb68b7c4a3eebc6dabe29948a72a7a0bccb1db075eaa2a
-SIZE (bcpp-20050725.tgz) = 132649
+SHA256 (bcpp-20120318.tgz) = 75a7035da6387ff94111e643ff9efd26f742b52732f0bb8e434c216b8a642507
+SIZE (bcpp-20120318.tgz) = 147987

Modified: head/devel/bcpp/pkg-plist
==============================================================================
--- head/devel/bcpp/pkg-plist	Fri Nov 30 23:52:21 2012	(r308045)
+++ head/devel/bcpp/pkg-plist	Fri Nov 30 23:52:29 2012	(r308046)
@@ -1,5 +1,7 @@
 bin/bcpp
+@unexec if cmp -s %D/etc/bcpp.cfg %D/etc/bcpp.cfg.sample; then rm -f %D/etc/bcpp.cfg; fi
 etc/bcpp.cfg.sample
+@exec if [ ! -f %D/etc/bcpp.cfg ] ; then cp -p %D/etc/bcpp.cfg.sample %D/etc/bcpp.cfg; fi
 %%PORTDOCS%%%%DOCSDIR%%/hirachy.txt
 %%PORTDOCS%%%%DOCSDIR%%/manual.txt
 %%PORTDOCS%%@dirrm %%DOCSDIR%%