From owner-freebsd-ports-bugs@FreeBSD.ORG Wed Dec 3 13:40:25 2003 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 0151516A4D1 for ; Wed, 3 Dec 2003 13:40:25 -0800 (PST) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id D146A43FBF for ; Wed, 3 Dec 2003 13:40:10 -0800 (PST) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.12.9/8.12.9) with ESMTP id hB3LeAFY066665 for ; Wed, 3 Dec 2003 13:40:10 -0800 (PST) (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.12.9/8.12.9/Submit) id hB3LeAKv066664; Wed, 3 Dec 2003 13:40:10 -0800 (PST) (envelope-from gnats) Resent-Date: Wed, 3 Dec 2003 13:40:10 -0800 (PST) Resent-Message-Id: <200312032140.hB3LeAKv066664@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, Rui Lopes Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2B49116A4CE for ; Wed, 3 Dec 2003 13:36:13 -0800 (PST) Received: from griffin.clustercube.com (griffin.clustercube.com [213.201.220.146]) by mx1.FreeBSD.org (Postfix) with SMTP id 9B53843F85 for ; Wed, 3 Dec 2003 13:36:09 -0800 (PST) (envelope-from root@griffin.clustercube.com) Received: (qmail 38173 invoked by uid 0); 3 Dec 2003 22:38:43 -0000 Message-Id: <20031203223843.38172.qmail@griffin.clustercube.com> Date: 3 Dec 2003 22:38:43 -0000 From: Rui Lopes To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/59929: Update port: textproc/meld to 0.9.1 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list Reply-To: Rui Lopes List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 03 Dec 2003 21:40:25 -0000 >Number: 59929 >Category: ports >Synopsis: Update port: textproc/meld to 0.9.1 >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: Wed Dec 03 13:40:10 PST 2003 >Closed-Date: >Last-Modified: >Originator: Rui Lopes >Release: FreeBSD 5.1-RELEASE-p10 i386 >Organization: >Environment: System: FreeBSD cheetah 5.1-RELEASE-p10 FreeBSD 5.1-RELEASE-p10 #3: Sat Oct 11 19:39:45 WEST 2003 root@cheetah:/usr/obj/usr/src/sys/DEBUGGER i386 >Description: * Update to 0.9.1 >How-To-Repeat: >Fix: --- meld.diff begins here --- diff -u meld.orig/Makefile meld/Makefile --- meld.orig/Makefile Sat Nov 22 18:24:15 2003 +++ meld/Makefile Sat Nov 22 23:59:46 2003 @@ -6,7 +6,7 @@ # PORTNAME= meld -PORTVERSION= 0.8.5 +PORTVERSION= 0.9.1 CATEGORIES= textproc devel python MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= meld @@ -21,32 +21,21 @@ USE_X_PREFIX= yes NO_BUILD= yes USE_REINPLACE= yes +USE_GMAKE= yes + +MAKEFILE= GNUmakefile post-patch: - @${REINPLACE_CMD} -e 's|os.path.dirname(sys.argv\[0\])|"${INSTALLDIR}"|' ${WRKSRC}/misc.py - @${REINPLACE_CMD} -e 's|/"+os.path.abspath(misc.appdir("manual/index.html") )|${DOCSDIR}/index.html"|' ${WRKSRC}/meldapp.py - @${REINPLACE_CMD} -e 's|^Path=.*$$|Icon=${INSTALLDIR}/glade2/pixmaps/icon.png|' ${WRKSRC}/meld.desktop - -INSTALLDIR= ${PREFIX}/share/meld -do-install: - ${MKDIR} ${INSTALLDIR} - ${INSTALL_SCRIPT} ${WRKSRC}/meld ${INSTALLDIR} - ${LN} -sf ${INSTALLDIR}/meld ${PREFIX}/bin/meld - ${INSTALL_DATA} ${WRKSRC}/meld.desktop ${PREFIX}/share/gnome/applications - ${INSTALL_DATA} ${WRKSRC}/*.py ${INSTALLDIR} - ${MKDIR} ${INSTALLDIR}/glade2 - ${INSTALL_DATA} ${WRKSRC}/glade2/*.glade ${INSTALLDIR}/glade2 - ${MKDIR} ${INSTALLDIR}/glade2/pixmaps - ${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.png ${INSTALLDIR}/glade2/pixmaps - ${INSTALL_DATA} ${WRKSRC}/glade2/pixmaps/*.xpm ${INSTALLDIR}/glade2/pixmaps -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/manual/*.html ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/manual/*.css ${DOCSDIR} -.endif + @${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 post-install: - @cd ${INSTALLDIR} && \ + ${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)" .include diff -u meld.orig/distinfo meld/distinfo --- meld.orig/distinfo Sat Nov 22 18:24:15 2003 +++ meld/distinfo Sat Nov 22 18:26:55 2003 @@ -1 +1 @@ -MD5 (meld-0.8.5.tgz) = 463553f70bda8c400843fd34270de2fd +MD5 (meld-0.9.1.tgz) = 1dfd1205c405bc263fc49ea1d92d47bf diff -u meld.orig/pkg-plist meld/pkg-plist --- meld.orig/pkg-plist Sat Nov 22 18:24:15 2003 +++ meld/pkg-plist Sat Nov 22 23:52:11 2003 @@ -10,13 +10,14 @@ share/meld/filediff.pyc share/meld/gnomeglade.py share/meld/gnomeglade.pyc -share/meld/meld 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 @@ -25,6 +26,8 @@ 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/glade2/cvsview.glade share/meld/glade2/dirdiff.glade share/meld/glade2/filediff.glade @@ -49,9 +52,11 @@ share/meld/glade2/pixmaps/tree-folder-changed.png share/meld/glade2/pixmaps/tree-folder-new.png share/meld/glade2/pixmaps/tree-folder-normal.png -%%PORTDOCS%%%%DOCSDIR%%/index.html -%%PORTDOCS%%%%DOCSDIR%%/stylesheet.css -%%PORTDOCS%%@dirrm %%DOCSDIR%% +%%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 @dirrm share/meld/glade2/pixmaps @dirrm share/meld/glade2 @dirrm share/meld --- meld.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: