Index: head/audio/denemo/Makefile =================================================================== --- head/audio/denemo/Makefile (revision 161353) +++ head/audio/denemo/Makefile (revision 161354) @@ -1,52 +1,59 @@ # New ports collection makefile for: denemo # Date created: 2001-02-24 # Whom: trevor # # $FreeBSD$ # PORTNAME= denemo -PORTVERSION= 0.7.4 +PORTVERSION= 0.7.5 CATEGORIES= audio MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Graphical score editor USE_X_PREFIX= yes USE_GNOME= gnometarget gtk20 libxml2 +USE_GCC= 3.4+ USE_BISON= yes -USE_GETTEXT= yes USE_GETOPT_LONG= yes GNU_CONFIGURE= yes CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" -CPPFLAGS= -I${LOCALBASE}/include +CPPFLAGS= ${CFLAGS} -I${LOCALBASE}/include LDFLAGS= -L${LOCALBASE}/lib .include .if ${ARCH} == "sparc64" BROKEN= does not compile on sparc64 .endif +.if defined(WITHOUT_NLS) +CONFIGURE_ARGS+=--disable-nls +PLIST_SUB+= NLS="@comment " +.else +USE_GETTEXT= yes +PLIST_SUB+= NLS="" +.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) @${MKDIR} ${DOCSDIR} .for i in AUTHORS ChangeLog DESIGN GOALS NEWS README TODO ${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR} .endfor .endif .include Property changes on: head/audio/denemo/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.23 \ No newline at end of property +1.24 \ No newline at end of property Index: head/audio/denemo/distinfo =================================================================== --- head/audio/denemo/distinfo (revision 161353) +++ head/audio/denemo/distinfo (revision 161354) @@ -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 Property changes on: head/audio/denemo/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/audio/denemo/files/patch-src__help.cpp =================================================================== --- head/audio/denemo/files/patch-src__help.cpp (revision 161353) +++ head/audio/denemo/files/patch-src__help.cpp (nonexistent) @@ -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)) - { Property changes on: head/audio/denemo/files/patch-src__help.cpp ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/audio/denemo/files/patch-configure =================================================================== --- head/audio/denemo/files/patch-configure (nonexistent) +++ head/audio/denemo/files/patch-configure (revision 161354) @@ -0,0 +1,11 @@ +--- ./configure.orig Thu Mar 16 17:32:54 2006 ++++ ./configure Thu May 4 14:45:01 2006 +@@ -1708,7 +1708,7 @@ + echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;} + fi + +-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then ++if mkdir -p -- --version >/dev/null 2>&1 && test -d ./--version; then + # We used to keeping the `.' as first argument, in order to + # allow $(mkdir_p) to be used without argument. As in + # $(mkdir_p) $(somedir) Property changes on: head/audio/denemo/files/patch-configure ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/audio/denemo/pkg-plist =================================================================== --- head/audio/denemo/pkg-plist (revision 161353) +++ head/audio/denemo/pkg-plist (revision 161354) @@ -1,203 +1,216 @@ 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 %%DATADIR%%/manual/bandtemplate.png %%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 %%DATADIR%%/manual/educationtemplate3.png %%DATADIR%%/manual/featest.html %%DATADIR%%/manual/fig1.png %%DATADIR%%/manual/fig3.png %%DATADIR%%/manual/filemenu.png %%DATADIR%%/manual/function.xml %%DATADIR%%/manual/functionaaron.xml %%DATADIR%%/manual/functionout.html %%DATADIR%%/manual/generaltemplate4.png %%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 %%DATADIR%%/manual/playbackmenu.png %%DATADIR%%/manual/polyphony.png %%DATADIR%%/manual/setpreferences.png %%DATADIR%%/manual/staffmenu.png %%DATADIR%%/manual/tablituretemplate6.png %%DATADIR%%/manual/timemenu.png %%DATADIR%%/pixmaps/accent.svg %%DATADIR%%/pixmaps/downbow.svg %%DATADIR%%/pixmaps/fermata.svg %%DATADIR%%/pixmaps/feta26-accidentals--1.xbm %%DATADIR%%/pixmaps/feta26-accidentals--2.xbm %%DATADIR%%/pixmaps/feta26-accidentals-0.xbm %%DATADIR%%/pixmaps/feta26-accidentals-1.xbm %%DATADIR%%/pixmaps/feta26-accidentals-2.xbm %%DATADIR%%/pixmaps/feta26-accidentals-leftparen.xbm %%DATADIR%%/pixmaps/feta26-accidentals-rightparen.xbm %%DATADIR%%/pixmaps/feta26-clefs-alto.xbm %%DATADIR%%/pixmaps/feta26-clefs-alto_change.xbm %%DATADIR%%/pixmaps/feta26-clefs-bass.xbm %%DATADIR%%/pixmaps/feta26-clefs-bass_change.xbm %%DATADIR%%/pixmaps/feta26-clefs-g_8.xbm %%DATADIR%%/pixmaps/feta26-clefs-treble.xbm %%DATADIR%%/pixmaps/feta26-clefs-treble_change.xbm %%DATADIR%%/pixmaps/feta26-dots-dot.xbm %%DATADIR%%/pixmaps/feta26-dots-repeatcolon.xbm %%DATADIR%%/pixmaps/feta26-flags-d3.xbm %%DATADIR%%/pixmaps/feta26-flags-d4.xbm %%DATADIR%%/pixmaps/feta26-flags-d5.xbm %%DATADIR%%/pixmaps/feta26-flags-d6.xbm %%DATADIR%%/pixmaps/feta26-flags-dgrace.xbm %%DATADIR%%/pixmaps/feta26-flags-u3.xbm %%DATADIR%%/pixmaps/feta26-flags-u4.xbm %%DATADIR%%/pixmaps/feta26-flags-u5.xbm %%DATADIR%%/pixmaps/feta26-flags-u6.xbm %%DATADIR%%/pixmaps/feta26-flags-ugrace.xbm %%DATADIR%%/pixmaps/feta26-noteheads--1.xbm %%DATADIR%%/pixmaps/feta26-noteheads--2.xbm %%DATADIR%%/pixmaps/feta26-noteheads-0.xbm %%DATADIR%%/pixmaps/feta26-noteheads-0diamond.xbm %%DATADIR%%/pixmaps/feta26-noteheads-1.xbm %%DATADIR%%/pixmaps/feta26-noteheads-1diamond.xbm %%DATADIR%%/pixmaps/feta26-noteheads-2.xbm %%DATADIR%%/pixmaps/feta26-noteheads-2cross.xbm %%DATADIR%%/pixmaps/feta26-noteheads-2diamond.xbm %%DATADIR%%/pixmaps/feta26-noteheads-2harmonic.xbm %%DATADIR%%/pixmaps/feta26-noteheads-ledgerending.xbm %%DATADIR%%/pixmaps/feta26-rests--1.xbm %%DATADIR%%/pixmaps/feta26-rests--2.xbm %%DATADIR%%/pixmaps/feta26-rests--4.xbm %%DATADIR%%/pixmaps/feta26-rests-0.xbm %%DATADIR%%/pixmaps/feta26-rests-0o.xbm %%DATADIR%%/pixmaps/feta26-rests-1.xbm %%DATADIR%%/pixmaps/feta26-rests-1o.xbm %%DATADIR%%/pixmaps/feta26-rests-2.xbm %%DATADIR%%/pixmaps/feta26-rests-2mensural.xbm %%DATADIR%%/pixmaps/feta26-rests-3.xbm %%DATADIR%%/pixmaps/feta26-rests-3mensural.xbm %%DATADIR%%/pixmaps/feta26-rests-4.xbm %%DATADIR%%/pixmaps/feta26-rests-4mensural.xbm %%DATADIR%%/pixmaps/feta26-rests-5.xbm %%DATADIR%%/pixmaps/feta26-rests-6.xbm %%DATADIR%%/pixmaps/feta26-rests-7.xbm %%DATADIR%%/pixmaps/feta26-scripts-accent.xbm %%DATADIR%%/pixmaps/feta26-scripts-arpeggio.xbm %%DATADIR%%/pixmaps/feta26-scripts-coda.xbm %%DATADIR%%/pixmaps/feta26-scripts-dfermata.xbm %%DATADIR%%/pixmaps/feta26-scripts-dmarcato.xbm %%DATADIR%%/pixmaps/feta26-scripts-downbow.xbm %%DATADIR%%/pixmaps/feta26-scripts-downprall.xbm %%DATADIR%%/pixmaps/feta26-scripts-dpedalheel.xbm %%DATADIR%%/pixmaps/feta26-scripts-dpedaltoe.xbm %%DATADIR%%/pixmaps/feta26-scripts-dstaccatissimo.xbm %%DATADIR%%/pixmaps/feta26-scripts-flageolet.xbm %%DATADIR%%/pixmaps/feta26-scripts-mordent.xbm %%DATADIR%%/pixmaps/feta26-scripts-open.xbm %%DATADIR%%/pixmaps/feta26-scripts-prall.xbm %%DATADIR%%/pixmaps/feta26-scripts-prallmordent.xbm %%DATADIR%%/pixmaps/feta26-scripts-prallprall.xbm %%DATADIR%%/pixmaps/feta26-scripts-repeatsign.xbm %%DATADIR%%/pixmaps/feta26-scripts-reverseturn.xbm %%DATADIR%%/pixmaps/feta26-scripts-segno.xbm %%DATADIR%%/pixmaps/feta26-scripts-sforzato.xbm %%DATADIR%%/pixmaps/feta26-scripts-staccato.xbm %%DATADIR%%/pixmaps/feta26-scripts-stopped.xbm %%DATADIR%%/pixmaps/feta26-scripts-tenuto.xbm %%DATADIR%%/pixmaps/feta26-scripts-thumb.xbm %%DATADIR%%/pixmaps/feta26-scripts-trilelement.xbm %%DATADIR%%/pixmaps/feta26-scripts-trill-element.xbm %%DATADIR%%/pixmaps/feta26-scripts-trill.xbm %%DATADIR%%/pixmaps/feta26-scripts-turn.xbm %%DATADIR%%/pixmaps/feta26-scripts-ufermata.xbm %%DATADIR%%/pixmaps/feta26-scripts-umarcato.xbm %%DATADIR%%/pixmaps/feta26-scripts-upbow.xbm %%DATADIR%%/pixmaps/feta26-scripts-upedalheel.xbm %%DATADIR%%/pixmaps/feta26-scripts-upedaltoe.xbm %%DATADIR%%/pixmaps/feta26-scripts-upprall.xbm %%DATADIR%%/pixmaps/feta26-scripts-ustaccatissimo.xbm %%DATADIR%%/pixmaps/feta26-timesig-C2-2.xbm %%DATADIR%%/pixmaps/feta26-timesig-C4-4.xbm %%DATADIR%%/pixmaps/feta26-timesig-old2-2.xbm %%DATADIR%%/pixmaps/feta26-timesig-old2-4.xbm %%DATADIR%%/pixmaps/feta26-timesig-old3-2.xbm %%DATADIR%%/pixmaps/feta26-timesig-old3-4.xbm %%DATADIR%%/pixmaps/feta26-timesig-old4-4.xbm %%DATADIR%%/pixmaps/feta26-timesig-old4-8.xbm %%DATADIR%%/pixmaps/feta26-timesig-old6-4.xbm %%DATADIR%%/pixmaps/feta26-timesig-old6-8.xbm %%DATADIR%%/pixmaps/feta26-timesig-old6-8alt.xbm %%DATADIR%%/pixmaps/feta26-timesig-old9-4.xbm %%DATADIR%%/pixmaps/feta26-timesig-old9-8.xbm %%DATADIR%%/pixmaps/icon-note-0.svg %%DATADIR%%/pixmaps/icon-note-1.svg %%DATADIR%%/pixmaps/icon-note-2.svg %%DATADIR%%/pixmaps/icon-note-3.svg %%DATADIR%%/pixmaps/icon-note-4.svg %%DATADIR%%/pixmaps/icon-rest-0.svg %%DATADIR%%/pixmaps/icon-rest-1.svg %%DATADIR%%/pixmaps/icon-rest-2.svg %%DATADIR%%/pixmaps/icon-rest-3.svg %%DATADIR%%/pixmaps/icon-rest-4.svg %%DATADIR%%/pixmaps/icon-rest-5.svg %%DATADIR%%/pixmaps/icon-template.svg %%DATADIR%%/pixmaps/lheel.svg %%DATADIR%%/pixmaps/ltoe.svg %%DATADIR%%/pixmaps/marcato.svg %%DATADIR%%/pixmaps/mordent.svg %%DATADIR%%/pixmaps/notehead-0.xbm %%DATADIR%%/pixmaps/notehead-1.xbm %%DATADIR%%/pixmaps/notehead-2.xbm %%DATADIR%%/pixmaps/reverse-turn.svg %%DATADIR%%/pixmaps/rheel.svg %%DATADIR%%/pixmaps/rtoe.svg %%DATADIR%%/pixmaps/staccatissimo.svg %%DATADIR%%/pixmaps/staccato.svg %%DATADIR%%/pixmaps/tenuto.svg %%DATADIR%%/pixmaps/toomany.xbm %%DATADIR%%/pixmaps/trill.svg %%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 %%DATADIR%%/templates/jazzcombo1.denemo %%DATADIR%%/templates/stringqtet.denemo %%PORTDOCS%%%%DOCSDIR%%/AUTHORS %%PORTDOCS%%%%DOCSDIR%%/ChangeLog %%PORTDOCS%%%%DOCSDIR%%/DESIGN %%PORTDOCS%%%%DOCSDIR%%/GOALS %%PORTDOCS%%%%DOCSDIR%%/NEWS %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/TODO -share/locale/es/LC_MESSAGES/denemo.mo -share/locale/fr/LC_MESSAGES/denemo.mo -share/locale/sv/LC_MESSAGES/denemo.mo +%%NLS%%share/locale/es/LC_MESSAGES/denemo.mo +%%NLS%%share/locale/fr/LC_MESSAGES/denemo.mo +%%NLS%%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 Property changes on: head/audio/denemo/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property