Date: Wed, 14 Oct 2009 22:24:28 -0300 (BRT) From: Sylvio Cesar <scjamorim@bsd.com.br> To: FreeBSD-gnats-submit@FreeBSD.org Cc: marco.broeder@gmx.eu Subject: ports/139626: [PATCH] devel/diffuse: update to 0.4.1 Message-ID: <20091015012428.4D0D33F416D@fbsd.scjamorim.org> Resent-Message-ID: <200910150130.n9F1U2Ek046111@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 139626
>Category: ports
>Synopsis: [PATCH] devel/diffuse: update to 0.4.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 15 01:30:02 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Sylvio Cesar
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD fbsd.scjamorim.org 9.0-CURRENT FreeBSD 9.0-CURRENT #0: Sat Oct 10 21:33:17 BRT 2009
>Description:
- Update to 0.4.1
- Added INSTALLS_OMF to Makefile
- Changed form how install docs
- Replace of "ifdef" to "if defined"
- Compact form how to use command "REINPLACE"
- Changed pkg-plist
Port maintainer (marco.broeder@gmx.eu) is cc'd.
Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
--- diffuse-0.4.1.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/diffuse/Makefile,v
retrieving revision 1.6
diff -u -u -r1.6 Makefile
--- Makefile 1 Sep 2009 00:07:48 -0000 1.6
+++ Makefile 15 Oct 2009 01:20:58 -0000
@@ -6,8 +6,7 @@
#
PORTNAME= diffuse
-PORTVERSION= 0.4.0
-PORTREVISION= 1
+PORTVERSION= 0.4.1
CATEGORIES= devel python
MASTER_SITES= SF
@@ -19,20 +18,17 @@
USE_PYTHON= yes
USE_GNOME= pygtk2
USE_BZIP2= yes
+INSTALLS_OMF= yes
MAN1= diffuse.1
+PORTDOCS= AUTHORS COPYING ChangeLog README
+
OPTIONS= MENU "Add desktop menu (needs desktop-file-utils)" on \
OMF "Install OMF manual (needs scrollkeeper)" on \
NLS "Install some translations (work in progress)" on
-.include <bsd.port.options.mk>
-
-.ifndef (NOPORTDOCS)
-DOCS= AUTHORS COPYING ChangeLog README
-.endif
-
-.ifdef (WITH_MENU)
+.if defined(WITH_MENU)
PLIST_SUB+= MENU=""
RUN_DEPENDS+= update-desktop-database:${PORTSDIR}/devel/desktop-file-utils
INSTALLS_ICONS= yes
@@ -40,7 +36,7 @@
PLIST_SUB+= MENU="@comment "
.endif
-.ifdef (WITH_OMF)
+.if defined(WITH_OMF)
PLIST_SUB+= OMF=""
RUN_DEPENDS+= scrollkeeper-update:${PORTSDIR}/textproc/scrollkeeper
INSTALLS_OMF= yes
@@ -48,18 +44,17 @@
PLIST_SUB+= OMF="@comment "
.endif
-.ifndef (WITHOUT_NLS)
-PLIST_SUB+= NLS=""
+.if !defined(WITHOUT_NLS)
+CONFIGURE_ARGS+= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.else
USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
TRANSLATIONS= de
-.else
-PLIST_SUB+= NLS="@comment "
.endif
post-patch:
- ${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g' \
- ${WRKSRC}/src/etc/${PORTNAME}rc
- ${REINPLACE_CMD} -e 's|/etc|${PREFIX}/etc|g' \
+ ${REINPLACE_CMD} -e 's|../usr|${PREFIX}|g; s|/etc|${PREFIX}/etc|g' \
${WRKSRC}/src/etc/${PORTNAME}rc
${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}/share|g' \
${WRKSRC}/src/usr/share/omf/${PORTNAME}/${PORTNAME}-C.omf
@@ -76,25 +71,14 @@
${INSTALL_MAN} ${WRKSRC}/src/usr/share/man/man1/*.1 \
${MANPREFIX}/man/man1/
-.ifndef (NOPORTDOCS)
+.if !defined(NOPORTDOCS)
${MKDIR} ${DOCSDIR}
- for n in ${DOCS}; do \
- ${INSTALL_MAN} ${WRKSRC}/$${n} ${DOCSDIR}; \
- done
-.endif
-
-.ifndef (WITHOUT_NLS)
- for x in ${TRANSLATIONS}; do \
- ${MKDIR} ${PREFIX}/share/locale/$${x}/LC_MESSAGES; \
- ${MKDIR} ${WRKSRC}/translations/$${x}; \
- ${PREFIX}/bin/msgfmt -c -v ${WRKSRC}/translations/$${x}.po \
- -o ${WRKSRC}/translations/$${x}/${PORTNAME}.mo; \
- ${INSTALL_DATA} ${WRKSRC}/translations/$${x}/*.mo \
- ${PREFIX}/share/locale/$${x}/LC_MESSAGES/; \
- done
+.for docs in ${PORTDOCS}
+ ${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+.endfor
.endif
-.ifdef (WITH_OMF)
+.if defined(WITH_OMF)
${MKDIR} ${PREFIX}/share/gnome/help/${PORTNAME}/C
${INSTALL_DATA} ${WRKSRC}/src/usr/share/gnome/help/${PORTNAME}/C/*.xml \
${PREFIX}/share/gnome/help/${PORTNAME}/C/
@@ -104,7 +88,7 @@
${PREFIX}/bin/scrollkeeper-update -q
.endif
-.ifdef (WITH_MENU)
+.if defined(WITH_MENU)
${MKDIR} ${PREFIX}/share/pixmaps
${INSTALL_DATA} ${WRKSRC}/src/usr/share/pixmaps/${PORTNAME}.png \
${PREFIX}/share/pixmaps/
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/devel/diffuse/distinfo,v
retrieving revision 1.4
diff -u -u -r1.4 distinfo
--- distinfo 17 Aug 2009 19:55:27 -0000 1.4
+++ distinfo 15 Oct 2009 01:20:58 -0000
@@ -1,3 +1,3 @@
-MD5 (diffuse-0.4.0.tar.bz2) = 75a72e0853f67024bac927737731411e
-SHA256 (diffuse-0.4.0.tar.bz2) = f7fcf0aa23d323104aa938a1d98f7960ee3031e48af598cac72c370eefb24952
-SIZE (diffuse-0.4.0.tar.bz2) = 109438
+MD5 (diffuse-0.4.1.tar.bz2) = dbdfc4f3ed50e66e2151dc6e2fa3e345
+SHA256 (diffuse-0.4.1.tar.bz2) = 782ac14e925b94feeb2c2cea2e3119c1f2e3bd82ed8e38e77178290c300132ea
+SIZE (diffuse-0.4.1.tar.bz2) = 117740
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/devel/diffuse/pkg-plist,v
retrieving revision 1.5
diff -u -u -r1.5 pkg-plist
--- pkg-plist 1 Sep 2009 00:07:48 -0000 1.5
+++ pkg-plist 15 Oct 2009 01:20:58 -0000
@@ -30,11 +30,6 @@
%%DATADIR%%/syntax/xml.syntax
@dirrm %%DATADIR%%/syntax
@dirrm %%DATADIR%%
-%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
-%%PORTDOCS%%%%DOCSDIR%%/COPYING
-%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
%%OMF%%share/gnome/help/diffuse/C/diffuse.xml
%%OMF%%@dirrm share/gnome/help/diffuse/C
%%OMF%%@dirrm share/gnome/help/diffuse
--- diffuse-0.4.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20091015012428.4D0D33F416D>