aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpawel <pawel@FreeBSD.org>2014-01-24 04:55:24 +0800
committerpawel <pawel@FreeBSD.org>2014-01-24 04:55:24 +0800
commit29864f3f64ea8390042f7fa10429092ab8dfdcc8 (patch)
treec419438491fff30cfc7967087fa1443d8634e2c3
parent1e9a69c835a6f7cfd31a510b5fb4ab95af13776e (diff)
downloadfreebsd-ports-gnome-29864f3f64ea8390042f7fa10429092ab8dfdcc8.tar.gz
freebsd-ports-gnome-29864f3f64ea8390042f7fa10429092ab8dfdcc8.tar.zst
freebsd-ports-gnome-29864f3f64ea8390042f7fa10429092ab8dfdcc8.zip
- Update to version 1.8.4
- Fix shebang line - Remove cruft not needed when staged Fixes: * Fix crash when scanning CVS-only folders (Kai Willadsen) * Fix crash on Windows when missing cdll.intl (Bartosz Dziewonski) * Fix crash with Italian (it_IT.utf8) locale (Balint Reczey) Translations: * Andika Triwidada (id) * Benjamin Steinwender (de) * Daniel Mustieles (es)
-rw-r--r--textproc/meld/Makefile26
-rw-r--r--textproc/meld/distinfo4
2 files changed, 12 insertions, 18 deletions
diff --git a/textproc/meld/Makefile b/textproc/meld/Makefile
index 9d2154789348..e547e7de23e7 100644
--- a/textproc/meld/Makefile
+++ b/textproc/meld/Makefile
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= meld
-PORTVERSION= 1.8.3
+PORTVERSION= 1.8.4
CATEGORIES= textproc devel python
MASTER_SITES= GNOME
@@ -13,7 +13,10 @@ LICENSE= GPLv2
USE_XZ= yes
USE_GNOME= pygnome2
-USES= desktop-file-utils gmake shared-mime-info
+USES= desktop-file-utils gmake shared-mime-info shebangfix
+python_OLD_CMD= ${SETENV} python
+python_CMD= ${PYTHON_CMD}
+SHEBANG_FILES= bin/meld
USE_PYTHON= 2
MAKE_ARGS= prefix=${PREFIX}
INSTALLS_ICONS= yes
@@ -25,21 +28,12 @@ OPTIONS_SUB= yes
NLS_USES= gettext
PYGNOMEDESKTOP_DESC= Code syntax highlighting (many dependencies)
-PYGNOMEDESKTOP_USE= gnome=pygnomedesktop
-
-.include <bsd.port.options.mk>
+PYGNOMEDESKTOP_USE= GNOME=pygnomedesktop
post-patch:
- @${REINPLACE_CMD} '/docdir_/d' ${WRKSRC}/Makefile
-.if !${PORT_OPTIONS:MNLS}
- @${REINPLACE_CMD} '/po install/d' ${WRKSRC}/Makefile
-.endif
-
-.for file in help/C/Makefile help/es/Makefile help/fr/Makefile
- @${REINPLACE_CMD} -e \
- 's|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g ; \
- s|^LANG :=|LANG_ :=|g ; \
- s|$$(LANG)|$$(LANG_)|g' ${WRKSRC}/${file}
-.endfor
+ @${REINPLACE_CMD} -e 's|^LANG :=|LANG_ :=|g ; s|$$(LANG)|$$(LANG_)|g ; \
+ s|$$(localstatedir)/lib/scrollkeeper|/var/db/scrollkeeper|g' \
+ ${WRKSRC}/help/C/Makefile ${WRKSRC}/help/es/Makefile \
+ ${WRKSRC}/help/fr/Makefile
.include <bsd.port.mk>
diff --git a/textproc/meld/distinfo b/textproc/meld/distinfo
index 25f120d05d03..7e54b1f81d6c 100644
--- a/textproc/meld/distinfo
+++ b/textproc/meld/distinfo
@@ -1,2 +1,2 @@
-SHA256 (meld-1.8.3.tar.xz) = 42ba344cacfe4c5afaf5db8a43df2c877ec9e5b8e66621b92f2f9e0dcbf6fed7
-SIZE (meld-1.8.3.tar.xz) = 415704
+SHA256 (meld-1.8.4.tar.xz) = b46e5786343f236d203037a7ace8f1b28145a51a3f84fa527efcf62f47b5b8de
+SIZE (meld-1.8.4.tar.xz) = 421332