View | Details | Raw Unified | Return to bug 174185 | Differences between
and this patch

Collapse All | Expand All

(-)audio/autozen/Makefile (-17 / +47 lines)
Lines 1-36 Link Here
1
# New ports collection makefile for:	autozen
1
# Created by: Trevor Johnson
2
# Date created:				2000-09-16
3
# Whom:					Trevor Johnson
4
#
5
# $FreeBSD: head/audio/autozen/Makefile 300895 2012-07-14 12:56:14Z beat $
2
# $FreeBSD: head/audio/autozen/Makefile 300895 2012-07-14 12:56:14Z beat $
6
#
7
3
8
PORTNAME=	autozen
4
PORTNAME=	autozen
9
PORTVERSION=	2.1
5
PORTVERSION=	2.1
10
PORTREVISION=	3
6
PORTREVISION=	4
11
CATEGORIES=	audio
7
CATEGORIES=	audio
12
MASTER_SITES=	ftp://ftp.springdaemons.com/soft/
8
MASTER_SITES=	ftp://ftp.springdaemons.com/soft/ \
9
		http://www.sourcefiles.org/Miscellaneous/
13
10
14
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	ports@FreeBSD.org
15
COMMENT=	Adjust brain waves with sound
12
COMMENT=	Adjust brain waves with sound
16
13
17
MAKE_ENV+=	PTHREAD_FLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" \
14
LICENSE=	GPLv2
18
		DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}"
15
16
OPTIONS_DEFINE=	GTK2
19
17
20
USE_GNOME=	gtk12
21
USE_PERL5_RUN=	yes
18
USE_PERL5_RUN=	yes
19
MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}"
20
21
DESKTOP_ENTRIES="AutoZen" \
22
		"BrainWave Generator/Synchronizator" \
23
		"" \
24
		"${PORTNAME}" \
25
		"Application;GTK;AudioVideo;Player;" \
26
		false
22
27
23
PORTDOCS=	*
24
MAN1=		autozen.1
28
MAN1=		autozen.1
29
PORTDOCS=	*
25
30
26
post-patch:
31
.include <bsd.port.options.mk>
27
	@${RM} -f ${WRKSRC}/autozen ${WRKSRC}/seq2wav
32
28
.if exists(/usr/include/sys/soundcard.h)
33
.if ${PORT_OPTIONS:MGTK2}
29
	@${REINPLACE_CMD} "s=machine/soundcard.h=sys/soundcard.h=g" \
34
USE_GNOME=	gtk20
30
		${WRKSRC}/autozen.c
35
USE_PKGCONFIG=	build
36
MAKE_ENV+=	GTK_CONFIG="pkg-config gtk+-2.0"
37
.else
38
USE_GNOME=	gtk12
31
.endif
39
.endif
40
41
post-extract:
42
	@cd ${WRKSRC} && ${RM} -f autozen seq2wav
43
44
post-patch:
45
	@${REINPLACE_CMD} -e \
46
		'/^CC/s| =| ?=| ; \
47
		 /^CFLAGS/s| =| ?=| ; \
48
		 /^PREFIX/s| =| ?=| ; \
49
		 s|share/AutoZen|${DATADIR_REL}| ; \
50
		 s|gtk-config|$${GTK_CONFIG}|g ; \
51
		 s|-pthread|$${PTHREAD_LIBS}| ; \
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})
32
.if !defined(NOPORTDOCS)
61
.if !defined(NOPORTDOCS)
33
	@${REINPLACE_CMD} "s=#%%DOCS%%==g" ${WRKSRC}/Makefile
62
	@${MKDIR} ${DOCSDIR}
63
	@(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} HTML ${DOCSDIR})
34
.endif
64
.endif
35
65
36
.include <bsd.port.mk>
66
.include <bsd.port.mk>
(-)audio/autozen/files/patch-Makefile (-53 lines)
Lines 1-53 Link Here
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
(-)audio/autozen/files/patch-autozen.c (+41 lines)
Lines 36-38 Link Here
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);

Return to bug 174185