From fullermd@over-yonder.net  Thu Jan  9 11:36:40 2014
Return-Path: <fullermd@over-yonder.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 69EF2ACA
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Jan 2014 11:36:40 +0000 (UTC)
Received: from thyme.infocus-llc.com (server.infocus-llc.com [206.156.254.44])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id 318891A89
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Jan 2014 11:36:39 +0000 (UTC)
Received: from draco.over-yonder.net (c-75-65-60-66.hsd1.ms.comcast.net [75.65.60.66])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by thyme.infocus-llc.com (Postfix) with ESMTPSA id 6AB3C37B49B
	for <FreeBSD-gnats-submit@freebsd.org>; Thu,  9 Jan 2014 05:36:38 -0600 (CST)
Received: by draco.over-yonder.net (Postfix, from userid 100)
	id 3f0QJj6SlxzL0L; Thu,  9 Jan 2014 05:36:37 -0600 (CST)
Message-Id: <3f0QJj6SlxzL0L@draco.over-yonder.net>
Date: Thu,  9 Jan 2014 05:36:37 -0600 (CST)
From: Matthew D.Fuller <fullermd@over-yonder.net>
Reply-To: Matthew D.Fuller <fullermd@over-yonder.net>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] Update x11/bgrot to 1.31
X-Send-Pr-Version: 3.114
X-GNATS-Notify:

>Number:         185605
>Category:       ports
>Synopsis:       [MAINTAINER] Update x11/bgrot to 1.31
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Thu Jan 09 11:40:00 UTC 2014
>Closed-Date:    Thu Jan 09 14:57:01 UTC 2014
>Last-Modified:  Thu Jan  9 15:00:00 UTC 2014
>Originator:     Matthew D. Fuller
>Release:        FreeBSD 9.1-STABLE amd64
>Organization:
>Environment:
System: FreeBSD draco.over-yonder.net 9.1-STABLE FreeBSD 9.1-STABLE #0 r251584: Sun Jun 9 14:23:33 CDT 2013 root@draco.over-yonder.net:/usr/obj/usr/src/sys/DRACO amd64


	
>Description:
	New upstream release to clean up build system and enable staging
	support.
>How-To-Repeat:
	
>Fix:

Notes:

1) Note that files/ and pkg-message file are removed completely

2) I vaguely understand that the @exec/@unexec in plist aren't Proper(tm)
   for pkgng, but it's what's documented in the Handbook, so it's what I
   went with.


Index: Makefile
===================================================================
--- Makefile	(revision 339214)
+++ Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	bgrot
-PORTVERSION=	1.30
-PORTREVISION=	7
+PORTVERSION=	1.31
 CATEGORIES=	x11
 MASTER_SITES=	http://www.over-yonder.net/~fullermd/projects/bgrot/ \
 		http://distfiles.over-yonder.net/bgrot/
@@ -11,16 +10,13 @@
 MAINTAINER=	fullermd@over-yonder.net
 COMMENT=	A program to handle your X background to prevent boredom
 
+LICENSE=	BSD2CLAUSE
+
 RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv
 
 USES=		shebangfix perl5
 SHEBANG_FILES=	*.pl
 
-MAN1=		bgrot.1
-MANCOMPRESSED=	yes
+MAKE_ARGS=	IPREFIX=${STAGEDIR}${PREFIX}
 
-NO_STAGE=	yes
-post-install:
-	@${CAT} pkg-message
-
 .include <bsd.port.mk>
