Attachment #130283 for bug #174185





PORTNAME=	autozen
PORTVERSION=	2.1
PORTREVISION=	4
CATEGORIES=	audio
MASTER_SITES=	ftp://ftp.springdaemons.com/soft/ \
		http://www.sourcefiles.org/Miscellaneous/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Adjust brain waves with sound

LICENSE=	GPLv2

OPTIONS_DEFINE=	GTK2 DOCS

USES=		shebangfix
USE_GNOME=	gtk12
USE_PERL5_RUN=	yes
SHEBANG_FILES=	zentime
USE_PERL5_RUN=	yes

DESKTOP_ENTRIES="AutoZen" \
		"BrainWave Generator/Synchronizator" \
		"" \
		"${PORTNAME}" \
		"AudioVideo;Player;GTK;" \
		false

PORTDOCS=	*
MAN1=		autozen.1
PORTDOCS=	*

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MGTK2}
USES+=		pkgconfig
USE_GNOME=	gtk20
MAKE_ENV+=	GTK_CONFIG="pkg-config gtk+-2.0"
.else
USE_GNOME=	gtk12
.endif

post-extract:
	@cd ${WRKSRC} && ${RM} -f autozen seq2wav

post-patch:
	@${REINPLACE_CMD} -e \
		'/^CC/s| =| ?=| ; \
		 /^CFLAGS/s| =| ?=| ; \
		 /^PREFIX/s| =| ?=| ; \
		 s|share/AutoZen|${DATADIR_REL}| ; \
		 s|gtk-config|$${GTK_CONFIG}|g ; \
		 s|$$(CC) seq2wav|$$(CC) $$(CFLAGS) seq2wav|' \
		${WRKSRC}/Makefile

do-install:
	(cd ${WRKSRC} && ${INSTALL_PROGRAM} autozen seq2wav ${PREFIX}/bin)
	(cd ${WRKSRC} && ${INSTALL_SCRIPT} zentime ${PREFIX}/bin)
	(cd ${WRKSRC}/doc && ${INSTALL_MAN} autozen.1 ${MANPREFIX}/man/man1)
	@${MKDIR} ${DATADIR}
	(cd ${WRKSRC} && ${INSTALL_DATA} *.seq ${DATADIR})
.if ${PORT_OPTIONS:MDOCS}
	@${MKDIR} ${DOCSDIR}
	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} HTML ${DOCSDIR})
.endif

.include <bsd.port.mk>




--- Makefile.orig	Sun Sep 16 20:10:02 2001
+++ Makefile	Sun Jul 30 15:38:35 2006
@@ -1,10 +1,10 @@
 
-CC = gcc
-CFLAGS = -g
+#CC = gcc
+#CFLAGS = -g
 #CFLAGS = -g -DDEBUG
 
-PREFIX = /usr
-PUBLIC_SEQUENCES = $(PREFIX)/share/AutoZen
+PREFIX = ${LOCALBASE}
+PUBLIC_SEQUENCES = $(PREFIX)/share/autozen
 
 # uncomment one of the OS= lines below if you're compiling on one of those OSen. 
 #OS= -D__FreeBSD__
@@ -19,7 +19,7 @@
 	strip autozen seq2wav
 
 autozen: autozen.c *.xpm
-	$(CC) $(OS) -D_REENTRANT -DPUBLIC_SEQUENCES='"$(PUBLIC_SEQUENCES)"' $(CFLAGS) `gtk-config --cflags` `gtk-config  --libs` -pthread autozen.c -o autozen $(DEBUG_LIBS)
+	$(CC) $(OS) -D_REENTRANT -DPUBLIC_SEQUENCES='"$(PUBLIC_SEQUENCES)"' $(CFLAGS) `gtk-config --cflags` `gtk-config  --libs` ${PTHREAD_FLAGS} autozen.c -o autozen $(DEBUG_LIBS)
 
 seq2wav: seq2wav.c
 	$(CC) seq2wav.c -o seq2wav -lm
@@ -27,17 +27,15 @@
 	rm -f autozen seq2wav
 
 install: all
