Date: Sat, 24 Jul 2004 17:40:19 GMT From: Rui Lopes <rui@ruilopes.com> To: freebsd-ports-bugs@FreeBSD.org Subject: Re: ports/69526: Port Update: textproc/meld - fix unfetchabledistfile and update to latest version Message-ID: <200407241740.i6OHeJlk027790@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/69526; it has been noted by GNATS.
From: Rui Lopes <rui@ruilopes.com>
To: freebsd-gnats-submit@FreeBSD.org, tmclaugh@sdf.lonestar.org
Cc:
Subject: Re: ports/69526: Port Update: textproc/meld - fix unfetchable distfile
and update to latest version
Date: Sat, 24 Jul 2004 18:38:17 +0100
This is a multi-part message in MIME format.
--------------060206010206090401090204
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
Hi Tom,
Thanks for taking time for updating meld port!
Dear commiter, please commit the attached patch instead, it combines
this PR with other tweaks. Overall the patch contains:
* Update to 0.9.4.1
* Update MASTER_SITES since Meld moved to Gnome servers
* Use the bzip2 package
* Add x-generate-plist make target to aid the plist generation
-- Rui Lopes
--------------060206010206090401090204
Content-Type: text/plain;
name="meld-updateto-0.9.4.1.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline;
filename="meld-updateto-0.9.4.1.patch"
# * Update to 0.9.4.1
# * Update MASTER_SITES since Meld has moved to Gnome servers
# * Use the bzip2 package
# * Add x-generate-plist make target to aid the plist generation
# -- Rui Lopes <rgl@ruilopes.com>
diff -ruN meld.orig/Makefile meld/Makefile
--- meld.orig/Makefile Sun Jul 18 21:50:01 2004
+++ meld/Makefile Sat Jul 24 18:03:00 2004
@@ -6,18 +6,17 @@
#
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
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/gtk-2.0/gnome/__init__.py:${PORTSDIR}/x11-toolkits/py-gnome2
+USE_BZIP2= yes
USE_PYTHON= yes
USE_X_PREFIX= yes
NO_BUILD= yes
@@ -27,16 +26,15 @@
MAKEFILE= GNUmakefile
post-patch:
- @${REINPLACE_CMD} -E 's,(prefix := )(.*),\1${PREFIX},g ; \
- 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,(prefix := )(.*),\1${PREFIX},; \
+ s,(libdir := )(.*),\1${PREFIX}/share,' ${WRKSRC}/GNUmakefile
post-install:
${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications
${INSTALL_DATA} ${WRKSRC}/manual/stylesheet.css ${DOCSDIR}
- @cd ${DATADIR} && \
- ${PYTHON_CMD} -c "import compileall; compileall.compile_dir('.', 0)"
+
+# This target is only meant to be used by the port maintainer.
+x-generate-plist:
+ (${PORTSDIR}/Tools/scripts/plist -d -m ${MTREE_FILE} ${PREFIX}|${SED} -E 's,.*share/nls/.+$$,,g;s,share/doc/meld,%%DOCSDIR%%,;s,^@dirrm share/(gnome|pixmaps|application|locale).*,,'|${TR} -s '\n') > temp-pkg-plist
.include <bsd.port.mk>
diff -ruN meld.orig/distinfo meld/distinfo
--- meld.orig/distinfo Sun Jul 18 21:50:01 2004
+++ meld/distinfo Sat Jul 24 16:35: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.bz2) = cd5f02e084529c581ce52a22647ca4dc
+SIZE (meld-0.9.4.1.tar.bz2) = 333123
diff -ruN meld.orig/pkg-plist meld/pkg-plist
--- meld.orig/pkg-plist Sun Jul 18 21:50:01 2004
+++ meld/pkg-plist Sat Jul 24 17:49:44 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,38 @@
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
+@dirrm %%DOCSDIR%%
--------------060206010206090401090204--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200407241740.i6OHeJlk027790>