From 158cc73d0b03a145cff93e5dab7f7d8215143071 Mon Sep 17 00:00:00 2001 From: alepulver Date: Thu, 4 May 2006 18:38:40 +0000 Subject: - Update to version 0.7.5 [1]. - Remove file "files/patch-src__help.cpp" [1]. - Add WITHOUT_NLS support [2]. - Don't remove "share/pixmaps" [2]. - Respect CFLAGS [2]. - Fix building on 5.X and 6.X [2]. PR: ports/95812 [1] Submitted by: KATO Tsuguru [1] Reworked by: alepulver [2] Approved by: garga (mentor) --- audio/denemo/Makefile | 29 ++++++++++++++++++----------- audio/denemo/distinfo | 6 +++--- audio/denemo/files/patch-configure | 11 +++++++++++ audio/denemo/files/patch-src__help.cpp | 28 ---------------------------- audio/denemo/pkg-plist | 27 ++++++++++++++++++++------- 5 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 audio/denemo/files/patch-configure delete mode 100644 audio/denemo/files/patch-src__help.cpp diff --git a/audio/denemo/Makefile b/audio/denemo/Makefile index d984f11..2c778e5 100644 --- a/audio/denemo/Makefile +++ b/audio/denemo/Makefile @@ -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,13 +16,13 @@ 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 @@ -31,15 +31,22 @@ LDFLAGS= -L${LOCALBASE}/lib 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) diff --git a/audio/denemo/distinfo b/audio/denemo/distinfo index e474b30..b7bed50 100644 --- a/audio/denemo/distinfo +++ b/audio/denemo/distinfo @@ -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 --git a/audio/denemo/files/patch-configure b/audio/denemo/files/patch-configure new file mode 100644 index 0000000..b25ce26 --- /dev/null +++ b/audio/denemo/files/patch-configure @@ -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) diff --git a/audio/denemo/files/patch-src__help.cpp b/audio/denemo/files/patch-src__help.cpp deleted file mode 100644 index 9417b8c..0000000 --- a/audio/denemo/files/patch-src__help.cpp +++ /dev/null @@ -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 --git a/audio/denemo/pkg-plist b/audio/denemo/pkg-plist index e858f21..adc8e15 100644 --- a/audio/denemo/pkg-plist +++ b/audio/denemo/pkg-plist @@ -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 @@ include/denemo/denemo_version.h %%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 @@ include/denemo/denemo_version.h %%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 @@ include/denemo/denemo_version.h %%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 @@ -192,12 +203,14 @@ include/denemo/denemo_version.h %%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 -- cgit v1.1