From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Jan 9 11:40:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id C60FAB07 for ; Thu, 9 Jan 2014 11:40:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9E8E01AA9 for ; Thu, 9 Jan 2014 11:40:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.7/8.14.7) with ESMTP id s09Be0Oi001874 for ; Thu, 9 Jan 2014 11:40:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.7/8.14.7/Submit) id s09Be0OA001873; Thu, 9 Jan 2014 11:40:00 GMT (envelope-from gnats) Resent-Date: Thu, 9 Jan 2014 11:40:00 GMT Resent-Message-Id: <201401091140.s09Be0OA001873@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Matthew D.Fuller" 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 ; 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 ; 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 ; 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" To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/185605: [MAINTAINER] Update x11/bgrot to 1.31 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: "Matthew D.Fuller" List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 09 Jan 2014 11:40:00 -0000 >Number: 185605 >Category: ports >Synopsis: [MAINTAINER] Update x11/bgrot to 1.31 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Thu Jan 09 11:40:00 UTC 2014 >Closed-Date: >Last-Modified: >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 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 - - # 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() { - 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: >Unformatted: