3 files changed, 85 insertions, 76 deletions

diff --git a/audio/sbagen/Makefile b/audio/sbagen/Makefile
index dae26a94f525..61d940054e78 100644
--- a/audio/sbagen/Makefile
+++ b/audio/sbagen/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	sbagen
-PORTVERSION=	1.0.8
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,44 +15,25 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A sequenced binaural wave generator
 
-DEPRECATED=	1.0.8 is the 2000 version, 1.4.3 is current. Please send patches or take maintainership!
-EXPIRATION_DATE=	2006-03-31
-IGNORE=		is deprecated: ${DEPRECATED}
-
-SHAREFILES=	t-alpha t-beta t-calm t-calm2 t-delta t-focus t-focus-1 \
-		t-focus-2 t-focus2 t-mix1 t-seqall t-test10 t-test10b \
-		t-test10c t-theta t-truth-other t-wave-1 t-wave-2 \
-		prog-990102 prog-990103 prog-990104 prog-990105 prog-990106 \
-		prog-990107 prog-990108 prog-990111 prog-990112 prog-990118 \
-		prog-990209 prog-chakras-1 prog-scan-1 prog-spin-1 \
-		prog-tape-1 prog-tape-1-hp prog-tape-2 prog-tape-3
-
-DOCFILES=	sbagen.txt theory.txt theory2.txt
-
-USE_REINPLACE=	yes
-
-pre-patch:
-	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
-		${WRKSRC}/sbagen.c
+PORTDOCS=	COPYING.txt ChangeLog.txt README.txt SBAGEN.txt \
+		focus.txt holosync.txt mk-msvc.txt readme-windows.txt \
+		theory.txt theory2.txt wave.txt
 
 post-patch:
-.for F in ${SHAREFILES}
-	@${REINPLACE_CMD} -e 's,/bin/bash,/bin/sh,g' ${WRKSRC}/$F
-.endfor
+	@${REINPLACE_CMD} -e 's,linux/soundcard.h,sys/soundcard.h,g' \
+		${WRKSRC}/sbagen.c
 
 do-build:
-	(cd ${WRKSRC} && ${CC} ${CFLAGS} sbagen.c -o sbagen -lm)
+	(cd ${WRKSRC} && ${CC} ${CFLAGS} -DT_LINUX ${PTHREAD_LIBS} -lm sbagen.c -o sbagen)
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sbagen ${PREFIX}/bin
-	${MKDIR} ${PREFIX}/share/sbagen
-.for S in ${SHAREFILES}
-	${INSTALL_SCRIPT} ${WRKSRC}/$S ${PREFIX}/share/sbagen
-.endfor
+	${MKDIR} ${DATADIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/*.sbg ${DATADIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/sbagen
-.for D in ${DOCFILES}
-	${INSTALL_DATA} ${WRKSRC}/$D ${PREFIX}/share/doc/sbagen
+	${MKDIR} ${DOCSDIR}
+.for D in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/$D ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/audio/sbagen/distinfo b/audio/sbagen/distinfo
index eee83ce86b20..9530bdda8d02 100644
--- a/audio/sbagen/distinfo
+++ b/audio/sbagen/distinfo
@@ -1,3 +1,3 @@
-MD5 (sbagen-1.0.8.tgz) = 31815d464ec3287c52b32c58ce55a1ab
-SHA256 (sbagen-1.0.8.tgz) = 1f9e259b53abe683d122e1d87c79787917f41c5cfd3ae163668c4ff9e0c4c49b
-SIZE (sbagen-1.0.8.tgz) = 35141
+MD5 (sbagen-1.4.3.tgz) = c9415c2084e48fd503cbb738df58c953
+SHA256 (sbagen-1.4.3.tgz) = 9e00f200f867e247ddee7611747ba94e8b47f262e6541e823ee94d65d878a05c
+SIZE (sbagen-1.4.3.tgz) = 686944
diff --git a/audio/sbagen/pkg-plist b/audio/sbagen/pkg-plist
index dcef18923d59..709eebae5dd2 100644
--- a/audio/sbagen/pkg-plist
+++ b/audio/sbagen/pkg-plist
@@ -1,42 +1,71 @@
 bin/sbagen
-%%PORTDOCS%%%%DOCSDIR%%/sbagen.txt
-%%PORTDOCS%%%%DOCSDIR%%/theory.txt
-%%PORTDOCS%%%%DOCSDIR%%/theory2.txt
-share/sbagen/prog-990102
-share/sbagen/prog-990103
-share/sbagen/prog-990104
-share/sbagen/prog-990105
-share/sbagen/prog-990106
-share/sbagen/prog-990107
-share/sbagen/prog-990108
-share/sbagen/prog-990111
-share/sbagen/prog-990112
-share/sbagen/prog-990118
-share/sbagen/prog-990209
-share/sbagen/prog-chakras-1
-share/sbagen/prog-scan-1
-share/sbagen/prog-spin-1
-share/sbagen/prog-tape-1
-share/sbagen/prog-tape-1-hp
-share/sbagen/prog-tape-2
-share/sbagen/prog-tape-3
-share/sbagen/t-alpha
-share/sbagen/t-beta
-share/sbagen/t-calm
-share/sbagen/t-calm2
-share/sbagen/t-delta
-share/sbagen/t-focus
-share/sbagen/t-focus-1
-share/sbagen/t-focus-2
-share/sbagen/t-focus2
-share/sbagen/t-mix1
-share/sbagen/t-seqall
-share/sbagen/t-test10
-share/sbagen/t-test10b
-share/sbagen/t-test10c
-share/sbagen/t-theta
-share/sbagen/t-truth-other
-share/sbagen/t-wave-1
-share/sbagen/t-wave-2
-@dirrm share/sbagen
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+%%DATADIR%%/focus-03-a.sbg
+%%DATADIR%%/focus-03-b.sbg
+%%DATADIR%%/focus-10-a.sbg
+%%DATADIR%%/focus-10-b.sbg
+%%DATADIR%%/focus-12-a.sbg
+%%DATADIR%%/focus-12-b.sbg
+%%DATADIR%%/focus-15-a.sbg
+%%DATADIR%%/focus-15-b.sbg
+%%DATADIR%%/focus-21-a.sbg
+%%DATADIR%%/focus-21-b.sbg
+%%DATADIR%%/focus-21-c.sbg
+%%DATADIR%%/focus-22-b.sbg
+%%DATADIR%%/focus-23-a.sbg
+%%DATADIR%%/focus-23-b.sbg
+%%DATADIR%%/focus-24-a.sbg
+%%DATADIR%%/focus-24-b.sbg
+%%DATADIR%%/focus-25-a.sbg
+%%DATADIR%%/focus-26-a.sbg
+%%DATADIR%%/focus-26-b.sbg
+%%DATADIR%%/focus-27-b.sbg
+%%DATADIR%%/prog-010221.sbg
+%%DATADIR%%/prog-010301.sbg
+%%DATADIR%%/prog-990102.sbg
+%%DATADIR%%/prog-990103.sbg
+%%DATADIR%%/prog-990104.sbg
+%%DATADIR%%/prog-990105.sbg
+%%DATADIR%%/prog-990106.sbg
+%%DATADIR%%/prog-990107.sbg
+%%DATADIR%%/prog-990108.sbg
+%%DATADIR%%/prog-990111.sbg
+%%DATADIR%%/prog-990112.sbg
+%%DATADIR%%/prog-990118.sbg
+%%DATADIR%%/prog-990209.sbg
+%%DATADIR%%/prog-NSDWS-example.sbg
+%%DATADIR%%/prog-chakras-1.sbg
+%%DATADIR%%/prog-drop-00d.sbg
+%%DATADIR%%/prog-drop-old-demo.sbg
+%%DATADIR%%/prog-ng-1.sbg
+%%DATADIR%%/prog-rusty-1.sbg
+%%DATADIR%%/prog-scan-1.sbg
+%%DATADIR%%/prog-slide-alpha-10.sbg
+%%DATADIR%%/prog-spin-1.sbg
+%%DATADIR%%/prog-tape-1-hp.sbg
+%%DATADIR%%/prog-tape-1.sbg
+%%DATADIR%%/prog-tape-2.sbg
+%%DATADIR%%/prog-tape-3.sbg
+%%DATADIR%%/prog-test-wave.sbg
+%%DATADIR%%/ts-brain-alpha.sbg
+%%DATADIR%%/ts-brain-beta.sbg
+%%DATADIR%%/ts-brain-delta.sbg
+%%DATADIR%%/ts-brain-theta.sbg
+%%DATADIR%%/ts-calm.sbg
+%%DATADIR%%/ts-calm2.sbg
+%%DATADIR%%/ts-mix1.sbg
+%%DATADIR%%/ts-purring-cat.sbg
+%%DATADIR%%/ts-recharge.sbg
+%%DATADIR%%/ts-test10.sbg
+%%DATADIR%%/ts-test10b.sbg
+%%DATADIR%%/ts-test10c.sbg
+%%DATADIR%%/ts-truth-other.sbg
+%%DATADIR%%/ts-zeljko.sbg
+%%DATADIR%%/wave-01.sbg
+%%DATADIR%%/wave-02.sbg
+%%DATADIR%%/wave-03.sbg
+%%DATADIR%%/wave-04.sbg
+%%DATADIR%%/wave-05.sbg
+%%DATADIR%%/wave-06.sbg
+%%DATADIR%%/wave-07.sbg
+%%DATADIR%%/wave-08.sbg
+@dirrm %%DATADIR%%