From owner-svn-ports-all@freebsd.org Sun Jul 24 09:00:55 2016 Return-Path: Delivered-To: svn-ports-all@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 F3DBEBA3A90; Sun, 24 Jul 2016 09:00:54 +0000 (UTC) (envelope-from amdmi3@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 A29B91F90; Sun, 24 Jul 2016 09:00:54 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u6O90r2S088202; Sun, 24 Jul 2016 09:00:53 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u6O90rQb088200; Sun, 24 Jul 2016 09:00:53 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201607240900.u6O90rQb088200@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Sun, 24 Jul 2016 09:00:53 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r418992 - head/x11/florence X-SVN-Group: ports-head 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.22 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, 24 Jul 2016 09:00:55 -0000 Author: amdmi3 Date: Sun Jul 24 09:00:53 2016 New Revision: 418992 URL: https://svnweb.freebsd.org/changeset/ports/418992 Log: - Fix license - Remove redundant --prefix argument to configure - Switch to options helpers Modified: head/x11/florence/Makefile head/x11/florence/pkg-descr Modified: head/x11/florence/Makefile ============================================================================== --- head/x11/florence/Makefile Sun Jul 24 08:46:18 2016 (r418991) +++ head/x11/florence/Makefile Sun Jul 24 09:00:53 2016 (r418992) @@ -9,8 +9,8 @@ MASTER_SITES= SF/florence/florence/${POR MAINTAINER= ports@FreeBSD.org COMMENT= Extensible scalable virtual keyboard -LICENSE= GPLv2 GFDL -LICENSE_COMB= dual +LICENSE= GPLv2+ GFDL +LICENSE_COMB= multi LIB_DEPENDS= libnotify.so:devel/libnotify @@ -19,13 +19,14 @@ USE_XORG= xtst xext USE_GNOME= gtk30 cairo intlhack gnomedocutils librsvg2 USE_GSTREAMER1= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--prefix="${LOCALBASE}" \ - --disable-static +CONFIGURE_ARGS= --disable-static USE_LDCONFIG= yes INSTALLS_OMF= yes GLIB_SCHEMAS= org.florence.gschema.xml INSTALL_TARGET= install-strip +MAKE_JOBS_UNSAFE= yes + PORTDOCS= AUTHORS ChangeLog NEWS README OPTIONS_DEFINE= DOCS NLS @@ -34,20 +35,15 @@ OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -MAKE_JOBS_UNSAFE= yes - -.include - post-patch: @${REINPLACE_CMD} -e 's|^Categories=.*|Categories=Application;Accessibility;System;|' \ ${WRKSRC}/data/florence.desktop.in.in -.if ! ${PORT_OPTIONS:MNLS} +post-patch-NLS-off: @${REINPLACE_CMD} -e 's|^ALL_LINGUAS.*|ALL_LINGUAS =|' \ ${WRKSRC}/po/Makefile.in.in -.endif -post-install: +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR} Modified: head/x11/florence/pkg-descr ============================================================================== --- head/x11/florence/pkg-descr Sun Jul 24 08:46:18 2016 (r418991) +++ head/x11/florence/pkg-descr Sun Jul 24 09:00:53 2016 (r418992) @@ -7,4 +7,4 @@ It appears on the screen only when you n There is an auto-click functionality To help people having difficulties to use the click button. -WWW: http://florence.sourceforge.net +WWW: http://florence.sourceforge.net/