From owner-freebsd-ports@FreeBSD.ORG  Sat Apr 19 05:14:53 2014
Return-Path: <owner-freebsd-ports@FreeBSD.ORG>
Delivered-To: ports@freebsd.org
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 418D2933;
 Sat, 19 Apr 2014 05:14:53 +0000 (UTC)
Received: from duck.symmetricom.us (duck.symmetricom.us [206.168.13.214])
 by mx1.freebsd.org (Postfix) with ESMTP id F03471BC1;
 Sat, 19 Apr 2014 05:14:52 +0000 (UTC)
Received: from gromit.timing.com (gromit.timing.com [206.168.13.209])
 by duck.symmetricom.us (8.14.6/8.14.6) with ESMTP id s3J5EoQJ084192;
 Fri, 18 Apr 2014 23:14:50 -0600 (MDT)
 (envelope-from jhein@symmetricom.com)
Received: from gromit.timing.com (localhost [127.0.0.1])
 by gromit.timing.com (8.14.7/8.14.5) with ESMTP id s3J5EoAE064574;
 Fri, 18 Apr 2014 23:14:50 -0600 (MDT)
 (envelope-from jhein@gromit.timing.com)
Received: (from jhein@localhost)
 by gromit.timing.com (8.14.7/8.14.7/Submit) id s3J5EisF064573;
 Fri, 18 Apr 2014 23:14:44 -0600 (MDT) (envelope-from jhein)
Date: Fri, 18 Apr 2014 23:14:44 -0600 (MDT)
Message-Id: <201404190514.s3J5EisF064573@gromit.timing.com>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] graphics/libwmf - fix stage as non-root & use OPTIONS helpers
From: John Hein <john.hein@microsemi.com>
X-send-pr-version: 3.114
X-GNATS-Notify: 
Cc: ports@freebsd.org
X-BeenThere: freebsd-ports@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
Reply-To: John Hein <john.hein@microsemi.com>
List-Id: Porting software to FreeBSD <freebsd-ports.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-ports/>
List-Post: <mailto:freebsd-ports@freebsd.org>
List-Help: <mailto:freebsd-ports-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-ports>,
 <mailto:freebsd-ports-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 19 Apr 2014 05:14:53 -0000


>Submitter-Id:	current-users
>Originator:	John Hein
>Organization:	
>Confidential:	no 
>Synopsis:	[patch] graphics/libwmf - fix stage as non-root & use OPTIONS helpers
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		change-request
>Release:
>Environment:


>Description:

part 1
======
The ${CHOWN} in the post-install in print/ghostscript9/Makefile is not
needed - the created package specifies @owner root for packages that
have been created via the staging process.

Without this change, 'make stage' fails as a regular user (noticed
when using portmaster with PM_SU_CMD=/usr/local/bin/sudo).

part 2
======
Update port to use OPTIONS helpers.  No change in functionality.


Maybe this should have been 2 PRs.  Commit the changes in two commits
as desired.


>How-To-Repeat:

>Fix:

No need to bump portrevision.

patch for part 1:
===================
Index: Makefile
===================================================================
--- Makefile	(revision 351530)
+++ Makefile	(working copy)
@@ -57,7 +57,6 @@
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	@${TAR} -C ${WRKSRC}/doc --exclude '*Makefile*' -cf - . | \
 		${TAR} -C ${STAGEDIR}${DOCSDIR} --unlink -xf -
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGROUP} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>

===================


patch for part 2:
===================
Index: Makefile
===================================================================
--- Makefile	(revision 351530)
+++ Makefile	(working copy)
@@ -29,20 +29,13 @@
 
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=X11
+OPTIONS_SUB=	X11
 
+X11_USE=	XORG=x11
+X11_CONFIGURE_OFF=	--with-x=no
+
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MX11}
-USE_XORG=	x11
-PLIST_SUB+=	X11=""
-CONFLICTS+=	libwmf-nox11-0.*
-.else
-PKGNAMESUFFIX=	-nox11
-CONFIGURE_ARGS+=	--with-x=no
-PLIST_SUB+=	X11="@comment "
-CONFLICTS+=	libwmf-0.*
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|src include fonts doc|src include fonts|g' \
 		${WRKSRC}/Makefile.in
===================