From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 4 18:10:01 2010 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id EEC3B1065697 for ; Mon, 4 Oct 2010 18:10:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id C8E708FC18 for ; Mon, 4 Oct 2010 18:10:01 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id o94IA16V011148 for ; Mon, 4 Oct 2010 18:10:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id o94IA1o6011147; Mon, 4 Oct 2010 18:10:01 GMT (envelope-from gnats) Resent-Date: Mon, 4 Oct 2010 18:10:01 GMT Resent-Message-Id: <201010041810.o94IA1o6011147@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, "Pawel Pekala" Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F0D62106566C for ; Mon, 4 Oct 2010 18:02:44 +0000 (UTC) (envelope-from c0rn@o2.pl) Received: from mailout1.go2.pl (mailout1.go2.pl [193.17.41.11]) by mx1.freebsd.org (Postfix) with ESMTP id 8131B8FC1A for ; Mon, 4 Oct 2010 18:02:44 +0000 (UTC) Received: from mailout1.go2.pl (unknown [10.0.0.104]) by mailout1.go2.pl (Postfix) with ESMTP id DE52330096 for ; Mon, 4 Oct 2010 20:02:22 +0200 (CEST) Received: from unknown (unknown [10.0.0.142]) by mailout1.go2.pl (Postfix) with SMTP for ; Mon, 4 Oct 2010 20:02:22 +0200 (CEST) Received: from aegy111.neoplus.adsl.tpnet.pl [79.186.180.111] by poczta.o2.pl with ESMTP id SbKAKd; Mon, 04 Oct 2010 20:02:22 +0200 Message-Id: <1286215408.19980@caprica.slowicza.org> Date: Mon, 4 Oct 2010 20:03:28 +0200 From: "Pawel Pekala" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.4.9 Cc: Subject: ports/151210: [maintainer update] textproc/meld update to 1.4.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Oct 2010 18:10:02 -0000 >Number: 151210 >Category: ports >Synopsis: [maintainer update] textproc/meld update to 1.4.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Mon Oct 04 18:10:01 UTC 2010 >Closed-Date: >Last-Modified: >Originator: Pawel Pekala >Release: FreeBSD 8.1-RELEASE i386 >Organization: >Environment: System: FreeBSD 8.1-RELEASE #2: Sat Aug 21 18:46:54 CEST 2010 corn@caprica.slowicza.org:/usr/obj/usr/src/sys/GENERIC >Description: - update to version 1.4.0 - respect WITHOUT_NLS knob >How-To-Repeat: >Fix: --- meld-1.4.0.patch begins here --- diff -ruN --exclude=CVS /usr/ports/textproc/meld/Makefile /home/corn/devel/meld/Makefile --- /usr/ports/textproc/meld/Makefile 2010-09-10 18:27:06.000000000 +0200 +++ /home/corn/devel/meld/Makefile 2010-10-04 18:58:25.000000000 +0200 @@ -6,7 +6,7 @@ # PORTNAME= meld -PORTVERSION= 1.3.3 +PORTVERSION= 1.4.0 CATEGORIES= textproc devel python MASTER_SITES= GNOME @@ -18,13 +18,20 @@ USE_BZIP2= yes USE_GNOME= pygnome2 USE_PYTHON= yes -USE_GETTEXT= yes USE_GMAKE= yes MAKE_ARGS= prefix=${PREFIX} INSTALLS_ICONS= yes INSTALLS_OMF= yes LICENSE= GPLv2 +.if defined(WITHOUT_NLS) +EXTRA_PATCHES= ${FILESDIR}/extra-Makefile-without_nls +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.endif + post-patch: .for file in Makefile @${REINPLACE_CMD} -e '/docdir_/d' ${WRKSRC}/${file} diff -ruN --exclude=CVS /usr/ports/textproc/meld/distinfo /home/corn/devel/meld/distinfo --- /usr/ports/textproc/meld/distinfo 2010-09-10 18:27:06.000000000 +0200 +++ /home/corn/devel/meld/distinfo 2010-10-04 16:52:53.000000000 +0200 @@ -1,3 +1,3 @@ -MD5 (meld-1.3.3.tar.bz2) = 4326e8492871dbee4d1107943a3c414a -SHA256 (meld-1.3.3.tar.bz2) = bfdf9a5e33a7ebc5b976fbd2925033e2bbd46e8f632437959b88aac35676d08a -SIZE (meld-1.3.3.tar.bz2) = 333460 +MD5 (meld-1.4.0.tar.bz2) = b675ec2006c4452469cf501c51b2a689 +SHA256 (meld-1.4.0.tar.bz2) = 0edb78d9da2bfe7e630742111eb6d8edc476c8cc91b1f6403d940d072dd75469 +SIZE (meld-1.4.0.tar.bz2) = 333793 diff -ruN --exclude=CVS /usr/ports/textproc/meld/files/extra-Makefile-without_nls /home/corn/devel/meld/files/extra-Makefile-without_nls --- /usr/ports/textproc/meld/files/extra-Makefile-without_nls 1970-01-01 01:00:00.000000000 +0100 +++ /home/corn/devel/meld/files/extra-Makefile-without_nls 2010-10-04 19:02:35.000000000 +0200 @@ -0,0 +1,10 @@ +--- Makefile.orig 2010-10-04 19:00:55.000000000 +0200 ++++ Makefile 2010-10-04 19:01:41.000000000 +0200 +@@ -94,7 +94,6 @@ + $(DESTDIR)$(sharedir)/icons/hicolor/48x48/apps/meld.png + install -m 644 data/icons/48x48/meld.svg \ + $(DESTDIR)$(sharedir)/icons/hicolor/scalable/apps/meld.svg +- $(MAKE) -C po install + $(MAKE) -C help install + + meld.desktop: data/meld.desktop.in diff -ruN --exclude=CVS /usr/ports/textproc/meld/pkg-plist /home/corn/devel/meld/pkg-plist --- /usr/ports/textproc/meld/pkg-plist 2010-09-10 18:27:06.000000000 +0200 +++ /home/corn/devel/meld/pkg-plist 2010-10-04 19:10:12.000000000 +0200 @@ -167,40 +167,40 @@ share/icons/hicolor/32x32/apps/meld.png share/icons/hicolor/48x48/apps/meld.png share/icons/hicolor/scalable/apps/meld.svg -share/locale/ar/LC_MESSAGES/meld.mo -share/locale/bg/LC_MESSAGES/meld.mo -share/locale/ca/LC_MESSAGES/meld.mo -share/locale/cs/LC_MESSAGES/meld.mo -share/locale/de/LC_MESSAGES/meld.mo -share/locale/dz/LC_MESSAGES/meld.mo -share/locale/el/LC_MESSAGES/meld.mo -share/locale/en_CA/LC_MESSAGES/meld.mo -share/locale/en_GB/LC_MESSAGES/meld.mo -share/locale/es/LC_MESSAGES/meld.mo -share/locale/fi/LC_MESSAGES/meld.mo -share/locale/fr/LC_MESSAGES/meld.mo -share/locale/gl/LC_MESSAGES/meld.mo -share/locale/hu/LC_MESSAGES/meld.mo -share/locale/it/LC_MESSAGES/meld.mo -share/locale/ja/LC_MESSAGES/meld.mo -share/locale/ko/LC_MESSAGES/meld.mo -share/locale/nb/LC_MESSAGES/meld.mo -share/locale/ne/LC_MESSAGES/meld.mo -share/locale/nl/LC_MESSAGES/meld.mo -share/locale/oc/LC_MESSAGES/meld.mo -share/locale/pa/LC_MESSAGES/meld.mo -share/locale/pt/LC_MESSAGES/meld.mo -share/locale/pt_BR/LC_MESSAGES/meld.mo -share/locale/ru/LC_MESSAGES/meld.mo -share/locale/rw/LC_MESSAGES/meld.mo -share/locale/sl/LC_MESSAGES/meld.mo -share/locale/sq/LC_MESSAGES/meld.mo -share/locale/sr/LC_MESSAGES/meld.mo -share/locale/sr@latin/LC_MESSAGES/meld.mo -share/locale/sv/LC_MESSAGES/meld.mo -share/locale/vi/LC_MESSAGES/meld.mo -share/locale/zh_CN/LC_MESSAGES/meld.mo -share/locale/zh_TW/LC_MESSAGES/meld.mo +%%NLS%%share/locale/ar/LC_MESSAGES/meld.mo +%%NLS%%share/locale/bg/LC_MESSAGES/meld.mo +%%NLS%%share/locale/ca/LC_MESSAGES/meld.mo +%%NLS%%share/locale/cs/LC_MESSAGES/meld.mo +%%NLS%%share/locale/de/LC_MESSAGES/meld.mo +%%NLS%%share/locale/dz/LC_MESSAGES/meld.mo +%%NLS%%share/locale/el/LC_MESSAGES/meld.mo +%%NLS%%share/locale/en_CA/LC_MESSAGES/meld.mo +%%NLS%%share/locale/en_GB/LC_MESSAGES/meld.mo +%%NLS%%share/locale/es/LC_MESSAGES/meld.mo +%%NLS%%share/locale/fi/LC_MESSAGES/meld.mo +%%NLS%%share/locale/fr/LC_MESSAGES/meld.mo +%%NLS%%share/locale/gl/LC_MESSAGES/meld.mo +%%NLS%%share/locale/hu/LC_MESSAGES/meld.mo +%%NLS%%share/locale/it/LC_MESSAGES/meld.mo +%%NLS%%share/locale/ja/LC_MESSAGES/meld.mo +%%NLS%%share/locale/ko/LC_MESSAGES/meld.mo +%%NLS%%share/locale/nb/LC_MESSAGES/meld.mo +%%NLS%%share/locale/ne/LC_MESSAGES/meld.mo +%%NLS%%share/locale/nl/LC_MESSAGES/meld.mo +%%NLS%%share/locale/oc/LC_MESSAGES/meld.mo +%%NLS%%share/locale/pa/LC_MESSAGES/meld.mo +%%NLS%%share/locale/pt/LC_MESSAGES/meld.mo +%%NLS%%share/locale/pt_BR/LC_MESSAGES/meld.mo +%%NLS%%share/locale/ru/LC_MESSAGES/meld.mo +%%NLS%%share/locale/rw/LC_MESSAGES/meld.mo +%%NLS%%share/locale/sl/LC_MESSAGES/meld.mo +%%NLS%%share/locale/sq/LC_MESSAGES/meld.mo +%%NLS%%share/locale/sr/LC_MESSAGES/meld.mo +%%NLS%%share/locale/sr@latin/LC_MESSAGES/meld.mo +%%NLS%%share/locale/sv/LC_MESSAGES/meld.mo +%%NLS%%share/locale/vi/LC_MESSAGES/meld.mo +%%NLS%%share/locale/zh_CN/LC_MESSAGES/meld.mo +%%NLS%%share/locale/zh_TW/LC_MESSAGES/meld.mo share/omf/meld/meld-C.omf share/omf/meld/meld-es.omf share/omf/meld/meld-fr.omf --- meld-1.4.0.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: