- Update to 2.1

- Pass maintainer to submitter

PR:		ports/101049
Submitted by:	Stanislav Sedov <ssedov(at)mbsd.msk.ru>
Approved by:	krion (mentor)

8 files changed, 94 insertions, 81 deletions

diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index 494ced1e58d9..190df5475e56 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -6,63 +6,32 @@
 #
 
 PORTNAME=	autozen
-PORTVERSION=	1.3.1
-PORTREVISION=	3
+PORTVERSION=	2.1
+PORTREVISION=	0
 CATEGORIES=	audio
-MASTER_SITES=	http://freebsd.biz.net.id/distfiles/ \
-		http://ftp.dyu.edu.tw/pub/FreeBSD/
-DISTNAME=	AutoZen-${PORTVERSION}
+MASTER_SITES=	http://www.linux.edu/download/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	ssedov@mbsd.msk.ru
 COMMENT=	Adjust brain waves with sound
 
-WRKSRC=		${WRKDIR}/AutoZen-${PORTVERSION}
-
-MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
+MAKE_ENV+=	PTHREAD_FLAGS="${PTHREAD_CFLAGS} ${PTHREAD_LIBS}" \
+		DATADIR="${DATADIR}" DOCSDIR="${DOCSDIR}" MKDIR="${MKDIR}"
 
 USE_GNOME=	gtk12
 USE_X_PREFIX=	yes
-REINPLACE_ARGS=	-i'' -E
+USE_PERL5_RUN=	yes
 
-DOC_FILES=	CHANGES COPYING
-DATA_FILES=	deep-relax.seq deep_delta_slide.seq delta_slide.seq \
-		moderate-meditation.seq relax.seq wake-up.seq
-PLIST=		${WRKDIR}/pkg-plist
+PORTDOCS=	*
+MAN1=		autozen.1
 
 post-patch:
-	@if [ -f /usr/include/sys/soundcard.h ]; then \
-		${REINPLACE_CMD} "s=machine/soundcard.h=sys/soundcard.h=g" \
-			${WRKSRC}/autozen.c; \
-	fi
-	${REINPLACE_CMD} "s=X11BASE=${X11BASE}=g" ${WRKSRC}/autozen.c
-	cd ${WRKSRC} && ${RM} autozen seq2wav
-
-pre-install:
-	${ECHO_CMD} bin/autozen > ${PLIST}
-	${ECHO_CMD} bin/seq2wav >> ${PLIST}
-.for i in ${DATA_FILES}
-	${ECHO_CMD} share/autozen/${i} >> ${PLIST}
-.endfor
-.if !defined(NOPORTDOCS)
-.for i in ${DOC_FILES}
-	${ECHO_CMD} share/doc/autozen/${i} >> ${PLIST}
-.endfor
-	${ECHO_CMD} @dirrm share/doc/autozen >> ${PLIST}
+	@${RM} -f ${WRKSRC}/autozen ${WRKSRC}/seq2wav
+.if exists(/usr/include/sys/soundcard.h)
+	@${REINPLACE_CMD} "s=machine/soundcard.h=sys/soundcard.h=g" \
+		${WRKSRC}/autozen.c
 .endif