Index: distinfo
===================================================================
--- distinfo	(revision 339214)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (bgrot-1.30.tar.gz) = e9cac2280bb57119df15eb78b412066f7e6b4c8eaf9c5bc9aa3df4f4a36ca791
-SIZE (bgrot-1.30.tar.gz) = 6567
+SHA256 (bgrot-1.31.tar.gz) = e4f625b6e8f064532ed2c921e80219db7b33c9fe7b54e7ab40fe9fc0bb175ccc
+SIZE (bgrot-1.31.tar.gz) = 6867
Index: files/patch-Makefile
===================================================================
--- files/patch-Makefile	(revision 339214)
+++ files/patch-Makefile	(working copy)
@@ -1,45 +0,0 @@
---- Makefile.orig	Wed Jun 21 05:50:30 2000
-+++ Makefile	Fri Nov 25 17:13:07 2005
-@@ -4,12 +4,13 @@
- # Written by Matthew Fuller <fullermd@over-yonder.net>
- 
- # OK, first: config stuff
-+PREFIX ?= /usr/local
- 
- # BINDIR: Where the programs are
--BINDIR = /usr/local/bin
-+BINDIR = ${PREFIX}/bin
- 
- # CONFDIR: Where the system-wide config goes
--CONFDIR = /usr/local/etc
-+CONFDIR = ${PREFIX}/etc
- 
- # DIRMODE: Permission bits for directories
- # FILEMODE: Permission bits for files
-@@ -22,7 +23,7 @@
- BINGRP = bin
- 
- # MANDIR: Where is your manpage base?
--MANDIR = /usr/local/man
-+MANDIR = ${PREFIX}/man
- 
- # OK, that's about it for user stuff
- # Touch the rest of this file at your own risk
-@@ -52,7 +53,7 @@
- .endif
- 	@echo Installing files...
- 	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c ${INSTALLFILES} ${BINDIR}
--	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c bgrot.conf ${CONFDIR}
-+	-install -o ${BINOWN} -g ${BINGRP} -m ${FILEMODE} -c bgrot.conf.skel ${CONFDIR}
- 	@echo Compressing manpage...
- 	@gzip -c bgrot.1 > bgrot.1.gz
- 	@echo Installing manpage...
-@@ -88,7 +89,7 @@
- 		rm -f ${BINDIR}/$${entry}; \
- 	done
- 	@echo Uninstalling configuration...
--	@rm -f ${CONFDIR}/bgrot.conf
-+	@rm -f ${CONFDIR}/bgrot.conf.skel
- 	@echo Uninstalling manpage...
- 	@rm -f ${MANDIR}/man1/bgrot.1.gz
- 	@echo Done.
Index: files/patch-setconfdir.pl
===================================================================
--- files/patch-setconfdir.pl	(revision 339214)
+++ files/patch-setconfdir.pl	(working copy)
@@ -1,13 +0,0 @@
---- setconfdir.pl.orig	Fri Nov 25 17:15:32 2005
-+++ setconfdir.pl	Fri Nov 25 17:15:44 2005
-@@ -16,8 +16,8 @@
- 
- 	foreach(<SKEL>) {
- 		chomp;
--		if(/^\$CONFDIR\=/) {
--			$_ = "\$CONFDIR=\"$CONFDIR\"";
-+		if(/^\CONFDIR\=/) {
-+			$_ = "\CONFDIR=\"$CONFDIR\"";
- 		}
- 		print OUT "$_\n";
- 	}
Index: pkg-message
===================================================================
--- pkg-message	(revision 339214)
+++ pkg-message	(working copy)
@@ -1,3 +0,0 @@
-***
-*** Please copy ${PREFIX}/etc/bgrot.conf.skel to ${PREFIX}/etc/bgrot.conf
-***
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 339214)
+++ pkg-plist	(working copy)
@@ -3,5 +3,7 @@
 bin/createlist.sh
 bin/masterlistgen.sh
 bin/bgrotman.pl
