Date: Sun, 17 Jun 2018 12:09:06 +0200 From: Tobias Kortkamp <tobik@FreeBSD.org> To: Niclas Zeising <zeising@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r472599 - head/x11/xscreensaver Message-ID: <1529230146.1744976.1410681288.6303149E@webmail.messagingengine.com> In-Reply-To: <201806170916.w5H9GtB0072998@repo.freebsd.org> References: <201806170916.w5H9GtB0072998@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Jun 17, 2018, at 11:16, Niclas Zeising wrote: > Author: zeising > Date: Sun Jun 17 09:16:55 2018 > New Revision: 472599 > URL: https://svnweb.freebsd.org/changeset/ports/472599 > > Log: > x11/xscreensaver: Add NSFW option > > Add NSFW option that, when enabled, enables some NSFW wording in the BSOD > screensaver, in the ransomware picture. > > Submitted by: jonathan > Differential Revision: https://reviews.freebsd.org/D15762 > > Modified: > head/x11/xscreensaver/Makefile > > Modified: head/x11/xscreensaver/Makefile > ============================================================================== > --- head/x11/xscreensaver/Makefile Sun Jun 17 09:12:50 2018 (r472598) > +++ head/x11/xscreensaver/Makefile Sun Jun 17 09:16:55 2018 (r472599) > @@ -3,6 +3,7 @@ > > PORTNAME= xscreensaver > PORTVERSION= 5.39 > +PORTREVISION= 1 > CATEGORIES= x11 > MASTER_SITES= http://www.jwz.org/xscreensaver/ > > @@ -39,7 +40,7 @@ CONFIGURE_ARGS= --with-gtk --with-gl --with-gle --with > --without-setuid-hacks --enable-locking > MAKE_ARGS+= install_prefix=${STAGEDIR} > > -OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS XAOS1 XDALI XEARTH \ > +OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS NSFW XAOS1 XDALI XEARTH \ > XFT XMOUN XPLANET XSNOW > OPTIONS_DEFAULT=XFT > OPTIONS_SUB= yes > @@ -54,6 +55,8 @@ FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hack > NLS_USES= gettext-runtime > NLS_CONFIGURE_ENABLE= nls > > +NSFW_DESC= Include material that is Not Safe For Work > + > XAOS1_DESC= Add extra port graphics/xaos > XAOS1_RUN_DEPENDS= xaos:graphics/xaos > > @@ -79,6 +82,10 @@ SUB_FILES= xscreensaver-blank.desktop xscreensaver-loc > xscreensaver-start.desktop xscreensaver-stop.desktop > > post-patch: > +.if empty(PORT_OPTIONS:NSFW) > + ${REINPLACE_CMD} -e 's|Dick Pix|Stuff|' ${WRKSRC}/hacks/bsod.c > + ${REINPLACE_CMD} -e 's|dick pics|data, etc.|' ${WRKSRC}/hacks/bsod.c > +.endif This cannot work as intended. PORT_OPTIONS isn't available because bsd.port.options.mk wasn't included before. Even if it were the condition is always false. It should be empty(PORT_OPTIONS:MNSFW) or similar. But it's best to just use an options helper target `post-patch-NSFW-off:` for this. > ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ > -e 's|pkg_config --list-all|pkg_config --help|' \ > ${WRKSRC}/configure.in >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?1529230146.1744976.1410681288.6303149E>