-	${ECHO_CMD} @dirrm share/autozen >> ${PLIST}
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/autozen ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/seq2wav ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/autozen
-.for i in ${DATA_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/autozen
-.endfor
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/autozen
-.for i in ${DOC_FILES}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${PREFIX}/share/doc/autozen
-.endfor
+	@${REINPLACE_CMD} "s=#%%DOCS%%==g" ${WRKSRC}/Makefile
 .endif
 
 .include <bsd.port.mk>
diff --git a/audio/autozen/distinfo b/audio/autozen/distinfo
index cb6cade92843..bc2f381bf6c8 100644
--- a/audio/autozen/distinfo
+++ b/audio/autozen/distinfo
@@ -1,3 +1,3 @@
-MD5 (AutoZen-1.3.1.tar.gz) = b6ef7025b49eb33c04d02b5790195a4f
-SHA256 (AutoZen-1.3.1.tar.gz) = 1ce3530e06c897243a20e655a10393bff12ce6f1124d5d37ac422b4b9a1ed988
-SIZE (AutoZen-1.3.1.tar.gz) = 43382
+MD5 (autozen-2.1.tar.gz) = 8d85f8435f3733b9ea835cd0ffd106cc
+SHA256 (autozen-2.1.tar.gz) = e7677d8b192999d02c5e25354e0546f08a933d594b79f55bfec199de947a1301
+SIZE (autozen-2.1.tar.gz) = 169500
diff --git a/audio/autozen/files/patch-Makefile b/audio/autozen/files/patch-Makefile
new file mode 100644
index 000000000000..94857e43005a
--- /dev/null
+++ b/audio/autozen/files/patch-Makefile
@@ -0,0 +1,53 @@
+--- 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 = ${X11BASE}
++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
diff --git a/audio/autozen/files/patch-ab b/audio/autozen/files/patch-ab
deleted file mode 100644
index e7bd0ce94e15..000000000000
--- a/audio/autozen/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Sun Mar  4 09:39:54 2001
-+++ Makefile	Mon Apr  9 23:51:22 2001
-@@ -13,7 +13,7 @@
- 
- 
- autozen: autozen.c *.xpm
--	$(CC) $(OS) -D_REENTRANT $(CFLAGS) `gtk-config --cflags` `gtk-config  --libs` -pthread autozen.c -o autozen $(DEBUG_LIBS)
-+	$(CC) $(OS) -D_REENTRANT $(CFLAGS) $(PTHREAD_CFLAGS) `$(GTK_CONFIG) --cflags --libs` autozen.c -o autozen $(DEBUG_LIBS) $(PTHREAD_LIBS)
- 
- seq2wav: seq2wav.c
- 	$(CC) seq2wav.c -o seq2wav -lm
diff --git a/audio/autozen/files/patch-ac b/audio/autozen/files/patch-ac
deleted file mode 100644
index 5dc3317c05fa..000000000000
--- a/audio/autozen/files/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$FreeBSD$
-
---- autozen.c.orig	Mon Mar  5 00:56:21 2001
-+++ autozen.c	Tue Nov 25 18:17:00 2003
-@@ -92,7 +92,7 @@
- //
- /////////////////////////////////
- 
--#define SAMPLE_RATE 8000
-+#define SAMPLE_RATE 11025
- 
- #define MAX_HARMONICS 3
- 
-@@ -223,7 +223,7 @@
- 	/* Lets set the filename, as if this were a save dialog, and we are giving
- 	a default filename */
- 	gtk_file_selection_set_filename (GTK_FILE_SELECTION(filew), 
--										"*.seq");
-+										"X11BASE/share/autozen/*.seq");
-          
- 	gtk_file_selection_complete( GTK_FILE_SELECTION(filew), "*.seq");
- 	gtk_widget_show(filew);
diff --git a/audio/autozen/files/patch-autozen.c b/audio/autozen/files/patch-autozen.c
new file mode 100644
index 000000000000..8d29b0b31df1
--- /dev/null
+++ b/audio/autozen/files/patch-autozen.c
@@ -0,0 +1,11 @@
+--- autozen.c.orig	Sun Jul 30 15:29:57 2006
++++ autozen.c	Sun Jul 30 15:30:05 2006
+@@ -113,7 +113,7 @@
+ //
+ /////////////////////////////////
+ 
+-#define SAMPLE_RATE 8000
++#define SAMPLE_RATE 11025
+ 
+ #define MAX_HARMONICS 10
+ #define DEFAULT_HARMONICS 3
diff --git a/audio/autozen/pkg-descr b/audio/autozen/pkg-descr
index 34fee2ed0527..fc9be17cdd37 100644
--- a/audio/autozen/pkg-descr
+++ b/audio/autozen/pkg-descr
@@ -8,3 +8,6 @@ this with caution.  You must use headphones for AutoZen to work at
 all.  The effect depends on each ear receiving a different tone,
 and the combination of the inputs in the brain.  If you are deaf
 in one ear, it will not work.
+
+Author:	Steven James <pyro@linuxlabs.com>
+WWW:	http://www.linuxlabs.com/autozen.shtml
diff --git a/audio/autozen/pkg-plist b/audio/autozen/pkg-plist
new file mode 100644
index 000000000000..5f5dbf7ffbdf
--- /dev/null
+++ b/audio/autozen/pkg-plist
@@ -0,0 +1,10 @@
+bin/autozen
+bin/seq2wav
+bin/zentime
+%%DATADIR%%/deep-relax.seq
+%%DATADIR%%/deep_delta_slide.seq
+%%DATADIR%%/delta_slide.seq
+%%DATADIR%%/moderate-meditation.seq
+%%DATADIR%%/relax.seq
+%%DATADIR%%/wake-up.seq
+@dirrm %%DATADIR%%