From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 15 17:10:18 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org 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 6378F16A405 for ; Sat, 15 Apr 2006 17:10:18 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2063843D4C for ; Sat, 15 Apr 2006 17:10:14 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k3FHADUt064656 for ; Sat, 15 Apr 2006 17:10:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3FHADZS064655; Sat, 15 Apr 2006 17:10:13 GMT (envelope-from gnats) Resent-Date: Sat, 15 Apr 2006 17:10:13 GMT Resent-Message-Id: <200604151710.k3FHADZS064655@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, KATO Tsuguru Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 2ED8C16A402 for ; Sat, 15 Apr 2006 17:00:47 +0000 (UTC) (envelope-from tkato432@yahoo.com) Received: from nm05omta057.dion.ne.jp (nm05mta.dion.ne.jp [219.125.112.8]) by mx1.FreeBSD.org (Postfix) with SMTP id 7F57443D46 for ; Sat, 15 Apr 2006 17:00:46 +0000 (GMT) (envelope-from tkato432@yahoo.com) Received: from localhost ([61.198.208.93]) by nm05mta.dion.ne.jp id <20060416020041511.MA72.830E268@nm05mta.dion.ne.jp>; Sun, 16 Apr 2006 02:00:41 +0900 Message-Id: <20060416020008.eb71067d.tkato432@yahoo.com> Date: Sun, 16 Apr 2006 02:00:08 +0900 From: KATO Tsuguru To: FreeBSD-gnats-submit@FreeBSD.org Cc: Subject: ports/95812: Update port: audio/denemo to 0.7.5 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: Sat, 15 Apr 2006 17:10:18 -0000 >Number: 95812 >Category: ports >Synopsis: Update port: audio/denemo to 0.7.5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sat Apr 15 17:10:13 GMT 2006 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: FreeBSD 4.11-RELEASE-p15 i386 >Organization: >Environment: >Description: - Update to version 0.7.5 Remove file: files/patch-src__help.cpp >How-To-Repeat: >Fix: diff -urN /usr/ports/audio/denemo/Makefile audio/denemo/Makefile --- /usr/ports/audio/denemo/Makefile Thu Feb 23 13:30:03 2006 +++ audio/denemo/Makefile Sat Apr 15 21:52:00 2006 @@ -6,7 +6,7 @@ # PORTNAME= denemo -PORTVERSION= 0.7.4 +PORTVERSION= 0.7.5 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -16,6 +16,7 @@ USE_X_PREFIX= yes USE_GNOME= gnometarget gtk20 libxml2 +USE_GCC= 3.4+ USE_BISON= yes USE_GETTEXT= yes USE_GETOPT_LONG= yes @@ -32,14 +33,13 @@ .endif post-patch: - @${REINPLACE_CMD} -e 's|CXXFLAGS="$$CFLAGS|CXXFLAGS="$$DENEMO_CFLAGS|g' \ - -e 's|-Wall -O2|-Wall $$CXXFLAGS|g' ${WRKSRC}/configure - @${REINPLACE_CMD} -e "s|denemo/denemo|denemo|g" ${WRKSRC}/src/kbd-custom.cpp - @${REINPLACE_CMD} -e "s|^setkey|dsetkey|g" ${WRKSRC}/src/lyparserfuncs.cpp - @${REINPLACE_CMD} -e "s| setkey| dsetkey|g" ${WRKSRC}/src/lyparserfuncs.h - @${REINPLACE_CMD} -e "s|malloc.h|stdlib.h|g" ${WRKSRC}/m4/gettext.m4 \ - ${WRKSRC}/ltmain.sh ${WRKSRC}/src/file.cpp ${WRKSRC}/src/lyparser.cpp \ - ${WRKSRC}/src/lyparser.y + @${GREP} -lR "" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \ + 's|||g' + @${REINPLACE_CMD} -e \ + 's|CXXFLAGS="$$CFLAGS|CXXFLAGS="$$DENEMO_CFLAGS|g ; \ + s|-Wall -O2|-Wall $$CXXFLAGS|g' ${WRKSRC}/configure + @${REINPLACE_CMD} -e \ + 's|/icons|/pixmaps|g' ${WRKSRC}/pixmaps/Makefile.in post-install: .if !defined(NOPORTDOCS) diff -urN /usr/ports/audio/denemo/distinfo audio/denemo/distinfo --- /usr/ports/audio/denemo/distinfo Thu Feb 23 13:30:03 2006 +++ audio/denemo/distinfo Sat Apr 15 17:30:09 2006 @@ -1,3 +1,3 @@ -MD5 (denemo-0.7.4.tar.gz) = 5a5680b2dab63a6217c0ab7c30be0730 -SHA256 (denemo-0.7.4.tar.gz) = ec531bf4199142314b87e4a37abe6e89ee3bd4819674230cfe2cd8b8bf7a7cc6 -SIZE (denemo-0.7.4.tar.gz) = 2712658 +MD5 (denemo-0.7.5.tar.gz) = 2975d77d8fdfb2a8848e9b49ff28643f +SHA256 (denemo-0.7.5.tar.gz) = 5a8fd401c7ddc1a78d61dfc3b250ba7c9ec2a12c702fc8269a7058154bf9ff3b +SIZE (denemo-0.7.5.tar.gz) = 2722340 diff -urN /usr/ports/audio/denemo/files/patch-src__help.cpp audio/denemo/files/patch-src__help.cpp --- /usr/ports/audio/denemo/files/patch-src__help.cpp Thu Feb 23 06:49:01 2006 +++ audio/denemo/files/patch-src__help.cpp Thu Jan 1 09:00:00 1970 @@ -1,28 +0,0 @@ ---- src/help.cpp.orig Fri Oct 28 06:18:00 2005 -+++ src/help.cpp Tue Feb 21 23:23:26 2006 -@@ -46,20 +46,21 @@ - void - browse_manual (GtkAction * action, gpointer data) - { -- gchar *browser = "sensible-browser"; -+ struct scoreinfo *si= (struct scoreinfo *)data; -+ - gint retval; - // struct scoreinfo *si; - GError *error = NULL; - gchar **argv; - gchar *cmd; - gchar *data_dir = gbr_find_data_dir (PKGDATADIR); -- gchar *path = g_strdup_printf("%s/denemo/manual/manualout.html", data_dir); -+ gchar *path = g_strdup_printf("file://%s/manual/manualout.html", data_dir); - gchar *argument = g_shell_quote(path); - - -- g_print("PKGDATADIR %s\n", PKGDATADIR); -+ //g_print("PKGDATADIR %s\n", PKGDATADIR); - -- cmd = g_strconcat (browser, " ", argument, NULL); -+ cmd = g_strconcat (si->prefs->browser->str, " ", argument, NULL); - g_free(argument); - if (! g_shell_parse_argv(cmd, NULL, &argv, &error)) - { diff -urN /usr/ports/audio/denemo/pkg-plist audio/denemo/pkg-plist --- /usr/ports/audio/denemo/pkg-plist Thu Feb 23 06:49:01 2006 +++ audio/denemo/pkg-plist Sat Apr 15 18:42:47 2006 @@ -1,18 +1,29 @@ bin/denemo -etc/denemo.conf -etc/denemo.keymaprc include/denemo/denemo.h +include/denemo/denemo_objects.h include/denemo/denemo_version.h +share/applications/denemo.desktop +%%DATADIR%%/denemo.conf +%%DATADIR%%/denemo.keymaprc +%%DATADIR%%/denemorc.xml %%DATADIR%%/denemoui.xml %%DATADIR%%/english.keymaprc %%DATADIR%%/french.keymaprc +%%DATADIR%%/instruments.xml %%DATADIR%%/italian.keymaprc %%DATADIR%%/manual/4fo2denemo.png +%%DATADIR%%/manual/4for2.abc +%%DATADIR%%/manual/4for2.ly %%DATADIR%%/manual/4for2abc.png %%DATADIR%%/manual/4for2abcps.png %%DATADIR%%/manual/4for2ly.png %%DATADIR%%/manual/4for2new-page1.png %%DATADIR%%/manual/4for2new-page2.png +%%DATADIR%%/manual/4for2new.dvi +%%DATADIR%%/manual/4for2new.ly +%%DATADIR%%/manual/4for2new.midi +%%DATADIR%%/manual/4for2new.pdf +%%DATADIR%%/manual/4for2new.ps %%DATADIR%%/manual/4for2touchedly.png %%DATADIR%%/manual/MozBook.css %%DATADIR%%/manual/addvc2currentstaff.png @@ -20,6 +31,7 @@ %%DATADIR%%/manual/choraltemplate1.png %%DATADIR%%/manual/churchtemplate2.png %%DATADIR%%/manual/clefmenu.png +%%DATADIR%%/manual/denemo-manual.html %%DATADIR%%/manual/denemomain.png %%DATADIR%%/manual/displaymenu.png %%DATADIR%%/manual/docbook-complete.css @@ -35,7 +47,7 @@ %%DATADIR%%/manual/keymenu.png %%DATADIR%%/manual/lpmode.png %%DATADIR%%/manual/manual.xml -%%DATADIR%%/manual/manualout.html +%%DATADIR%%/manual/mycustomfils.xsl %%DATADIR%%/manual/navigationmenu.png %%DATADIR%%/manual/orchestraltemplate5.png %%DATADIR%%/manual/othermenu1.png @@ -179,7 +191,6 @@ %%DATADIR%%/pixmaps/turn.svg %%DATADIR%%/pixmaps/upbow.svg %%DATADIR%%/speedy.keymaprc -%%DATADIR%%/templates/Brassband.denemo %%DATADIR%%/templates/Brassbandtemplate.denemo %%DATADIR%%/templates/brasschoir.template.denemo %%DATADIR%%/templates/brasstrio.template.denemo @@ -195,9 +206,12 @@ share/locale/es/LC_MESSAGES/denemo.mo share/locale/fr/LC_MESSAGES/denemo.mo share/locale/sv/LC_MESSAGES/denemo.mo +share/pixmaps/denemo.png @dirrm %%DATADIR%%/templates @dirrm %%DATADIR%%/pixmaps @dirrm %%DATADIR%%/manual @dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%% @dirrm include/denemo +@dirrmtry share/applications +@dirrmtry share/pixmaps >Release-Note: >Audit-Trail: >Unformatted: