[patch] graphics/libwmf - fix stage as non-root & use OPTIONS helpers

John Hein john.hein at microsemi.com
Sat Apr 19 05:14:53 UTC 2014


>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
===================


More information about the freebsd-ports mailing list