5 files changed, 34 insertions, 30 deletions

diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index 2ae12c38b861..c037c9aec888 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -6,32 +6,47 @@
 #
 
 PORTNAME=	autozen
-PORTVERSION=	1.2.1
+PORTVERSION=	1.3.1
 CATEGORIES=	audio
 MASTER_SITES=	http://www.linuxlabs.com/software/download/
 DISTNAME=	AutoZen-${PORTVERSION}
 
 MAINTAINER=	trevor@FreeBSD.org
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-1.2
+WRKSRC=		${WRKDIR}/AutoZen-${PORTVERSION}
+
+MAKE_ENV+=	PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}
 
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 
 DOC_FILES=	CHANGES COPYING
-DATA_FILES=	deep-relax.seq relax.seq test.seq test2.seq test3.seq
+DATA_FILES=	deep-relax.seq deep_delta_slide.seq delta_slide.seq \
+		moderate-meditation.seq relax.seq wake-up.seq
+PLIST=		${WRKDIR}/pkg-plist
 
 post-patch:
 	@if [ -f /usr/include/sys/soundcard.h ]; then \
-		${PERL} -pi -e "s=linux/soundcard.h=sys/soundcard.h=g" \
-			${WRKSRC}/autozen.c; \
-	else \
-		${PERL} -pi -e "s=linux/soundcard.h=machine/soundcard.h=g" \
+		${PERL} -pi -e "s=machine/soundcard.h=sys/soundcard.h=g" \
 			${WRKSRC}/autozen.c; \
 	fi
 	@${PERL} -pi -e "s=X11BASE=${X11BASE}=g" ${WRKSRC}/autozen.c
 	cd ${WRKSRC} && ${RM} autozen seq2wav
 
+pre-install:
+	${ECHO} bin/autozen > ${PLIST}
+	${ECHO} bin/seq2wav >> ${PLIST}
+.for i in ${DATA_FILES}
+	${ECHO} share/autozen/${i} >> ${PLIST}
+.endfor
+.if !defined(NOPORTDOCS)
+.for i in ${DOC_FILES}
+	${ECHO} share/doc/autozen/${i} >> ${PLIST}
+.endfor
+	${ECHO} @dirrm share/doc/autozen >> ${PLIST}
+.endif
+	${ECHO} @dirrm share/autozen >> ${PLIST}
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/autozen ${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/seq2wav ${PREFIX}/bin
diff --git a/audio/autozen/distinfo b/audio/autozen/distinfo
index 295834196800..901a230cb4d6 100644
--- a/audio/autozen/distinfo
+++ b/audio/autozen/distinfo
@@ -1 +1 @@
-MD5 (AutoZen-1.2.1.tar.gz) = eee6e6513181a6837fa2b33bfc06cdce
+MD5 (AutoZen-1.3.1.tar.gz) = b6ef7025b49eb33c04d02b5790195a4f
diff --git a/audio/autozen/files/patch-ab b/audio/autozen/files/patch-ab
index af3a15e2bbd3..e7bd0ce94e15 100644
--- a/audio/autozen/files/patch-ab
+++ b/audio/autozen/files/patch-ab
@@ -1,11 +1,11 @@
---- Makefile.orig	Sun Sep 10 22:57:32 2000
-+++ Makefile	Sat Sep 16 13:47:33 2000
-@@ -7,7 +7,7 @@
+--- 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) -D_REENTRANT $(CFLAGS) -I/usr/local/lib/glib/include/ `gtk-config --cflags` `gtk-config  --libs` -pthread autozen.c -o autozen $(DEBUG_LIBS)
-+	$(CC) -D_REENTRANT $(CFLAGS) -I/usr/local/lib/glib/include/ `$(GTK_CONFIG) --cflags` `$(GTK_CONFIG) --libs` -pthread autozen.c -o autozen $(DEBUG_LIBS)
+-	$(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
index db38b7fd1962..375b3d7f87c7 100644
--- a/audio/autozen/files/patch-ac
+++ b/audio/autozen/files/patch-ac
@@ -1,11 +1,11 @@
---- autozen.c.orig	Sat Sep 16 14:01:23 2000
-+++ autozen.c	Sat Sep 16 14:07:48 2000
-@@ -199,7 +199,7 @@
+--- autozen.c.orig	Sun Mar  4 16:56:21 2001
++++ autozen.c	Mon Apr  9 23:49:01 2001
+@@ -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");
+-										"*.seq");
++										"X11BASE/share/autozen/*.seq");
           
+ 	gtk_file_selection_complete( GTK_FILE_SELECTION(filew), "*.seq");
  	gtk_widget_show(filew);
- }
diff --git a/audio/autozen/pkg-plist b/audio/autozen/pkg-plist
deleted file mode 100644
index 846f6813aeb3..000000000000
--- a/audio/autozen/pkg-plist
+++ /dev/null
@@ -1,11 +0,0 @@
-bin/autozen
-bin/seq2wav
-share/autozen/deep-relax.seq
-share/autozen/relax.seq
-share/autozen/test.seq
-share/autozen/test2.seq
-share/autozen/test3.seq
-share/doc/autozen/CHANGES
-share/doc/autozen/COPYING
-@dirrm share/doc/autozen
-@dirrm share/autozen