From owner-svn-ports-head@freebsd.org Mon Jan 2 15:10:18 2017 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 671FAC9B517; Mon, 2 Jan 2017 15:10:18 +0000 (UTC) (envelope-from olivier@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 mx1.freebsd.org (Postfix) with ESMTPS id 41C2E1558; Mon, 2 Jan 2017 15:10:18 +0000 (UTC) (envelope-from olivier@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v02FAHsE044441; Mon, 2 Jan 2017 15:10:17 GMT (envelope-from olivier@FreeBSD.org) Received: (from olivier@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v02FAHJO044436; Mon, 2 Jan 2017 15:10:17 GMT (envelope-from olivier@FreeBSD.org) Message-Id: <201701021510.v02FAHJO044436@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: olivier set sender to olivier@FreeBSD.org using -f From: Olivier Cochard Date: Mon, 2 Jan 2017 15:10:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r430367 - in head/x11/deforaos-locker: . 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.23 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: Mon, 02 Jan 2017 15:10:18 -0000 Author: olivier Date: Mon Jan 2 15:10:16 2017 New Revision: 430367 URL: https://svnweb.freebsd.org/changeset/ports/430367 Log: Update to 0.4.0 Approved by: jadawin (mentor) Differential Revision: https://reviews.freebsd.org/D8997 Added: head/x11/deforaos-locker/files/patch-doc_Makefile (contents, props changed) head/x11/deforaos-locker/files/patch-src_Makefile (contents, props changed) Deleted: head/x11/deforaos-locker/files/patch-doc__Makefile head/x11/deforaos-locker/files/patch-locker.c.diff Modified: head/x11/deforaos-locker/Makefile head/x11/deforaos-locker/distinfo head/x11/deforaos-locker/pkg-plist Modified: head/x11/deforaos-locker/Makefile ============================================================================== --- head/x11/deforaos-locker/Makefile Mon Jan 2 15:10:16 2017 (r430366) +++ head/x11/deforaos-locker/Makefile Mon Jan 2 15:10:16 2017 (r430367) @@ -2,10 +2,9 @@ # $FreeBSD$ PORTNAME= locker -PORTVERSION= 0.2.1 -PORTREVISION= 2 +PORTVERSION= 0.4.0 CATEGORIES= x11 -MASTER_SITES= http://www.defora.org/os/download/download/3703/ +MASTER_SITES= http://www.defora.org/os/download/download/4424/ PKGNAMEPREFIX= deforaos- DISTNAME= Locker-${PORTVERSION} @@ -13,20 +12,47 @@ MAINTAINER= olivier@FreeBSD.org COMMENT= DeforaOS desktop screensaver LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING -DEPRECATED= Depends on broken and expiring x11/deforaos-panel -EXPIRATION_DATE= 2016-11-01 - -LIB_DEPENDS= libSystem.so:devel/deforaos-libsystem \ - libDesktop.so:x11/deforaos-libdesktop \ - libXss.so:x11/libXScrnSaver -BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel \ - xsltproc:textproc/libxslt \ - ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl - -USE_GNOME= gtk20 -USES= desktop-file-utils gettext pkgconfig +LIB_DEPENDS= libDesktop.so:x11/deforaos-libdesktop \ + libSystem.so:devel/deforaos-libsystem \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libXss.so:x11/libXScrnSaver + +BUILD_DEPENDS= ${LOCALBASE}/libdata/pkgconfig/Panel.pc:x11/deforaos-panel + +USE_GNOME= gtk20 cairo gdkpixbuf2 +USE_XORG= x11 xext +USES= desktop-file-utils pkgconfig MAKE_ARGS+= PREFIX=${PREFIX} MAKE_ENV+= MANDIR=${STAGEDIR}${MANPREFIX}/man +LDFLAGS+= -lXext + +OPTIONS_DEFINE= DOCS NLS +OPTIONS_SUB= yes +NLS_USES= gettext +DOCS_BUILD_DEPENDS= xsltproc:textproc/libxslt \ + ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl + +post-patch: + ${REINPLACE_CMD} 's|-Wl,-pie||g' \ + ${WRKSRC}/tests/Makefile \ + ${WRKSRC}/tools/Makefile \ + ${WRKSRC}/src/Makefile + +post-patch-DOCS-off: + ${REINPLACE_CMD} 's|data doc include|data include|' \ + ${WRKSRC}/Makefile + +post-patch-NLS-off: + ${REINPLACE_CMD} 's|include po src|include src|' \ + ${WRKSRC}/Makefile + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* \ + ${STAGEDIR}${PREFIX}/lib/Locker/auth/* \ + ${STAGEDIR}${PREFIX}/lib/Locker/plugins/* \ + ${STAGEDIR}${PREFIX}/lib/Locker/demos/* .include Modified: head/x11/deforaos-locker/distinfo ============================================================================== --- head/x11/deforaos-locker/distinfo Mon Jan 2 15:10:16 2017 (r430366) +++ head/x11/deforaos-locker/distinfo Mon Jan 2 15:10:16 2017 (r430367) @@ -1,2 +1,3 @@ -SHA256 (Locker-0.2.1.tar.gz) = 6df132143b9efea2af85ce64dde3f8a8fb40bc041eedf441257c6f66a5e5e4a3 -SIZE (Locker-0.2.1.tar.gz) = 49812 +TIMESTAMP = 1483369725 +SHA256 (Locker-0.4.0.tar.gz) = 286aec05034add8b364a33ddc5fed72de7e7aca00d64d1ec686bb628e9e6f3b3 +SIZE (Locker-0.4.0.tar.gz) = 62105 Added: head/x11/deforaos-locker/files/patch-doc_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/deforaos-locker/files/patch-doc_Makefile Mon Jan 2 15:10:16 2017 (r430367) @@ -0,0 +1,34 @@ +--- doc/Makefile.orig 2016-02-20 13:12:47 UTC ++++ doc/Makefile +@@ -1,4 +1,4 @@ +-TARGETS = $(OBJDIR)index.html $(OBJDIR)locker.1 $(OBJDIR)locker.html $(OBJDIR)lockerctl.1 $(OBJDIR)lockerctl.html ++TARGETS = $(OBJDIR)locker.1 $(OBJDIR)lockerctl.1 + OBJDIR = + PREFIX = /usr/local + DESTDIR = +@@ -27,25 +27,18 @@ $(OBJDIR)lockerctl.html: lockerctl.css.x + + clean: + $(RM) -- $(index.html_OBJS) $(locker.1_OBJS) $(locker.html_OBJS) $(lockerctl.1_OBJS) $(lockerctl.html_OBJS) +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)index.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)locker.html" + ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.1" +- ./docbook.sh -c -P "$(PREFIX)" -- "$(OBJDIR)lockerctl.html" + + distclean: clean + $(RM) -- $(TARGETS) + + install: $(TARGETS) + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)locker.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -i -- "$(OBJDIR)lockerctl.html" + + uninstall: + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "locker.html" + ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.1" +- ./docbook.sh -P "$(DESTDIR)$(PREFIX)" -u -- "lockerctl.html" + + .PHONY: all clean distclean install uninstall Added: head/x11/deforaos-locker/files/patch-src_Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/x11/deforaos-locker/files/patch-src_Makefile Mon Jan 2 15:10:16 2017 (r430367) @@ -0,0 +1,11 @@ +--- src/Makefile.orig 2016-02-20 13:12:47 UTC ++++ src/Makefile +@@ -30,7 +30,7 @@ subdirs: + + locker_OBJS = $(OBJDIR)locker.o $(OBJDIR)main.o + locker_CFLAGS = $(CPPFLAGSF) $(CPPFLAGS) $(CFLAGSF) $(CFLAGS) `pkg-config --cflags x11 xscrnsaver` +-locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) `pkg-config --libs x11 xscrnsaver` ++locker_LDFLAGS = $(LDFLAGSF) $(LDFLAGS) -lXext `pkg-config --libs x11 xscrnsaver` + + $(OBJDIR)locker$(EXEEXT): $(locker_OBJS) + $(CC) -o $(OBJDIR)locker$(EXEEXT) $(locker_OBJS) $(locker_LDFLAGS) Modified: head/x11/deforaos-locker/pkg-plist ============================================================================== --- head/x11/deforaos-locker/pkg-plist Mon Jan 2 15:10:16 2017 (r430366) +++ head/x11/deforaos-locker/pkg-plist Mon Jan 2 15:10:16 2017 (r430367) @@ -7,15 +7,16 @@ include/Desktop/Locker/locker.h include/Desktop/Locker/plugin.h lib/Locker/auth/password.so lib/Locker/auth/slider.so +lib/Locker/demos/colors.so lib/Locker/demos/gtk-demo.so lib/Locker/demos/logo.so lib/Locker/demos/xscreensaver.so lib/Locker/demos/xterm.so lib/Locker/plugins/openmoko.so -lib/Locker/plugins/panel.so lib/Locker/plugins/suspend.so lib/Locker/plugins/systray.so -man/man1/locker.1.gz -man/man1/lockerctl.1.gz -share/applications/locker-settings.desktop -share/locale/fr/LC_MESSAGES/Locker.mo +%%PORTDOCS%%man/man1/locker.1.gz +%%PORTDOCS%%man/man1/lockerctl.1.gz +share/applications/deforaos-locker-settings.desktop +%%NLS%%share/locale/fr/LC_MESSAGES/Locker.mo +%%NLS%%share/locale/es/LC_MESSAGES/Locker.mo