From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 19 05:20:01 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 DF2A4A0D for ; Sat, 19 Apr 2014 05:20: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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id B9E941BE2 for ; Sat, 19 Apr 2014 05:20:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s3J5K0uG056403 for ; Sat, 19 Apr 2014 05:20:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s3J5K0cr056392; Sat, 19 Apr 2014 05:20:00 GMT (envelope-from gnats) Resent-Date: Sat, 19 Apr 2014 05:20:00 GMT Resent-Message-Id: <201404190520.s3J5K0cr056392@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, John Hein 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) Message-Id: <201404190514.s3J5EisF064573@gromit.timing.com> Date: Fri, 18 Apr 2014 23:14:44 -0600 (MDT) From: John Hein To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/188785: [patch] graphics/libwmf - fix stage as non-root & use OPTIONS helpers Cc: ports@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: John Hein List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 19 Apr 2014 05:20:01 -0000 >Number: 188785 >Category: ports >Synopsis: [patch] graphics/libwmf - fix stage as non-root & use OPTIONS helpers >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 19 05:20:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: John Hein >Release: >Organization: >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 =================== 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 -.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 =================== >Release-Note: >Audit-Trail: >Unformatted: