From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jul 24 10:10:31 2004 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 0C1AD16A4CE for ; Sat, 24 Jul 2004 10:10:31 +0000 (GMT) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 00B6843D1D for ; Sat, 24 Jul 2004 10:10:31 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) i6OAAUVZ062468 for ; Sat, 24 Jul 2004 10:10:30 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.11/8.12.11/Submit) id i6OAAUUa062467; Sat, 24 Jul 2004 10:10:30 GMT (envelope-from gnats) Resent-Date: Sat, 24 Jul 2004 10:10:30 GMT Resent-Message-Id: <200407241010.i6OAAUUa062467@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, "Tom McLaughlin" Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 3560116A4CE for ; Sat, 24 Jul 2004 10:04:29 +0000 (GMT) Received: from straycat.dhs.org (h0050da134090.ne.client2.attbi.com [24.91.148.154]) by mx1.FreeBSD.org (Postfix) with SMTP id 4B3DE43D41 for ; Sat, 24 Jul 2004 10:04:26 +0000 (GMT) (envelope-from tmclaugh@sdf.lonestar.org) Received: (qmail 8147 invoked from network); 24 Jul 2004 10:04:25 -0000 Received: from compass.straycat.dhs.org (192.168.1.32) by alexandria.straycat.dhs.org with SMTP; 24 Jul 2004 10:04:25 -0000 Message-Id: <1090663465.0@compass.straycat.dhs.org> Date: Sat, 24 Jul 2004 06:04:25 -0400 From: "Tom McLaughlin" To: "FreeBSD gnats submit" X-Send-Pr-Version: gtk-send-pr 0.3.3 cc: rui@ruilopes.com Subject: ports/69526: Port Update: textproc/meld - fix unfetchable distfile and update to latest version X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 24 Jul 2004 10:10:31 -0000 >Number: 69526 >Category: ports >Synopsis: Port Update: textproc/meld - fix unfetchable distfile and update to latest version >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: Sat Jul 24 10:10:30 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Tom McLaughlin >Release: FreeBSD 5.2-CURRENT i386 >Organization: >Environment: System: FreeBSD 5.2-CURRENT #0: Tue Jul 20 02:50:04 EDT 2004 root@compass.straycat.dhs.org:/usr/obj/usr/src/sys/COMPASS >Description: Meld has moved it's distfile from Source Forge to the Gnome mirrors. Current version of the port is no longer fetchable becuase of this move. Attached patch corrects distfile location and updates it to the latest release. Maintainer is CC'ed on PR. >How-To-Repeat: >Fix: --- meld-0.9.4.1.diff begins here --- diff -u meld.orig/Makefile meld/Makefile --- meld.orig/Makefile Mon Apr 5 04:10:07 2004 +++ meld/Makefile Sat Jul 24 06:01:35 2004 @@ -6,12 +6,10 @@ # PORTNAME= meld -PORTVERSION= 0.9.1 -PORTREVISION= 2 +PORTVERSION= 0.9.4.1 CATEGORIES= textproc devel python -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} -MASTER_SITE_SUBDIR= meld -EXTRACT_SUFX= .tgz +MASTER_SITES= ${MASTER_SITE_GNOME} +MASTER_SITE_SUBDIR= sources/${PORTNAME}/0.9 MAINTAINER= rui@ruilopes.com COMMENT= GNOME 2 visual diff and merge tool @@ -31,7 +29,7 @@ s,(libdir := )(.*),\1${PREFIX}/share,g ; \ s,( glade2/pixmaps/\*\.){xpm\,png},\1xpm\1png,g' ${WRKSRC}/GNUmakefile @${REINPLACE_CMD} -E 's,(.+)(install )-D (-m 644 \$$\^ \$$@),\1mkdir -m 755 -p $$(shell dirname $$@) \&\& \2\3,g' ${WRKSRC}/po/GNUmakefile - @${REINPLACE_CMD} -e 's,^Path=.*$$,Icon=${DATADIR}/glade2/pixmaps/icon.png,' ${WRKSRC}/meld.desktop + @${REINPLACE_CMD} -e 's,^Icon=.*$$,Icon=${DATADIR}/glade2/pixmaps/icon.png,' ${WRKSRC}/meld.desktop.in post-install: ${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications diff -u meld.orig/distinfo meld/distinfo --- meld.orig/distinfo Wed Mar 31 04:10:50 2004 +++ meld/distinfo Sat Jul 24 04:47:38 2004 @@ -1,2 +1,2 @@ -MD5 (meld-0.9.1.tgz) = 1dfd1205c405bc263fc49ea1d92d47bf -SIZE (meld-0.9.1.tgz) = 118854 +MD5 (meld-0.9.4.1.tar.gz) = fd468b01e3fef2a4e6c4c388ddeb3a24 +SIZE (meld-0.9.4.1.tar.gz) = 361915 diff -u meld.orig/pkg-plist meld/pkg-plist --- meld.orig/pkg-plist Fri Dec 5 04:07:44 2003 +++ meld/pkg-plist Sat Jul 24 05:10:26 2004 @@ -1,33 +1,33 @@ bin/meld +share/application-registry/meld.applications +share/applications/meld.desktop +%%DOCSDIR%%/manual.html +%%DOCSDIR%%/stylesheet.css share/gnome/applications/meld.desktop +share/locale/cs/LC_MESSAGES/meld.mo +share/locale/de/LC_MESSAGES/meld.mo +share/locale/en_CA/LC_MESSAGES/meld.mo +share/locale/en_GB/LC_MESSAGES/meld.mo +share/locale/fr/LC_MESSAGES/meld.mo +share/locale/ja/LC_MESSAGES/meld.mo +share/locale/ko/LC_MESSAGES/meld.mo +share/locale/nl/LC_MESSAGES/meld.mo +share/locale/pt/LC_MESSAGES/meld.mo +share/locale/pt_BR/LC_MESSAGES/meld.mo +share/locale/sr/LC_MESSAGES/meld.mo +share/locale/sr@Latn/LC_MESSAGES/meld.mo share/meld/cvsview.py share/meld/cvsview.pyc +share/meld/cvsview.pyo share/meld/diffutil.py share/meld/diffutil.pyc +share/meld/diffutil.pyo share/meld/dirdiff.py share/meld/dirdiff.pyc +share/meld/dirdiff.pyo share/meld/filediff.py share/meld/filediff.pyc -share/meld/gnomeglade.py -share/meld/gnomeglade.pyc -share/meld/meldapp.py -share/meld/meldapp.pyc -share/meld/melddoc.py -share/meld/melddoc.pyc -share/meld/misc.py -share/meld/misc.pyc -share/meld/paths.py -share/meld/paths.pyc -share/meld/prefs.py -share/meld/prefs.pyc -share/meld/task.py -share/meld/task.pyc -share/meld/tree.py -share/meld/tree.pyc -share/meld/undo.py -share/meld/undo.pyc -share/locale/en_IE/LC_MESSAGES/meld.mo -share/locale/fr/LC_MESSAGES/meld.mo +share/meld/filediff.pyo share/meld/glade2/cvsview.glade share/meld/glade2/dirdiff.glade share/meld/glade2/filediff.glade @@ -40,11 +40,13 @@ share/meld/glade2/pixmaps/close.xpm share/meld/glade2/pixmaps/cvs-add-16.png share/meld/glade2/pixmaps/cvs-commit-16.png +share/meld/glade2/pixmaps/cvs-icon-small.png share/meld/glade2/pixmaps/cvs-icon.png share/meld/glade2/pixmaps/cvs-remove-16.png share/meld/glade2/pixmaps/cvs-update-16.png share/meld/glade2/pixmaps/icon.png -share/meld/glade2/pixmaps/logo.png +share/meld/glade2/pixmaps/svn-icon-small.png +share/meld/glade2/pixmaps/svn-icon.png share/meld/glade2/pixmaps/tree-file-changed.png share/meld/glade2/pixmaps/tree-file-new.png share/meld/glade2/pixmaps/tree-file-newer.png @@ -52,11 +54,50 @@ share/meld/glade2/pixmaps/tree-folder-changed.png share/meld/glade2/pixmaps/tree-folder-new.png share/meld/glade2/pixmaps/tree-folder-normal.png -%%DOCSDIR%%/manual.html -%%DOCSDIR%%/stylesheet.css -@dirrm %%DOCSDIR%% -@unexec (rmdir %D/share/locale/en_IE/LC_MESSAGES && rmdir %D/share/locale/en_IE) 2>/dev/null || true -@unexec (rmdir %D/share/locale/fr/LC_MESSAGES && rmdir %D/share/locale/fr) 2>/dev/null || true +share/meld/gnomeglade.py +share/meld/gnomeglade.pyc +share/meld/gnomeglade.pyo +share/meld/meldapp.py +share/meld/meldapp.pyc +share/meld/meldapp.pyo +share/meld/melddoc.py +share/meld/melddoc.pyc +share/meld/melddoc.pyo +share/meld/misc.py +share/meld/misc.pyc +share/meld/misc.pyo +share/meld/paths.py +share/meld/paths.pyc +share/meld/paths.pyo +share/meld/prefs.py +share/meld/prefs.pyc +share/meld/prefs.pyo +share/meld/svnview.py +share/meld/svnview.pyc +share/meld/svnview.pyo +share/meld/task.py +share/meld/task.pyc +share/meld/task.pyo +share/meld/tree.py +share/meld/tree.pyc +share/meld/tree.pyo +share/meld/undo.py +share/meld/undo.pyc +share/meld/undo.pyo +share/pixmaps/meld.png @dirrm share/meld/glade2/pixmaps @dirrm share/meld/glade2 @dirrm share/meld +@unexec (rmdir %D/share/locale/sr@Latn/LC_MESSAGES && rmdir %D/share/locale/sr@Latn) 2>/dev/null || true +@unexec (rmdir %D/share/locale/sr/LC_MESSAGES && rmdir %D/share/locale/sr) 2>/dev/null || true +@unexec (rmdir %D/share/locale/pt_BR/LC_MESSAGES && rmdir %D/share/locale/pt_BR) 2>/dev/null || true +@unexec (rmdir %D/share/locale/pt/LC_MESSAGES && rmdir %D/share/locale/pt) 2>/dev/null || true +@unexec (rmdir %D/share/locale/nl/LC_MESSAGES && rmdir %D/share/locale/nl) 2>/dev/null || true +@unexec (rmdir %D/share/locale/ko/LC_MESSAGES && rmdir %D/share/locale/ko) 2>/dev/null || true +@unexec (rmdir %D/share/locale/ja/LC_MESSAGES && rmdir %D/share/locale/ja) 2>/dev/null || true +@unexec (rmdir %D/share/locale/fr/LC_MESSAGES && rmdir %D/share/locale/fr) 2>/dev/null || true +@unexec (rmdir %D/share/locale/en_GB/LC_MESSAGES && rmdir %D/share/locale/en_GB) 2>/dev/null || true +@unexec (rmdir %D/share/locale/en_CA/LC_MESSAGES && rmdir %D/share/locale/en_CA) 2>/dev/null || true +@unexec (rmdir %D/share/locale/de/LC_MESSAGES && rmdir %D/share/locale/de) 2>/dev/null || true +@unexec (rmdir %D/share/locale/cs/LC_MESSAGES && rmdir %D/share/locale/cs) 2>/dev/null || true +@dirrm %%DOCSDIR%% --- meld-0.9.4.1.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: