Attachment #64432 for bug #95812

View | Details | Raw Unified | Return to bug 95812
Collapse All | Expand All




#

PORTNAME=	denemo
PORTVERSION=	0.7.5
CATEGORIES=	audio
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}


USE_X_PREFIX=	yes
USE_GNOME=	gnometarget gtk20 libxml2
USE_GCC=	3.4+
USE_BISON=	yes
USE_GETTEXT=	yes
USE_GETOPT_LONG=	yes

.endif

post-patch:
	@${GREP} -lR "<malloc.h>" ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
		's|<malloc\.h>|<stdlib.h>|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
		${WRKSRC}/src/lyparser.y

post-install:
.if !defined(NOPORTDOCS)

Lines 1-3 Link Here

(-)audio/denemo/distinfo (-3 / +3 lines)
1	MD5 (denemo-0.7.4.tar.gz) = 5a5680b2dab63a6217c0ab7c30be0730	1	MD5 (denemo-0.7.5.tar.gz) = 2975d77d8fdfb2a8848e9b49ff28643f
2	SHA256 (denemo-0.7.4.tar.gz) = ec531bf4199142314b87e4a37abe6e89ee3bd4819674230cfe2cd8b8bf7a7cc6	2	SHA256 (denemo-0.7.5.tar.gz) = 5a8fd401c7ddc1a78d61dfc3b250ba7c9ec2a12c702fc8269a7058154bf9ff3b
3	SIZE (denemo-0.7.4.tar.gz) = 2712658	3	SIZE (denemo-0.7.5.tar.gz) = 2722340




