From owner-svn-ports-head@FreeBSD.ORG Sun Dec 30 12:56:40 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id BC7E4248; Sun, 30 Dec 2012 12:56:40 +0000 (UTC) (envelope-from tota@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id A001A8FC08; Sun, 30 Dec 2012 12:56:40 +0000 (UTC) Received: from svn.freebsd.org (svn.FreeBSD.org [8.8.178.70]) by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBUCueWE004310; Sun, 30 Dec 2012 12:56:40 GMT (envelope-from tota@svn.freebsd.org) Received: (from tota@localhost) by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBUCuePp004308; Sun, 30 Dec 2012 12:56:40 GMT (envelope-from tota@svn.freebsd.org) Message-Id: <201212301256.qBUCuePp004308@svn.freebsd.org> From: TAKATSU Tomonari Date: Sun, 30 Dec 2012 12:56:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309666 - head/devel/diffuse 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.14 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: Sun, 30 Dec 2012 12:56:40 -0000 Author: tota Date: Sun Dec 30 12:56:39 2012 New Revision: 309666 URL: http://svnweb.freebsd.org/changeset/ports/309666 Log: - Trim Makefile header - Limit python version up to 2.7 - Use a space character instead of a tab in 'pkg-descr' file - Define PORTDOCS unconditionally (regardless of DOCS option) - Remove 'COPYING' from PORTDOCS (redundant with LICENSE) - Remove NO_OPTIONS_SORT (does not matter with only four options) - Remove DOCS_DESC and use standard description - Convert 'for' loops from shell to make syntax - Resort and whitespace cleanup - Bump PORTREVISION PR: ports/174806 (based on) Submitted by: Marco Broder (maintainer) Modified: head/devel/diffuse/Makefile head/devel/diffuse/pkg-descr Modified: head/devel/diffuse/Makefile ============================================================================== --- head/devel/diffuse/Makefile Sun Dec 30 12:47:48 2012 (r309665) +++ head/devel/diffuse/Makefile Sun Dec 30 12:56:39 2012 (r309666) @@ -1,13 +1,9 @@ -# Ports collection makefile for: diffuse -# Date created: 2009-02-22 -# Whom: Marco Broeder -# +# Created by: Marco Broeder # $FreeBSD$ -# PORTNAME= diffuse PORTVERSION= 0.4.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= devel python MASTER_SITES= SF @@ -19,20 +15,21 @@ LICENSE_COMB= dual NO_BUILD= yes -USE_PYTHON= yes -USE_GNOME= pygtk2 USE_BZIP2= yes - -MAN1= diffuse.1 +USE_PYTHON= -2.7 +USE_GNOME= pygtk2 CONFLICTS= tinker-[0-9]* -NO_OPTIONS_SORT= yes -OPTIONS_DEFINE= MENU DATA NLS DOCS -MENU_DESC= Enable a desktop program menu entry +MAN1= diffuse.1 +PORTDOCS= AUTHORS ChangeLog ChangeLog_ru README README_ru +PORTDATA= syntax + +OPTIONS_DEFINE= DATA DOCS MENU NLS DATA_DESC= Enable syntax highlighting support -DOCS_DESC= Install some documentation text files -OPTIONS_DEFAULT= MENU DATA NLS DOCS +MENU_DESC= Enable a desktop program menu entry + +OPTIONS_DEFAULT= DATA MENU .include @@ -43,13 +40,7 @@ PLIST_SUB+= MENU="" PLIST_SUB+= MENU="@comment " .endif -.if ${PORT_OPTIONS:MDATA} -PORTDATA= syntax -.endif - -.if ${PORT_OPTIONS:MNLS} && !defined(WITHOUT_NLS) -# Both checks required. If option is selected, but WITHOUT_NLS is set -# in make.conf, it breaks pkg-plist. +.if ${PORT_OPTIONS:MNLS} USE_GETTEXT= yes TRANSLATIONS= de es it ja ko ru zh_CN MANLANG= "" it ru @@ -58,12 +49,8 @@ PLIST_SUB+= NLS="" PLIST_SUB+= NLS="@comment " .endif -.if ${PORT_OPTIONS:MDOCS} -PORTDOCS= AUTHORS COPYING ChangeLog ChangeLog_ru README README_ru -.endif - post-patch: -.if ${PORT_OPTIONS:MDATA} && !defined(NOPORTDATA) +.if ${PORT_OPTIONS:MDATA} ${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \ ${WRKSRC}/src/etc/${PORTNAME}rc .else @@ -71,18 +58,25 @@ post-patch: import ${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \ ${WRKSRC}/src/etc/${PORTNAME}rc .endif - ${REINPLACE_CMD} -e 's|../../etc|${PREFIX}/etc|g' \ ${WRKSRC}/src/usr/bin/${PORTNAME} do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} \ - ${PREFIX}/bin/ + ${INSTALL_SCRIPT} ${WRKSRC}/src/usr/bin/${PORTNAME} ${PREFIX}/bin/ ${INSTALL_DATA} ${WRKSRC}/src/etc/${PORTNAME}rc ${PREFIX}/etc/ ${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \ ${MANPREFIX}/man/man1/ post-install: +.if ${PORT_OPTIONS:MDATA} + ${MKDIR} ${DATADIR}/${PORTDATA} + (cd ${WRKSRC}/src/usr/share/${PORTNAME} && \ + ${COPYTREE_SHARE} \* ${DATADIR}) +.endif +.if ${PORT_OPTIONS:MDOCS} + ${MKDIR} ${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} +.endif .if ${PORT_OPTIONS:MMENU} ${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \ ${PREFIX}/share/pixmaps/ @@ -90,31 +84,19 @@ post-install: ${DESKTOPDIR} ${LOCALBASE}/bin/update-desktop-database -q .endif - -.if ${PORT_OPTIONS:MDATA} && !defined(NOPORTDATA) - ${MKDIR} ${DATADIR}/syntax - (cd ${WRKSRC}/src/usr/share/${PORTNAME} && \ - ${COPYTREE_SHARE} \* ${DATADIR}) -.endif - -.if ${PORT_OPTIONS:MNLS} && !defined(WITHOUT_NLS) - for x in ${TRANSLATIONS}; do \ - ${MKDIR} ${WRKSRC}/translations/$${x}; \ - ${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/$${x}.po \ - -o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \ - ${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \ - ${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \ - done - for y in ${MANLANG}; do \ - ${MKDIR} ${MANPREFIX}/man/$${y}/man1; \ - ${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/$${y}/man1/*.1 \ - ${MANPREFIX}/man/$${y}/man1/; \ - done -.endif - -.if ${PORT_OPTIONS:MDOCS} && !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR} +.if ${PORT_OPTIONS:MNLS} +.for x in ${TRANSLATIONS} + ${MKDIR} ${WRKSRC}/translations/${x} + ${LOCALBASE}/bin/msgfmt -c ${WRKSRC}/translations/${x}.po \ + -o ${WRKSRC}/translations/${x}/${PORTNAME}.mo + ${INSTALL_DATA} ${WRKSRC}/translations/${x}/*.mo \ + ${PREFIX}/share/locale/${x}/LC_MESSAGES/ +.endfor +.for y in ${MANLANG} + ${MKDIR} ${MANPREFIX}/man/${y}/man1 + ${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/${y}/man1/*.1 \ + ${MANPREFIX}/man/${y}/man1/ +.endfor .endif .include Modified: head/devel/diffuse/pkg-descr ============================================================================== --- head/devel/diffuse/pkg-descr Sun Dec 30 12:47:48 2012 (r309665) +++ head/devel/diffuse/pkg-descr Sun Dec 30 12:56:39 2012 (r309666) @@ -16,4 +16,4 @@ Some key features of Diffuse: - unlimited undo - easy keyboard navigation -WWW: http://diffuse.sourceforge.net/ +WWW: http://diffuse.sourceforge.net/