From owner-svn-ports-all@freebsd.org Sun Jun 17 11:27:21 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 29835101ABFF; Sun, 17 Jun 2018 11:27:21 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id C95696A8D1; Sun, 17 Jun 2018 11:27:20 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A1FA814B3F; Sun, 17 Jun 2018 11:27:20 +0000 (UTC) (envelope-from zeising@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w5HBRK0Y038453; Sun, 17 Jun 2018 11:27:20 GMT (envelope-from zeising@FreeBSD.org) Received: (from zeising@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w5HBRKaH038452; Sun, 17 Jun 2018 11:27:20 GMT (envelope-from zeising@FreeBSD.org) Message-Id: <201806171127.w5HBRKaH038452@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: zeising set sender to zeising@FreeBSD.org using -f From: Niclas Zeising Date: Sun, 17 Jun 2018 11:27:20 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472601 - head/x11/xscreensaver X-SVN-Group: ports-head X-SVN-Commit-Author: zeising X-SVN-Commit-Paths: head/x11/xscreensaver X-SVN-Commit-Revision: 472601 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.26 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 Jun 2018 11:27:21 -0000 Author: zeising Date: Sun Jun 17 11:27:20 2018 New Revision: 472601 URL: https://svnweb.freebsd.org/changeset/ports/472601 Log: x11/xscreensaver: Fix NSFW option Fix the NSFW option to actually work. I don't know what I was thinking in the previous commit. Reported by: tobik Modified: head/x11/xscreensaver/Makefile Modified: head/x11/xscreensaver/Makefile ============================================================================== --- head/x11/xscreensaver/Makefile Sun Jun 17 09:34:34 2018 (r472600) +++ head/x11/xscreensaver/Makefile Sun Jun 17 11:27:20 2018 (r472601) @@ -3,7 +3,7 @@ PORTNAME= xscreensaver PORTVERSION= 5.39 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -82,10 +82,6 @@ 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 ${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \ -e 's|pkg_config --list-all|pkg_config --help|' \ ${WRKSRC}/configure.in @@ -94,6 +90,10 @@ post-patch: ${WRKSRC}/driver/xscreensaver.man ${CP} ${FILESDIR}/xscreensaver.pam \ ${WRKSRC}/driver/xscreensaver.pam.in + +post-patch-NSFW-off: + ${REINPLACE_CMD} -e 's|Dick Pix|Stuff|' ${WRKSRC}/hacks/bsod.c + ${REINPLACE_CMD} -e 's|dick pics|data, etc.|' ${WRKSRC}/hacks/bsod.c post-install: ${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/