--- 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)) 
     {

Lines 1-18 Link Here

(-)audio/denemo/pkg-plist (-4 / +18 lines)
1	bin/denemo	1	bin/denemo
2	etc/denemo.conf
3	etc/denemo.keymaprc
4	include/denemo/denemo.h	2	include/denemo/denemo.h
		3	include/denemo/denemo_objects.h
5	include/denemo/denemo_version.h	4	include/denemo/denemo_version.h
		5	share/applications/denemo.desktop
		6	%%DATADIR%%/denemo.conf
		7	%%DATADIR%%/denemo.keymaprc
		8	%%DATADIR%%/denemorc.xml
6	%%DATADIR%%/denemoui.xml	9	%%DATADIR%%/denemoui.xml
7	%%DATADIR%%/english.keymaprc	10	%%DATADIR%%/english.keymaprc
8	%%DATADIR%%/french.keymaprc	11	%%DATADIR%%/french.keymaprc
		12	%%DATADIR%%/instruments.xml
9	%%DATADIR%%/italian.keymaprc	13	%%DATADIR%%/italian.keymaprc
10	%%DATADIR%%/manual/4fo2denemo.png	14	%%DATADIR%%/manual/4fo2denemo.png
		15	%%DATADIR%%/manual/4for2.abc
		16	%%DATADIR%%/manual/4for2.ly
11	%%DATADIR%%/manual/4for2abc.png	17	%%DATADIR%%/manual/4for2abc.png
12	%%DATADIR%%/manual/4for2abcps.png	18	%%DATADIR%%/manual/4for2abcps.png
13	%%DATADIR%%/manual/4for2ly.png	19	%%DATADIR%%/manual/4for2ly.png
14	%%DATADIR%%/manual/4for2new-page1.png	20	%%DATADIR%%/manual/4for2new-page1.png
15	%%DATADIR%%/manual/4for2new-page2.png	21	%%DATADIR%%/manual/4for2new-page2.png
		22	%%DATADIR%%/manual/4for2new.dvi
		23	%%DATADIR%%/manual/4for2new.ly
		24	%%DATADIR%%/manual/4for2new.midi
		25	%%DATADIR%%/manual/4for2new.pdf
		26	%%DATADIR%%/manual/4for2new.ps
16	%%DATADIR%%/manual/4for2touchedly.png	27	%%DATADIR%%/manual/4for2touchedly.png
17	%%DATADIR%%/manual/MozBook.css	28	%%DATADIR%%/manual/MozBook.css
18	%%DATADIR%%/manual/addvc2currentstaff.png	29	%%DATADIR%%/manual/addvc2currentstaff.png
Lines 20-25 Link Here
20	%%DATADIR%%/manual/choraltemplate1.png	31	%%DATADIR%%/manual/choraltemplate1.png
21	%%DATADIR%%/manual/churchtemplate2.png	32	%%DATADIR%%/manual/churchtemplate2.png
22	%%DATADIR%%/manual/clefmenu.png	33	%%DATADIR%%/manual/clefmenu.png
		34	%%DATADIR%%/manual/denemo-manual.html
23	%%DATADIR%%/manual/denemomain.png	35	%%DATADIR%%/manual/denemomain.png
24	%%DATADIR%%/manual/displaymenu.png	36	%%DATADIR%%/manual/displaymenu.png
25	%%DATADIR%%/manual/docbook-complete.css	37	%%DATADIR%%/manual/docbook-complete.css
Lines 35-41 Link Here
35	%%DATADIR%%/manual/keymenu.png	47	%%DATADIR%%/manual/keymenu.png
36	%%DATADIR%%/manual/lpmode.png	48	%%DATADIR%%/manual/lpmode.png
37	%%DATADIR%%/manual/manual.xml	49	%%DATADIR%%/manual/manual.xml
38	%%DATADIR%%/manual/manualout.html	50	%%DATADIR%%/manual/mycustomfils.xsl
39	%%DATADIR%%/manual/navigationmenu.png	51	%%DATADIR%%/manual/navigationmenu.png
40	%%DATADIR%%/manual/orchestraltemplate5.png	52	%%DATADIR%%/manual/orchestraltemplate5.png
41	%%DATADIR%%/manual/othermenu1.png	53	%%DATADIR%%/manual/othermenu1.png
Lines 179-185 Link Here
179	%%DATADIR%%/pixmaps/turn.svg	191	%%DATADIR%%/pixmaps/turn.svg
180	%%DATADIR%%/pixmaps/upbow.svg	192	%%DATADIR%%/pixmaps/upbow.svg
181	%%DATADIR%%/speedy.keymaprc	193	%%DATADIR%%/speedy.keymaprc
182	%%DATADIR%%/templates/Brassband.denemo
183	%%DATADIR%%/templates/Brassbandtemplate.denemo	194	%%DATADIR%%/templates/Brassbandtemplate.denemo
184	%%DATADIR%%/templates/brasschoir.template.denemo	195	%%DATADIR%%/templates/brasschoir.template.denemo
185	%%DATADIR%%/templates/brasstrio.template.denemo	196	%%DATADIR%%/templates/brasstrio.template.denemo
Lines 195-203 Link Here
195	share/locale/es/LC_MESSAGES/denemo.mo	206	share/locale/es/LC_MESSAGES/denemo.mo
196	share/locale/fr/LC_MESSAGES/denemo.mo	207	share/locale/fr/LC_MESSAGES/denemo.mo
197	share/locale/sv/LC_MESSAGES/denemo.mo	208	share/locale/sv/LC_MESSAGES/denemo.mo
		209	share/pixmaps/denemo.png
198	@dirrm %%DATADIR%%/templates	210	@dirrm %%DATADIR%%/templates
199	@dirrm %%DATADIR%%/pixmaps	211	@dirrm %%DATADIR%%/pixmaps
200	@dirrm %%DATADIR%%/manual	212	@dirrm %%DATADIR%%/manual
201	@dirrm %%DATADIR%%	213	@dirrm %%DATADIR%%
202	%%PORTDOCS%%@dirrm %%DOCSDIR%%	214	%%PORTDOCS%%@dirrm %%DOCSDIR%%
203	@dirrm include/denemo	215	@dirrm include/denemo
		216	@dirrmtry share/applications
		217	@dirrmtry share/pixmaps

Return to bug 95812

Lines 6-12 Link Here

(-)audio/denemo/Makefile (-9 / +9 lines)
6	#	6	#
7		7
8	PORTNAME= denemo	8	PORTNAME= denemo
9	PORTVERSION= 0.7.4	9	PORTVERSION= 0.7.5
10	CATEGORIES= audio	10	CATEGORIES= audio
11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	MASTER_SITE_SUBDIR= ${PORTNAME}	12	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 16-21 Link Here
16		16
17	USE_X_PREFIX= yes	17	USE_X_PREFIX= yes
18	USE_GNOME= gnometarget gtk20 libxml2	18	USE_GNOME= gnometarget gtk20 libxml2
		19	USE_GCC= 3.4+
19	USE_BISON= yes	20	USE_BISON= yes
20	USE_GETTEXT= yes	21	USE_GETTEXT= yes
21	USE_GETOPT_LONG= yes	22	USE_GETOPT_LONG= yes
Lines 32-45 Link Here
32	.endif	33	.endif
33		34
34	post-patch:	35	post-patch:
35	@${REINPLACE_CMD} -e 's\|CXXFLAGS="$$CFLAGS\|CXXFLAGS="$$DENEMO_CFLAGS\|g' \	36	@${GREP} -lR "<malloc.h>" ${WRKSRC} \| ${XARGS} ${REINPLACE_CMD} -e \
36	-e 's\|-Wall -O2\|-Wall $$CXXFLAGS\|g' ${WRKSRC}/configure	37	's\|<malloc\.h>\|<stdlib.h>\|g'
37	@${REINPLACE_CMD} -e "s\|denemo/denemo\|denemo\|g" ${WRKSRC}/src/kbd-custom.cpp	38	@${REINPLACE_CMD} -e \
38	@${REINPLACE_CMD} -e "s\|^setkey\|dsetkey\|g" ${WRKSRC}/src/lyparserfuncs.cpp	39	's\|CXXFLAGS="$$CFLAGS\|CXXFLAGS="$$DENEMO_CFLAGS\|g ; \
39	@${REINPLACE_CMD} -e "s\| setkey\| dsetkey\|g" ${WRKSRC}/src/lyparserfuncs.h	40	s\|-Wall -O2\|-Wall $$CXXFLAGS\|g' ${WRKSRC}/configure
40	@${REINPLACE_CMD} -e "s\|malloc.h\|stdlib.h\|g" ${WRKSRC}/m4/gettext.m4 \	41	@${REINPLACE_CMD} -e \
41	${WRKSRC}/ltmain.sh ${WRKSRC}/src/file.cpp ${WRKSRC}/src/lyparser.cpp \	42	's\|/icons\|/pixmaps\|g' ${WRKSRC}/pixmaps/Makefile.in
42	${WRKSRC}/src/lyparser.y
43		43
44	post-install:	44	post-install:
45	.if !defined(NOPORTDOCS)	45	.if !defined(NOPORTDOCS)

Lines 1-28 Link Here

(-)audio/denemo/files/patch-src__help.cpp (-28 lines)
1	--- src/help.cpp.orig Fri Oct 28 06:18:00 2005
2	+++ src/help.cpp Tue Feb 21 23:23:26 2006
3	@@ -46,20 +46,21 @@
4	void
5	browse_manual (GtkAction * action, gpointer data)
6	{
7	- gchar *browser = "sensible-browser";
8	+ struct scoreinfo si= (struct scoreinfo )data;
9	+
10	gint retval;
11	// struct scoreinfo *si;
12	GError *error = NULL;
13	gchar **argv;
14	gchar *cmd;
15	gchar *data_dir = gbr_find_data_dir (PKGDATADIR);
16	- gchar *path = g_strdup_printf("%s/denemo/manual/manualout.html", data_dir);
17	+ gchar *path = g_strdup_printf("file://%s/manual/manualout.html", data_dir);
18	gchar *argument = g_shell_quote(path);
19
20
21	- g_print("PKGDATADIR %s\n", PKGDATADIR);
22	+ //g_print("PKGDATADIR %s\n", PKGDATADIR);
23
24	- cmd = g_strconcat (browser, " ", argument, NULL);
25	+ cmd = g_strconcat (si->prefs->browser->str, " ", argument, NULL);
26	g_free(argument);
27	if (! g_shell_parse_argv(cmd, NULL, &argv, &error))
28	{