From owner-svn-ports-head@freebsd.org Mon Dec 18 13:15:37 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 D0A2EE890BD; Mon, 18 Dec 2017 13:15:37 +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 AA9EB79F61; Mon, 18 Dec 2017 13:15:37 +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 vBIDFa4J006171; Mon, 18 Dec 2017 13:15:36 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id vBIDFavM006169; Mon, 18 Dec 2017 13:15:36 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201712181315.vBIDFavM006169@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Mon, 18 Dec 2017 13:15:36 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r456632 - head/deskutils/rubrica X-SVN-Group: ports-head X-SVN-Commit-Author: amdmi3 X-SVN-Commit-Paths: head/deskutils/rubrica X-SVN-Commit-Revision: 456632 X-SVN-Commit-Repository: ports 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.25 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, 18 Dec 2017 13:15:37 -0000 Author: amdmi3 Date: Mon Dec 18 13:15:36 2017 New Revision: 456632 URL: https://svnweb.freebsd.org/changeset/ports/456632 Log: - Add LICENSE_FILE - Switch to USES=localbase - Simplify installation - Switch to options helpers - Fix plist for disabled NLS case Modified: head/deskutils/rubrica/Makefile head/deskutils/rubrica/pkg-plist Modified: head/deskutils/rubrica/Makefile ============================================================================== --- head/deskutils/rubrica/Makefile Mon Dec 18 13:10:14 2017 (r456631) +++ head/deskutils/rubrica/Makefile Mon Dec 18 13:15:36 2017 (r456632) @@ -11,11 +11,12 @@ MAINTAINER= ports@FreeBSD.org COMMENT= Addressbook for the GNOME 2 desktop LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libnotify.so:devel/libnotify RUN_DEPENDS= gnome-icon-theme>=0:misc/gnome-icon-theme -USES= desktop-file-utils gmake libtool pathfix pkgconfig tar:bzip2 +USES= desktop-file-utils gmake libtool localbase pathfix pkgconfig tar:bzip2 GNU_CONFIGURE= yes USE_GNOME= gconf2 gnomeprefix libglade2 intltool USE_LDCONFIG= yes @@ -23,29 +24,16 @@ MAKE_ENV= INSTALL_STRIP_FLAG=${STRIP} GCONF_SCHEMAS= rubrica2.schemas -CPPFLAGS+= -I${LOCALBASE}/include -LDFLAGS+= -L${LOCALBASE}/lib -LIBS+= `pkg-config` LIBS+= -lm -lgthread-2.0 PORTDOCS= * -DOCSRCDIR1= ${WRKSRC} -DOC_FILES1= CREDITS ChangeLog - -DOCSRCDIR2= ${WRKSRC}/doc/reference/html -DOCSDIR2= ${DOCSDIR}/doc/libRAL -DOC_FILES2= *.* - OPTIONS_DEFINE= DOCS NLS - OPTIONS_SUB= yes NLS_CONFIGURE_ENABLE= nls NLS_USES= gettext -.include - post-patch: @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \ 's|-Wall -g|-Wall|g ; \ @@ -54,20 +42,20 @@ post-patch: @${REINPLACE_CMD} -e 's|_Modifica|_Edit|' \ -e 's|A_iuto|_Help|' \ ${WRKSRC}/interface/MainWindow.glade - ${REINPLACE_CMD} -e \ + @${REINPLACE_CMD} -e \ 's|^Categories=.*|Categories=GNOME;Application;Office;System;Utility;|' \ ${WRKSRC}/rubrica2.desktop.in -.if ! ${PORT_OPTIONS:MNLS} +post-patch-NLS-off: @${REINPLACE_CMD} -e '/^SUBDIRS/s|po||g' ${WRKSRC}/Makefile.in -.endif post-install: @${LN} -sf ${LOCALBASE}/share/icons/gnome \ ${STAGEDIR}${PREFIX}/share/pixmaps/rubrica2/22x22/hicolor - @${MKDIR} ${STAGEDIR}${DOCSDIR2} - ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} +post-install-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/CREDITS ${WRKSRC}/ChangeLog ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc/reference/html && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}/libRAL-reference .include Modified: head/deskutils/rubrica/pkg-plist ============================================================================== --- head/deskutils/rubrica/pkg-plist Mon Dec 18 13:10:14 2017 (r456631) +++ head/deskutils/rubrica/pkg-plist Mon Dec 18 13:15:36 2017 (r456632) @@ -46,11 +46,11 @@ lib/libral/plugins/libvcard.so.1 lib/libral/plugins/libvcard.so.1.0.1 libdata/pkgconfig/libral.pc share/applications/rubrica2.desktop -share/locale/de/LC_MESSAGES/rubrica2.mo -share/locale/fr/LC_MESSAGES/rubrica2.mo -share/locale/it/LC_MESSAGES/rubrica2.mo -share/locale/ru/LC_MESSAGES/rubrica2.mo -share/locale/uk/LC_MESSAGES/rubrica2.mo +%%NLS%%share/locale/de/LC_MESSAGES/rubrica2.mo +%%NLS%%share/locale/fr/LC_MESSAGES/rubrica2.mo +%%NLS%%share/locale/it/LC_MESSAGES/rubrica2.mo +%%NLS%%share/locale/ru/LC_MESSAGES/rubrica2.mo +%%NLS%%share/locale/uk/LC_MESSAGES/rubrica2.mo share/mime-info/rubrica2.keys share/mime-info/rubrica2.mime share/pixmaps/rubrica2/16x16/ccare.png