ports/103517: [PATCH] textproc/meld: update to 1.1.4

Soeren Straarup xride at x12.dk
Sat Sep 23 12:40:20 UTC 2006


>Number:         103517
>Category:       ports
>Synopsis:       [PATCH] textproc/meld: update to 1.1.4
>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 Sep 23 12:40:19 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Soeren Straarup
>Release:        FreeBSD 7.0-CURRENT i386
>Organization:
>Environment:
System: FreeBSD beacon.x12.dk 7.0-CURRENT FreeBSD 7.0-CURRENT #1: Fri Aug  4 21:14:41 CEST
>Description:
- Update to 1.1.4

Port maintainer (rui at ruilopes.com) is cc'd.

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- meld-1.1.4.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/textproc/meld/Makefile /space/portstrees/FreeBSD/ports/textproc/meld/Makefile
--- /usr/ports/textproc/meld/Makefile	Sat Jun  3 20:34:36 2006
+++ /space/portstrees/FreeBSD/ports/textproc/meld/Makefile	Sat Sep 23 14:15:33 2006
@@ -6,31 +6,33 @@
 #
 
 PORTNAME=	meld
-PORTVERSION=	0.9.4.1
-PORTREVISION=	2
+PORTVERSION=	1.1.4
 CATEGORIES=	textproc devel python
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.9
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.1
 
 MAINTAINER=	rui at ruilopes.com
 COMMENT=	GNOME 2 visual diff and merge tool
 
 USE_BZIP2=	yes
 USE_GNOME=	pygnome2
+INSTALLS_OMF=	yes
 USE_PYTHON=	yes
 USE_X_PREFIX=	yes
 NO_BUILD=	yes
 USE_GMAKE=	yes
+USE_GETTEXT=	yes
 
 MAKEFILE=	GNUmakefile
 
 post-patch:
 	@${REINPLACE_CMD} -E 's,(prefix := )(.*),\1${PREFIX},; \
 		s,(libdir := )(.*),\1${PREFIX}/share,' ${WRKSRC}/GNUmakefile
+	@${REINPLACE_CMD} -E 's,(prefix := )(.*),\1${PREFIX},; \
+		s,(libdir := )(.*),\1${PREFIX}/share,' ${WRKSRC}/INSTALL
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications
-	${INSTALL_DATA} ${WRKSRC}/manual/stylesheet.css ${DOCSDIR}
 
 # This target is only meant to be used by the port maintainer.
 x-generate-plist:
diff -ruN --exclude=CVS /usr/ports/textproc/meld/distinfo /space/portstrees/FreeBSD/ports/textproc/meld/distinfo
--- /usr/ports/textproc/meld/distinfo	Fri Jan 27 17:57:55 2006
+++ /space/portstrees/FreeBSD/ports/textproc/meld/distinfo	Fri Sep 22 09:37:21 2006
@@ -1,3 +1,3 @@
-MD5 (meld-0.9.4.1.tar.bz2) = cd5f02e084529c581ce52a22647ca4dc
-SHA256 (meld-0.9.4.1.tar.bz2) = 26704f6083c27e30bed3df7be8b9f6468e7068b3a9231eabd08b00657940eee3
-SIZE (meld-0.9.4.1.tar.bz2) = 333123
+MD5 (meld-1.1.4.tar.bz2) = e780a8f67183acf7f51b13aa4a62ac85
+SHA256 (meld-1.1.4.tar.bz2) = 040c7a633b8abfe646425be4835790d4515952ce0e2ffe8523c36751d93a472f
+SIZE (meld-1.1.4.tar.bz2) = 599912
diff -ruN --exclude=CVS /usr/ports/textproc/meld/pkg-plist /space/portstrees/FreeBSD/ports/textproc/meld/pkg-plist
--- /usr/ports/textproc/meld/pkg-plist	Wed Jun 15 04:43:35 2005
+++ /space/portstrees/FreeBSD/ports/textproc/meld/pkg-plist	Sat Sep 23 11:50:45 2006
@@ -1,93 +1,250 @@
 bin/meld
-share/application-registry/meld.applications
-share/applications/meld.desktop
-%%DOCSDIR%%/manual.html
-%%DOCSDIR%%/stylesheet.css
-share/gnome/applications/meld.desktop
+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/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/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/ne/LC_MESSAGES/meld.mo
 share/locale/nl/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/sr/LC_MESSAGES/meld.mo
 share/locale/sr at 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/filediff.pyo
-share/meld/glade2/cvsview.glade
-share/meld/glade2/dirdiff.glade
-share/meld/glade2/filediff.glade
-share/meld/glade2/meldapp.glade
-share/meld/glade2/pixmaps/button_apply0.xpm
-share/meld/glade2/pixmaps/button_apply1.xpm
-share/meld/glade2/pixmaps/button_copy0.xpm
-share/meld/glade2/pixmaps/button_copy1.xpm
-share/meld/glade2/pixmaps/button_delete.xpm
-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/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
-share/meld/glade2/pixmaps/tree-file-normal.png
-share/meld/glade2/pixmaps/tree-folder-changed.png
-share/meld/glade2/pixmaps/tree-folder-new.png
-share/meld/glade2/pixmaps/tree-folder-normal.png
-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/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
+share/locale/rw/LC_MESSAGES/meld.mo
 share/pixmaps/meld.png
- at dirrm share/meld/glade2/pixmaps
- at dirrm share/meld/glade2
- at dirrm share/meld
+share/gnome/applications/meld.desktop
+share/gnome/help/meld/C/figures/dirdiff.png
+share/gnome/help/meld/C/figures/filediff.png
+share/gnome/help/meld/C/meld.xml
+%%DATADIR%%/vc/__init__.py
+%%DATADIR%%/vc/_null.py
+%%DATADIR%%/vc/_vc.py
+%%DATADIR%%/vc/bzr.py
+%%DATADIR%%/vc/cvs.py
+%%DATADIR%%/vc/darcs.py
+%%DATADIR%%/vc/mercurial.py
+%%DATADIR%%/vc/monotone.py
+%%DATADIR%%/vc/svn.py
+%%DATADIR%%/vc/tla.py
+%%DATADIR%%/vc/__init__.pyc
+%%DATADIR%%/vc/_null.pyc
+%%DATADIR%%/vc/_vc.pyc
+%%DATADIR%%/vc/bzr.pyc
+%%DATADIR%%/vc/cvs.pyc
+%%DATADIR%%/vc/darcs.pyc
+%%DATADIR%%/vc/mercurial.pyc
+%%DATADIR%%/vc/monotone.pyc
+%%DATADIR%%/vc/svn.pyc
+%%DATADIR%%/vc/tla.pyc
+%%DATADIR%%/vc/__init__.pyo
+%%DATADIR%%/vc/_null.pyo
+%%DATADIR%%/vc/_vc.pyo
+%%DATADIR%%/vc/bzr.pyo
+%%DATADIR%%/vc/cvs.pyo
+%%DATADIR%%/vc/darcs.pyo
+%%DATADIR%%/vc/mercurial.pyo
+%%DATADIR%%/vc/monotone.pyo
+%%DATADIR%%/vc/svn.pyo
+%%DATADIR%%/vc/tla.pyo
+%%DATADIR%%/glade2/pixmaps/button_apply0.xpm
+%%DATADIR%%/glade2/pixmaps/button_apply1.xpm
+%%DATADIR%%/glade2/pixmaps/button_copy0.xpm
+%%DATADIR%%/glade2/pixmaps/button_copy1.xpm
+%%DATADIR%%/glade2/pixmaps/button_delete.xpm
+%%DATADIR%%/glade2/pixmaps/close.xpm
+%%DATADIR%%/glade2/pixmaps/cvs-icon-small.png
+%%DATADIR%%/glade2/pixmaps/cvs-icon.png
+%%DATADIR%%/glade2/pixmaps/filter-ignored-24.png
+%%DATADIR%%/glade2/pixmaps/filter-modified-24.png
+%%DATADIR%%/glade2/pixmaps/filter-nonvc-24.png
+%%DATADIR%%/glade2/pixmaps/filter-normal-24.png
+%%DATADIR%%/glade2/pixmaps/icon.png
+%%DATADIR%%/glade2/pixmaps/svn-icon-small.png
+%%DATADIR%%/glade2/pixmaps/svn-icon.png
+%%DATADIR%%/glade2/pixmaps/tree-file-changed.png
+%%DATADIR%%/glade2/pixmaps/tree-file-new.png
+%%DATADIR%%/glade2/pixmaps/vc-icon.png
+%%DATADIR%%/glade2/pixmaps/tree-file-newer.png
+%%DATADIR%%/glade2/pixmaps/tree-file-normal.png
+%%DATADIR%%/glade2/pixmaps/tree-folder-changed.png
+%%DATADIR%%/glade2/pixmaps/tree-folder-new.png
+%%DATADIR%%/glade2/pixmaps/tree-folder-normal.png
+%%DATADIR%%/glade2/pixmaps/vc-add-24.png
+%%DATADIR%%/glade2/pixmaps/vc-checkout-24.png
+%%DATADIR%%/glade2/pixmaps/vc-commit-24.png
+%%DATADIR%%/glade2/pixmaps/vc-remove-24.png
+%%DATADIR%%/glade2/pixmaps/vc-update-24.png
+%%DATADIR%%/glade2/dirdiff.glade
+%%DATADIR%%/glade2/filediff.glade
+%%DATADIR%%/glade2/meldapp.glade
+%%DATADIR%%/glade2/vcview.glade
+%%DATADIR%%/diffutil.py
+%%DATADIR%%/dirdiff.py
+%%DATADIR%%/filediff.py
+%%DATADIR%%/gnomeglade.py
+%%DATADIR%%/meldapp.py
+%%DATADIR%%/melddoc.py
+%%DATADIR%%/misc.py
+%%DATADIR%%/paths.py
+%%DATADIR%%/prefs.py
+%%DATADIR%%/task.py
+%%DATADIR%%/tree.py
+%%DATADIR%%/undo.py
+%%DATADIR%%/vcview.py
+%%DATADIR%%/diffutil.pyc
+%%DATADIR%%/dirdiff.pyc
+%%DATADIR%%/filediff.pyc
+%%DATADIR%%/gnomeglade.pyc
+%%DATADIR%%/meldapp.pyc
+%%DATADIR%%/melddoc.pyc
+%%DATADIR%%/misc.pyc
+%%DATADIR%%/paths.pyc
+%%DATADIR%%/prefs.pyc
+%%DATADIR%%/task.pyc
+%%DATADIR%%/tree.pyc
+%%DATADIR%%/undo.pyc
+%%DATADIR%%/vcview.pyc
+%%DATADIR%%/diffutil.pyo
+%%DATADIR%%/dirdiff.pyo
+%%DATADIR%%/filediff.pyo
+%%DATADIR%%/gnomeglade.pyo
+%%DATADIR%%/meldapp.pyo
+%%DATADIR%%/melddoc.pyo
+%%DATADIR%%/misc.pyo
+%%DATADIR%%/paths.pyo
+%%DATADIR%%/prefs.pyo
+%%DATADIR%%/task.pyo
+%%DATADIR%%/tree.pyo
+%%DATADIR%%/undo.pyo
+%%DATADIR%%/vcview.pyo
+share/applications/meld.desktop
+share/application-registry/meld.applications
+share/omf/meld/meld-C.omf
+var/lib/scrollkeeper/C/scrollkeeper_cl.xml
+var/lib/scrollkeeper/C/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/am/scrollkeeper_cl.xml
+var/lib/scrollkeeper/am/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/az/scrollkeeper_cl.xml
+var/lib/scrollkeeper/az/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/be/scrollkeeper_cl.xml
+var/lib/scrollkeeper/be/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/ca/scrollkeeper_cl.xml
+var/lib/scrollkeeper/ca/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/cs/scrollkeeper_cl.xml
+var/lib/scrollkeeper/cs/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/da/scrollkeeper_cl.xml
+var/lib/scrollkeeper/da/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/de/scrollkeeper_cl.xml
+var/lib/scrollkeeper/de/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/el/scrollkeeper_cl.xml
+var/lib/scrollkeeper/el/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/es/scrollkeeper_cl.xml
+var/lib/scrollkeeper/es/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/fr/scrollkeeper_cl.xml
+var/lib/scrollkeeper/fr/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/hu/scrollkeeper_cl.xml
+var/lib/scrollkeeper/hu/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/it/scrollkeeper_cl.xml
+var/lib/scrollkeeper/it/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/ja/scrollkeeper_cl.xml
+var/lib/scrollkeeper/ja/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/kn/scrollkeeper_cl.xml
+var/lib/scrollkeeper/kn/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/ko/scrollkeeper_cl.xml
+var/lib/scrollkeeper/ko/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/nl/scrollkeeper_cl.xml
+var/lib/scrollkeeper/nl/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/no/scrollkeeper_cl.xml
+var/lib/scrollkeeper/no/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/pl/scrollkeeper_cl.xml
+var/lib/scrollkeeper/pl/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/pt_BR/scrollkeeper_cl.xml
+var/lib/scrollkeeper/pt_BR/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/ro/scrollkeeper_cl.xml
+var/lib/scrollkeeper/ro/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/ru/scrollkeeper_cl.xml
+var/lib/scrollkeeper/ru/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/sl/scrollkeeper_cl.xml
+var/lib/scrollkeeper/sl/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/sk/scrollkeeper_cl.xml
+var/lib/scrollkeeper/sk/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/sr/scrollkeeper_cl.xml
+var/lib/scrollkeeper/sr/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/sr at Latn/scrollkeeper_cl.xml
+var/lib/scrollkeeper/sr at Latn/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/sv/scrollkeeper_cl.xml
+var/lib/scrollkeeper/sv/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/tr/scrollkeeper_cl.xml
+var/lib/scrollkeeper/tr/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/uk/scrollkeeper_cl.xml
+var/lib/scrollkeeper/uk/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/vi/scrollkeeper_cl.xml
+var/lib/scrollkeeper/vi/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/zh_CN/scrollkeeper_cl.xml
+var/lib/scrollkeeper/zh_CN/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/zh_TW/scrollkeeper_cl.xml
+var/lib/scrollkeeper/zh_TW/scrollkeeper_extended_cl.xml
+var/lib/scrollkeeper/scrollkeeper_docs
+ at dirrm var/lib/scrollkeeper/zh_TW
+ at dirrm var/lib/scrollkeeper/zh_CN
+ at dirrm var/lib/scrollkeeper/vi
+ at dirrm var/lib/scrollkeeper/uk
+ at dirrm var/lib/scrollkeeper/tr
+ at dirrm var/lib/scrollkeeper/sv
+ at dirrm var/lib/scrollkeeper/sr at Latn
+ at dirrm var/lib/scrollkeeper/sr
+ at dirrm var/lib/scrollkeeper/sl
+ at dirrm var/lib/scrollkeeper/sk
+ at dirrm var/lib/scrollkeeper/ru
+ at dirrm var/lib/scrollkeeper/ro
+ at dirrm var/lib/scrollkeeper/pt_BR
+ at dirrm var/lib/scrollkeeper/pl
+ at dirrm var/lib/scrollkeeper/no
+ at dirrm var/lib/scrollkeeper/nl
+ at dirrm var/lib/scrollkeeper/ko
+ at dirrm var/lib/scrollkeeper/kn
+ at dirrm var/lib/scrollkeeper/ja
+ at dirrm var/lib/scrollkeeper/it
+ at dirrm var/lib/scrollkeeper/index
+ at dirrm var/lib/scrollkeeper/hu
+ at dirrm var/lib/scrollkeeper/fr
+ at dirrm var/lib/scrollkeeper/es
+ at dirrm var/lib/scrollkeeper/el
+ at dirrm var/lib/scrollkeeper/de
+ at dirrm var/lib/scrollkeeper/da
+ at dirrm var/lib/scrollkeeper/cs
+ at dirrm var/lib/scrollkeeper/ca
+ at dirrm var/lib/scrollkeeper/be
+ at dirrm var/lib/scrollkeeper/az
+ at dirrm var/lib/scrollkeeper/am
+ at dirrm var/lib/scrollkeeper/TOC
+ at dirrm var/lib/scrollkeeper/C
+ at dirrm var/lib/scrollkeeper
+ at dirrm var/lib
+ at dirrm var
+ at dirrm share/omf/meld
+ at dirrm share/omf
+ at dirrm %%DATADIR%%/vc
+ at dirrm %%DATADIR%%/glade2/pixmaps
+ at dirrm %%DATADIR%%/glade2
+ at dirrm %%DATADIR%%
+ at dirrm share/gnome/help/meld/C/figures
+ at dirrm share/gnome/help/meld/C
+ at dirrm share/gnome/help/meld
+ at dirrm share/doc/meld
 @dirrm share/applications
 @dirrm share/application-registry
- at dirrm %%DOCSDIR%%
--- meld-1.1.4.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list