Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jan 2014 20:55:24 +0000 (UTC)
From:      Pawel Pekala <pawel@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340861 - head/textproc/meld
Message-ID:  <201401232055.s0NKtOr8024778@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pawel
Date: Thu Jan 23 20:55:24 2014
New Revision: 340861
URL: http://svnweb.freebsd.org/changeset/ports/340861
QAT: https://qat.redports.org/buildarchive/r340861/

Log:
  - 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)

Modified:
  head/textproc/meld/Makefile
  head/textproc/meld/distinfo

Modified: head/textproc/meld/Makefile
==============================================================================
--- head/textproc/meld/Makefile	Thu Jan 23 20:46:14 2014	(r340860)
+++ head/textproc/meld/Makefile	Thu Jan 23 20:55:24 2014	(r340861)
@@ -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>

Modified: head/textproc/meld/distinfo
==============================================================================
--- head/textproc/meld/distinfo	Thu Jan 23 20:46:14 2014	(r340860)
+++ head/textproc/meld/distinfo	Thu Jan 23 20:55:24 2014	(r340861)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401232055.s0NKtOr8024778>