From owner-svn-ports-head@freebsd.org Fri Oct 2 08:41:01 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E419CA0D88A; Fri, 2 Oct 2015 08:41:00 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (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 D2F8B1A2F; Fri, 2 Oct 2015 08:41:00 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t928f0hH086645; Fri, 2 Oct 2015 08:41:00 GMT (envelope-from madpilot@FreeBSD.org) Received: (from madpilot@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id t928ewCb086628; Fri, 2 Oct 2015 08:40:58 GMT (envelope-from madpilot@FreeBSD.org) Message-Id: <201510020840.t928ewCb086628@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: madpilot set sender to madpilot@FreeBSD.org using -f From: Guido Falsi Date: Fri, 2 Oct 2015 08:40:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r398425 - in head/x11/xscreensaver: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 02 Oct 2015 08:41:01 -0000 Author: madpilot Date: Fri Oct 2 08:40:57 2015 New Revision: 398425 URL: https://svnweb.freebsd.org/changeset/ports/398425 Log: - Update to 5.33 - Resolves the obnoxious startup message issue [1] - Add options NLS and XFT - Convert to USES=autoreconf - Don't install pam file when PAM option is disabled - Regenerate patches PR: 201254 Submitted by: Will B. Approved by: Maintainer timeout MFH: 2015Q4 [1] Modified: head/x11/xscreensaver/Makefile head/x11/xscreensaver/distinfo head/x11/xscreensaver/files/patch-config.h.in head/x11/xscreensaver/files/patch-configure.in head/x11/xscreensaver/files/patch-driver_Makefile.in head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in head/x11/xscreensaver/files/patch-hacks__config__sonar.xml head/x11/xscreensaver/files/patch-hacks_memscroller.c head/x11/xscreensaver/files/patch-utils_textclient.c head/x11/xscreensaver/pkg-plist Modified: head/x11/xscreensaver/Makefile ============================================================================== --- head/x11/xscreensaver/Makefile Fri Oct 2 08:15:47 2015 (r398424) +++ head/x11/xscreensaver/Makefile Fri Oct 2 08:40:57 2015 (r398425) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= xscreensaver -PORTVERSION= 5.29 -PORTREVISION= 4 +PORTVERSION= 5.33 CATEGORIES= x11 MASTER_SITES= http://www.jwz.org/xscreensaver/ @@ -14,12 +13,9 @@ RUN_DEPENDS= p5-libwww>0:${PORTSDIR}/www giftopnm:${PORTSDIR}/graphics/netpbm LIB_DEPENDS= libgle.so:${PORTSDIR}/graphics/gle -DESTDIRNAME= install_prefix - CONFLICTS= xscreensaver-gnome-[0-9]* xscreensaver-gnome-hacks-[0-9]* -USES= gettext gmake jpeg perl5 pkgconfig -USE_AUTOTOOLS= autoconf +USES= autoreconf gettext gmake jpeg perl5 pkgconfig USE_GL= yes USE_GNOME= gdkpixbuf2 gtk20 intltool libglade2 libxml2 USE_PERL5= run @@ -35,11 +31,12 @@ CONFIGURE_ARGS= --with-gtk --with-gl --w --with-dpms-ext --with-xinerama-ext --with-xf86vmode-ext \ --with-xf86gamma-ext --with-randr-ext --without-kerberos \ --without-setuid-hacks --enable-locking +MAKE_ARGS+= install_prefix=${STAGEDIR} CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -OPTIONS_DEFINE= PAM SETUID_HACKS FIREF XAOS1 XDALI XEARTH \ - XMOUN XPLANET XSNOW +OPTIONS_DEFINE= PAM SETUID_HACKS FIREF NLS XAOS1 XDALI XEARTH \ + XFT XMOUN XPLANET XSNOW OPTIONS_SUB= yes PAM_CONFIGURE_WITH= pam @@ -49,12 +46,18 @@ SETUID_HACKS_DESC= Install sonar hack s FIREF_DESC= Add extra port x11/fireflies FIREF_RUN_DEPENDS= ${LOCALBASE}/bin/xscreensaver-hacks/fireflies:${PORTSDIR}/x11/fireflies +NLS_USES= gettext-runtime +NLS_CONFIGURE_ENABLE= nls + XAOS1_DESC= Add extra port graphics/xaos XAOS1_RUN_DEPENDS= xaos:${PORTSDIR}/graphics/xaos XDALI_DESC= Add extra port x11-clocks/xdaliclock XDALI_RUN_DEPENDS= xdaliclock:${PORTSDIR}/x11-clocks/xdaliclock +XFT_CONFIGURE_WITH= xft +XFT_USE= XORG=xft + XEARTH_DESC= Add extra port astro/xearth XEARTH_RUN_DEPENDS= xearth:${PORTSDIR}/astro/xearth @@ -83,5 +86,6 @@ post-patch: post-install: ${INSTALL_DATA} ${FILESDIR}/x*.xml ${STAGEDIR}${DATADIR}/config/ ${INSTALL_DATA} ${WRKDIR}/*.desktop ${STAGEDIR}${PREFIX}/share/applications/ + ${RM} ${STAGEDIR}${PREFIX}/etc/pam.d/xscreensaver.pam .include Modified: head/x11/xscreensaver/distinfo ============================================================================== --- head/x11/xscreensaver/distinfo Fri Oct 2 08:15:47 2015 (r398424) +++ head/x11/xscreensaver/distinfo Fri Oct 2 08:40:57 2015 (r398425) @@ -1,2 +1,2 @@ -SHA256 (xscreensaver-5.29.tar.gz) = c418f5750696b578df6d4fd62c8260c018667653ece97f2bb90612046bf0f294 -SIZE (xscreensaver-5.29.tar.gz) = 8774562 +SHA256 (xscreensaver-5.33.tar.gz) = d4a0c1619219f2843fa8b68d4ae337ab0e9fcb79a6d231540adeb16b3d313f4d +SIZE (xscreensaver-5.33.tar.gz) = 10725482 Modified: head/x11/xscreensaver/files/patch-config.h.in ============================================================================== --- head/x11/xscreensaver/files/patch-config.h.in Fri Oct 2 08:15:47 2015 (r398424) +++ head/x11/xscreensaver/files/patch-config.h.in Fri Oct 2 08:40:57 2015 (r398425) @@ -1,6 +1,6 @@ ---- config.h.in.orig 2013-09-02 12:44:35.341733572 +0200 -+++ config.h.in 2013-09-02 12:45:05.396737361 +0200 -@@ -340,6 +340,9 @@ +--- config.h.in.orig 2014-10-08 18:09:49 UTC ++++ config.h.in +@@ -304,6 +304,9 @@ /* Define to 1 if you have the header file. */ #undef HAVE_UTIL_H Modified: head/x11/xscreensaver/files/patch-configure.in ============================================================================== --- head/x11/xscreensaver/files/patch-configure.in Fri Oct 2 08:15:47 2015 (r398424) +++ head/x11/xscreensaver/files/patch-configure.in Fri Oct 2 08:40:57 2015 (r398425) @@ -1,6 +1,6 @@ ---- configure.in.orig 2013-09-02 12:45:33.940731237 +0200 -+++ configure.in 2013-09-02 12:46:13.253728009 +0200 -@@ -3359,7 +3359,7 @@ +--- configure.in.orig 2014-10-08 18:09:41 UTC ++++ configure.in +@@ -3510,7 +3510,7 @@ fi ############################################################################### PTY_LIBS= Modified: head/x11/xscreensaver/files/patch-driver_Makefile.in ============================================================================== --- head/x11/xscreensaver/files/patch-driver_Makefile.in Fri Oct 2 08:15:47 2015 (r398424) +++ head/x11/xscreensaver/files/patch-driver_Makefile.in Fri Oct 2 08:40:57 2015 (r398425) @@ -1,6 +1,15 @@ ---- driver/Makefile.in.orig 2013-07-16 11:23:32.000000000 +0200 -+++ driver/Makefile.in 2013-09-02 11:56:16.862939343 +0200 -@@ -81,8 +81,8 @@ +--- driver/Makefile.in.orig 2015-06-25 18:58:54 UTC ++++ driver/Makefile.in +@@ -51,7 +51,7 @@ DEPEND_DEFINES = @DEPEND_DEFINES@ + + SHELL = /bin/sh + INSTALL = @INSTALL@ +-SUID_FLAGS = -o root -m 4755 ++SUID_FLAGS = -m 755 + INSTALL_PROGRAM = @INSTALL_PROGRAM@ + INSTALL_SCRIPT = @INSTALL_SCRIPT@ + INSTALL_SETUID = @INSTALL_SETUID@ +@@ -81,8 +81,8 @@ XPM_LIBS = @XPM_LIBS@ AD_DIR = @APPDEFAULTS@ @@ -11,7 +20,7 @@ UTILS_SRC = $(srcdir)/../utils UTILS_BIN = ../utils -@@ -207,7 +207,7 @@ +@@ -205,7 +205,7 @@ PDF2JPEG_LIBS = -framework Cocoa SAVER_LIBS = $(LIBS) $(X_LIBS) $(XMU_LIBS) @SAVER_LIBS@ \ $(XDPMS_LIBS) $(XINERAMA_LIBS) $(GL_LIBS) $(X_PRE_LIBS) \ -lXt -lX11 -lXext $(X_EXTRA_LIBS) \ Modified: head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in ============================================================================== --- head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in Fri Oct 2 08:15:47 2015 (r398424) +++ head/x11/xscreensaver/files/patch-driver_XScreenSaver.ad.in Fri Oct 2 08:40:57 2015 (r398425) @@ -1,15 +1,15 @@ ---- driver/XScreenSaver.ad.in.orig 2013-12-09 12:01:40.000000000 +0100 -+++ driver/XScreenSaver.ad.in 2013-12-17 19:34:28.222008084 +0100 +--- driver/XScreenSaver.ad.in.orig 2014-11-18 22:54:02 UTC ++++ driver/XScreenSaver.ad.in @@ -56,7 +56,7 @@ *splashDuration: 0:00:05 *visualID: default *captureStderr: True -*ignoreUninstalledPrograms: False +*ignoreUninstalledPrograms: True + *authWarningSlack: 20 *textMode: file - *textLiteral: XScreenSaver -@@ -122,7 +122,7 @@ +@@ -123,7 +123,7 @@ GetViewPortIsFullOfLies: False ! The format used for printing the date and time in the password dialog box ! (see the strftime(3) manual page for details.) @@ -18,7 +18,7 @@ ! To show the time only: ! *dateFormat: %I:%M %p ! For 24 hour time: -@@ -156,6 +156,18 @@ +@@ -157,6 +157,18 @@ GetViewPortIsFullOfLies: False ! screen savers interactively. ! *programs: \ @@ -37,15 +37,7 @@ maze -root \n\ @GL_KLUDGE@ GL: superquadrics -root \n\ attraction -root \n\ -@@ -251,7 +263,6 @@ - xspirograph -root \n\ - @GL_KLUDGE@ GL: circuit -root \n\ - @GL_KLUDGE@ GL: dangerball -root \n\ --- GL: dnalogo -root \n\ - @GL_KLUDGE@ GL: engine -root \n\ - @GL_KLUDGE@ GL: flipscreen3d -root \n\ - @GL_KLUDGE@ GL: gltext -root \n\ -@@ -449,7 +460,6 @@ +@@ -457,7 +469,6 @@ XScreenSaver.bourneShell: /bin/sh *hacks.cwaves.name: CWaves *hacks.dangerball.name: DangerBall *hacks.decayscreen.name: DecayScreen Modified: head/x11/xscreensaver/files/patch-hacks__config__sonar.xml ============================================================================== --- head/x11/xscreensaver/files/patch-hacks__config__sonar.xml Fri Oct 2 08:15:47 2015 (r398424) +++ head/x11/xscreensaver/files/patch-hacks__config__sonar.xml Fri Oct 2 08:40:57 2015 (r398425) @@ -1,6 +1,6 @@ ---- hacks/config/sonar.xml.orig 2013-12-04 23:42:00.000000000 +0100 -+++ hacks/config/sonar.xml 2013-12-09 12:29:34.301395635 +0100 -@@ -29,7 +29,7 @@ +--- hacks/config/sonar.xml.orig 2015-06-13 23:08:53 UTC ++++ hacks/config/sonar.xml +@@ -31,7 +31,7 @@