ports/174806: commit references a PR
dfilter service
dfilter at FreeBSD.ORG
Sun Dec 30 13:00:01 UTC 2012
The following reply was made to PR ports/174806; it has been noted by GNATS.
From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:
Subject: Re: ports/174806: commit references a PR
Date: Sun, 30 Dec 2012 12:56:53 +0000 (UTC)
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 <marco.broeder at gmx.eu> (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 <marco.broeder at gmx.eu>
-#
+# Created by: Marco Broeder <marco.broeder at gmx.eu>
# $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 <bsd.port.options.mk>
@@ -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 <bsd.port.mk>
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/
_______________________________________________
svn-ports-all at freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe at freebsd.org"
More information about the freebsd-ports-bugs
mailing list