-etc/bgrot.conf.skel
+@unexec if cmp -s %D/etc/bgrot.conf.sample %D/etc/bgrot.conf; then rm -f %D/etc/bgrot.conf; fi
+etc/bgrot.conf.sample
+@exec if [ ! -f %D/etc/bgrot.conf ] ; then cp -p %D/%F %B/bgrot.conf; fi
 man/man1/bgrot.1.gz
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: bapt 
State-Changed-When: Thu Jan 9 14:57:00 UTC 2014 
State-Changed-Why:  
Concerning @exec/@unexec until we drop support for pkg_install it is 
still there, so it is ok like you did. Committed thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185605 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185605: commit references a PR
Date: Thu,  9 Jan 2014 14:56:17 +0000 (UTC)

 Author: bapt
 Date: Thu Jan  9 14:56:09 2014
 New Revision: 339247
 URL: http://svnweb.freebsd.org/changeset/ports/339247
 
 Log:
   Update to 1.31
   Handle the configuration file directly in plist
   
   PR:		ports/185605
   Submitted by:	Matthew D.Fuller <fullermd@over-yonder.net> (maintainer)
 
 Deleted:
   head/x11/bgrot/files/patch-Makefile
   head/x11/bgrot/files/patch-setconfdir.pl
   head/x11/bgrot/pkg-message
 Modified:
   head/x11/bgrot/Makefile
   head/x11/bgrot/distinfo
   head/x11/bgrot/pkg-plist
 
 Modified: head/x11/bgrot/Makefile
 ==============================================================================
 --- head/x11/bgrot/Makefile	Thu Jan  9 14:49:45 2014	(r339246)
 +++ head/x11/bgrot/Makefile	Thu Jan  9 14:56:09 2014	(r339247)
 @@ -2,18 +2,21 @@
  # $FreeBSD$
  
  PORTNAME=	bgrot
 -PORTVERSION=	1.30
 -PORTREVISION=	7
 +PORTVERSION=	1.31
  CATEGORIES=	x11
  MASTER_SITES=	http://www.over-yonder.net/~fullermd/projects/bgrot/ \
  		http://distfiles.over-yonder.net/bgrot/
  
  MAINTAINER=	fullermd@over-yonder.net
 -COMMENT=	A program to handle your X background to prevent boredom
 +COMMENT=	Program to handle your X background to prevent boredom
 +
 +LICENSE=	BSD2CLAUSE
  
  RUN_DEPENDS=	xv:${PORTSDIR}/graphics/xv
  
  USES=		shebangfix perl5
  SHEBANG_FILES=	*.pl
  
 +MAKE_ARGS=	IPREFIX=${STAGEDIR}${PREFIX}
 +
  .include <bsd.port.mk>
 
 Modified: head/x11/bgrot/distinfo
 ==============================================================================
 --- head/x11/bgrot/distinfo	Thu Jan  9 14:49:45 2014	(r339246)
 +++ head/x11/bgrot/distinfo	Thu Jan  9 14:56:09 2014	(r339247)
 @@ -1,2 +1,2 @@
 -SHA256 (bgrot-1.30.tar.gz) = e9cac2280bb57119df15eb78b412066f7e6b4c8eaf9c5bc9aa3df4f4a36ca791
 -SIZE (bgrot-1.30.tar.gz) = 6567
 +SHA256 (bgrot-1.31.tar.gz) = e4f625b6e8f064532ed2c921e80219db7b33c9fe7b54e7ab40fe9fc0bb175ccc
 +SIZE (bgrot-1.31.tar.gz) = 6867
 
 Modified: head/x11/bgrot/pkg-plist
 ==============================================================================
 --- head/x11/bgrot/pkg-plist	Thu Jan  9 14:49:45 2014	(r339246)
 +++ head/x11/bgrot/pkg-plist	Thu Jan  9 14:56:09 2014	(r339247)
 @@ -3,5 +3,7 @@ bin/bgrandom.pl
  bin/bgrotman.pl
  bin/createlist.sh
  bin/masterlistgen.sh
 -etc/bgrot.conf.skel
 +@unexec if cmp -s %D/etc/bgrot.conf.sample %D/etc/bgrot.conf; then rm -f %D/etc/bgrot.conf; fi
 +etc/bgrot.conf.sample
 +@exec if [ ! -f %D/etc/bgrot.conf ] ; then cp -p %D/%F %B/bgrot.conf; fi
  man/man1/bgrot.1.gz
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