-	install -d $(PREFIX)/bin
-	install zentime $(PREFIX)/bin
-	install -s seq2wav $(PREFIX)/bin
-	install -s autozen $(PREFIX)/bin
-	install -d $(PREFIX)/share/AutoZen
-	install -m 644 *.seq $(PREFIX)/share/AutoZen
-	install -d $(PREFIX)/share/doc/AutoZen/HTML/images
-	install -m 644 doc/HTML/*.html $(PREFIX)/share/doc/AutoZen/HTML
-	install -m 644 doc/HTML/images/* $(PREFIX)/share/doc/AutoZen/HTML/images
-	install -d $(PREFIX)/man/man1
-	install -m 644 doc/autozen.1 $(PREFIX)/man/man1
+	${BSD_INSTALL_SCRIPT} zentime ${PREFIX}/bin
+	${BSD_INSTALL_PROGRAM} seq2wav ${PREFIX}/bin
+	${BSD_INSTALL_PROGRAM} autozen ${PREFIX}/bin
+	${MKDIR} ${DATADIR}
+	${BSD_INSTALL_DATA} *.seq ${DATADIR}
+#%%DOCS%%	${MKDIR} ${DOCSDIR}/images
+#%%DOCS%%	${BSD_INSTALL_DATA} doc/HTML/*.html ${DOCSDIR}
+#%%DOCS%%	${BSD_INSTALL_DATA} doc/HTML/images/* ${DOCSDIR}/images
+	${BSD_INSTALL_MAN} doc/autozen.1 ${PREFIX}/man/man1
 
 tags: *.[ch] *.xpm
 	ctags *.[ch] *.xpm




 }
 
 gint volTimeOut(gpointer data) {
@@ -729,6 +729,11 @@
 	GtkWidget *help_text;
 	GtkWidget *HelpQuit;
 
+#if GTK_MAJOR_VERSION >= 2
+	GtkTextIter help_text_iter;
+	GtkTextBuffer *help_text_buf;
+#endif
+
 	HelpWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_object_set_data (GTK_OBJECT (HelpWindow), "HelpWindow", HelpWindow);
 	gtk_window_set_title (GTK_WINDOW (HelpWindow), "AutoZen Help");
@@ -740,9 +745,16 @@
 	gtk_widget_show (vbox1);
 	gtk_container_add (GTK_CONTAINER (HelpWindow), vbox1);
 
+#if GTK_MAJOR_VERSION >= 2
+	help_text = gtk_text_view_new ();
+	help_text_buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (help_text));
+	gtk_text_buffer_get_iter_at_offset (help_text_buf, &help_text_iter, 0);
+	gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW (help_text), GTK_WRAP_WORD);
+#else
 	help_text = gtk_text_new (NULL, NULL);
 	gtk_text_set_word_wrap( GTK_TEXT( help_text ), TRUE);
 	gtk_text_set_line_wrap( GTK_TEXT( help_text ), TRUE);
+#endif
 
 
 	gtk_object_set_data (GTK_OBJECT (HelpWindow), "help_text", help_text);
@@ -751,7 +763,11 @@
 //	gtk_widget_set_sensitive (help_text, FALSE);
 	GTK_WIDGET_UNSET_FLAGS (help_text, GTK_CAN_FOCUS);
 	gtk_widget_realize (help_text);
+#if GTK_MAJOR_VERSION >= 2
+	gtk_text_buffer_insert (help_text_buf, &help_text_iter, text, strlen(text));
+#else
 	gtk_text_insert (GTK_TEXT (help_text), NULL, NULL, NULL, text, strlen(text));
+#endif
 
 	HelpQuit = gtk_button_new_with_label ("Close");
 	gtk_object_set_data (GTK_OBJECT (HelpWindow), "HelpQuit", HelpQuit);

Lines 9-13 Link Here

(-)audio/autozen/pkg-descr (-1 / +1 lines)
9	and the combination of the inputs in the brain. If you are deaf	9	and the combination of the inputs in the brain. If you are deaf
10	in one ear, it will not work.	10	in one ear, it will not work.
11		11
12	Author: Steven James <pyro@linuxlabs.com>	12	Author: Steven James <pyro@linuxlabs.com>
13	WWW: http://www.linuxlabs.com/autozen.shtml	13	WWW: http://www.linuxlabs.com/autozen.shtml

Return to bug 174185

Lines 3-35 Link Here

(-)audio/autozen/Makefile (-13 / +44 lines)
3		3
4	PORTNAME= autozen	4	PORTNAME= autozen
5	PORTVERSION= 2.1	5	PORTVERSION= 2.1
6	PORTREVISION= 3	6	PORTREVISION= 4
7	CATEGORIES= audio	7	CATEGORIES= audio
8	MASTER_SITES= ftp://ftp.springdaemons.com/soft/	8	MASTER_SITES= ftp://ftp.springdaemons.com/soft/ \
		9	http://www.sourcefiles.org/Miscellaneous/
9		10
10	MAINTAINER= ports@FreeBSD.org	11	MAINTAINER= ports@FreeBSD.org
11	COMMENT= Adjust brain waves with sound	12	COMMENT= Adjust brain waves with sound
12		13
13	MAKE_ENV+= PTHREAD_FLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" \	14	LICENSE= GPLv2
14	DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}"	15
		16	OPTIONS_DEFINE= GTK2 DOCS
15		17
16	USES= shebangfix	18	USES= shebangfix
17	USE_GNOME= gtk12
18	USE_PERL5_RUN= yes
19	SHEBANG_FILES= zentime	19	SHEBANG_FILES= zentime
		20	USE_PERL5_RUN= yes
		21
		22	DESKTOP_ENTRIES="AutoZen" \
		23	"BrainWave Generator/Synchronizator" \
		24	"" \
		25	"${PORTNAME}" \
		26	"AudioVideo;Player;GTK;" \
		27	false
20		28
21	PORTDOCS= *
22	MAN1= autozen.1	29	MAN1= autozen.1
		30	PORTDOCS= *
23		31
24	.include <bsd.port.options.mk>	32	.include <bsd.port.options.mk>
25	post-patch:	33
26	@${RM} -f ${WRKSRC}/autozen ${WRKSRC}/seq2wav	34	.if ${PORT_OPTIONS:MGTK2}
27	.if exists(/usr/include/sys/soundcard.h)	35	USES+= pkgconfig
28	@${REINPLACE_CMD} "s=machine/soundcard.h=sys/soundcard.h=g" \	36	USE_GNOME= gtk20
29	${WRKSRC}/autozen.c	37	MAKE_ENV+= GTK_CONFIG="pkg-config gtk+-2.0"
		38	.else
		39	USE_GNOME= gtk12
30	.endif	40	.endif
		41
		42	post-extract:
		43	@cd ${WRKSRC} && ${RM} -f autozen seq2wav
		44
		45	post-patch:
		46	@${REINPLACE_CMD} -e \
		47	'/^CC/s\| =\| ?=\| ; \
		48	/^CFLAGS/s\| =\| ?=\| ; \
		49	/^PREFIX/s\| =\| ?=\| ; \
		50	s\|share/AutoZen\|${DATADIR_REL}\| ; \
		51	s\|gtk-config\|$${GTK_CONFIG}\|g ; \
		52	s\|$$(CC) seq2wav\|$$(CC) $$(CFLAGS) seq2wav\|' \
		53	${WRKSRC}/Makefile
		54
		55	do-install:
		56	(cd ${WRKSRC} && ${INSTALL_PROGRAM} autozen seq2wav ${PREFIX}/bin)
		57	(cd ${WRKSRC} && ${INSTALL_SCRIPT} zentime ${PREFIX}/bin)
		58	(cd ${WRKSRC}/doc && ${INSTALL_MAN} autozen.1 ${MANPREFIX}/man/man1)
		59	@${MKDIR} ${DATADIR}
		60	(cd ${WRKSRC} && ${INSTALL_DATA} *.seq ${DATADIR})
31	.if ${PORT_OPTIONS:MDOCS}	61	.if ${PORT_OPTIONS:MDOCS}
32	@${REINPLACE_CMD} "s=#%%DOCS%%==g" ${WRKSRC}/Makefile	62	@${MKDIR} ${DOCSDIR}
		63	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} HTML ${DOCSDIR})
33	.endif	64	.endif
34		65
35	.include <bsd.port.mk>	66	.include <bsd.port.mk>

Lines 1-53 Link Here

(-)audio/autozen/files/patch-Makefile (-53 lines)
1	--- Makefile.orig Sun Sep 16 20:10:02 2001
2	+++ Makefile Sun Jul 30 15:38:35 2006
3	@@ -1,10 +1,10 @@
4
5	-CC = gcc
6	-CFLAGS = -g
7	+#CC = gcc
8	+#CFLAGS = -g
9	#CFLAGS = -g -DDEBUG
10
11	-PREFIX = /usr
12	-PUBLIC_SEQUENCES = $(PREFIX)/share/AutoZen
13	+PREFIX = ${LOCALBASE}
14	+PUBLIC_SEQUENCES = $(PREFIX)/share/autozen
15
16	# uncomment one of the OS= lines below if you're compiling on one of those OSen.
17	#OS= -D__FreeBSD__
18	@@ -19,7 +19,7 @@
19	strip autozen seq2wav
20
21	autozen: autozen.c *.xpm
22	- $(CC) $(OS) -D_REENTRANT -DPUBLIC_SEQUENCES='"$(PUBLIC_SEQUENCES)"' $(CFLAGS) `gtk-config --cflags` `gtk-config --libs` -pthread autozen.c -o autozen $(DEBUG_LIBS)
23	+ $(CC) $(OS) -D_REENTRANT -DPUBLIC_SEQUENCES='"$(PUBLIC_SEQUENCES)"' $(CFLAGS) `gtk-config --cflags` `gtk-config --libs` ${PTHREAD_FLAGS} autozen.c -o autozen $(DEBUG_LIBS)
24
25	seq2wav: seq2wav.c
26	$(CC) seq2wav.c -o seq2wav -lm
27	@@ -27,17 +27,15 @@
28	rm -f autozen seq2wav
29
30	install: all
31	- install -d $(PREFIX)/bin
32	- install zentime $(PREFIX)/bin
33	- install -s seq2wav $(PREFIX)/bin
34	- install -s autozen $(PREFIX)/bin
35	- install -d $(PREFIX)/share/AutoZen
36	- install -m 644 *.seq $(PREFIX)/share/AutoZen
37	- install -d $(PREFIX)/share/doc/AutoZen/HTML/images
38	- install -m 644 doc/HTML/*.html $(PREFIX)/share/doc/AutoZen/HTML
39	- install -m 644 doc/HTML/images/* $(PREFIX)/share/doc/AutoZen/HTML/images
40	- install -d $(PREFIX)/man/man1
41	- install -m 644 doc/autozen.1 $(PREFIX)/man/man1
42	+ ${BSD_INSTALL_SCRIPT} zentime ${PREFIX}/bin
43	+ ${BSD_INSTALL_PROGRAM} seq2wav ${PREFIX}/bin
44	+ ${BSD_INSTALL_PROGRAM} autozen ${PREFIX}/bin
45	+ ${MKDIR} ${DATADIR}
46	+ ${BSD_INSTALL_DATA} *.seq ${DATADIR}
47	+#%%DOCS%% ${MKDIR} ${DOCSDIR}/images
48	+#%%DOCS%% ${BSD_INSTALL_DATA} doc/HTML/*.html ${DOCSDIR}
49	+#%%DOCS%% ${BSD_INSTALL_DATA} doc/HTML/images/* ${DOCSDIR}/images
50	+ ${BSD_INSTALL_MAN} doc/autozen.1 ${PREFIX}/man/man1
51
52	tags: .[ch] .xpm
53	ctags .[ch] .xpm

Lines 36-38 Link Here

(-)audio/autozen/files/patch-autozen.c (+41 lines)
36	}	36	}
37		37
38	gint volTimeOut(gpointer data) {	38	gint volTimeOut(gpointer data) {
		39	@@ -729,6 +729,11 @@
		40	GtkWidget *help_text;
		41	GtkWidget *HelpQuit;
		42
		43	+#if GTK_MAJOR_VERSION >= 2
		44	+ GtkTextIter help_text_iter;
		45	+ GtkTextBuffer *help_text_buf;
		46	+#endif
		47	+
		48	HelpWindow = gtk_window_new (GTK_WINDOW_TOPLEVEL);
		49	gtk_object_set_data (GTK_OBJECT (HelpWindow), "HelpWindow", HelpWindow);
		50	gtk_window_set_title (GTK_WINDOW (HelpWindow), "AutoZen Help");
		51	@@ -740,9 +745,16 @@
		52	gtk_widget_show (vbox1);
		53	gtk_container_add (GTK_CONTAINER (HelpWindow), vbox1);
		54
		55	+#if GTK_MAJOR_VERSION >= 2
		56	+ help_text = gtk_text_view_new ();
		57	+ help_text_buf = gtk_text_view_get_buffer (GTK_TEXT_VIEW (help_text));
		58	+ gtk_text_buffer_get_iter_at_offset (help_text_buf, &help_text_iter, 0);
		59	+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW (help_text), GTK_WRAP_WORD);
		60	+#else
		61	help_text = gtk_text_new (NULL, NULL);
		62	gtk_text_set_word_wrap( GTK_TEXT( help_text ), TRUE);
		63	gtk_text_set_line_wrap( GTK_TEXT( help_text ), TRUE);
		64	+#endif
		65
		66
		67	gtk_object_set_data (GTK_OBJECT (HelpWindow), "help_text", help_text);
		68	@@ -751,7 +763,11 @@
		69	// gtk_widget_set_sensitive (help_text, FALSE);
		70	GTK_WIDGET_UNSET_FLAGS (help_text, GTK_CAN_FOCUS);
		71	gtk_widget_realize (help_text);
		72	+#if GTK_MAJOR_VERSION >= 2
		73	+ gtk_text_buffer_insert (help_text_buf, &help_text_iter, text, strlen(text));
		74	+#else
		75	gtk_text_insert (GTK_TEXT (help_text), NULL, NULL, NULL, text, strlen(text));
		76	+#endif
		77
		78	HelpQuit = gtk_button_new_with_label ("Close");
		79	gtk_object_set_data (GTK_OBJECT (HelpWindow), "HelpQuit", HelpQuit);