3 files changed, 159 insertions, 84 deletions

diff --git a/audio/sbagen/Makefile b/audio/sbagen/Makefile
index 61d940054e78..40671c6f2800 100644
--- a/audio/sbagen/Makefile
+++ b/audio/sbagen/Makefile
@@ -6,18 +6,16 @@
 #
 
 PORTNAME=	sbagen
-PORTVERSION=	1.4.3
+PORTVERSION=	1.4.4
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A sequenced binaural wave generator
 
-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
+DOC_FILES=	ChangeLog.txt README.txt SBAGEN.txt TODO.txt focus.txt \
+		focus2.txt holosync.txt theory.txt theory2.txt wave.txt
 
 post-patch:
 	@${REINPLACE_CMD} -e 's,linux/soundcard.h,sys/soundcard.h,g' \
@@ -28,13 +26,15 @@ do-build:
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/sbagen ${PREFIX}/bin
-	${MKDIR} ${DATADIR}
-	${INSTALL_SCRIPT} ${WRKSRC}/*.sbg ${DATADIR}
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-.for D in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/$D ${DOCSDIR}
+	@${MKDIR} ${DOCSDIR}
+.for file in ${DOC_FILES}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif
+.if !defined(NOPORTEXAMPLES)
+	@${MKDIR} ${EXAMPLESDIR}
+	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${EXAMPLESDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/sbagen/distinfo b/audio/sbagen/distinfo
index 9530bdda8d02..2dcfb26d7088 100644
--- a/audio/sbagen/distinfo
+++ b/audio/sbagen/distinfo
@@ -1,3 +1,3 @@
-MD5 (sbagen-1.4.3.tgz) = c9415c2084e48fd503cbb738df58c953
-SHA256 (sbagen-1.4.3.tgz) = 9e00f200f867e247ddee7611747ba94e8b47f262e6541e823ee94d65d878a05c
-SIZE (sbagen-1.4.3.tgz) = 686944
+MD5 (sbagen-1.4.4.tgz) = 8fb78158cd83d06417f61e920cb3f099
+SHA256 (sbagen-1.4.4.tgz) = a2cd7cc7185b71fa876b9e37c079b848617f1252f55905e84c0743b0c2f4c270
+SIZE (sbagen-1.4.4.tgz) = 710001
diff --git a/audio/sbagen/pkg-plist b/audio/sbagen/pkg-plist
index 709eebae5dd2..20ee893216ab 100644
--- a/audio/sbagen/pkg-plist
+++ b/audio/sbagen/pkg-plist
@@ -1,71 +1,146 @@
 bin/sbagen
-%%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%%
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog.txt
+%%PORTDOCS%%%%DOCSDIR%%/README.txt
+%%PORTDOCS%%%%DOCSDIR%%/SBAGEN.txt
+%%PORTDOCS%%%%DOCSDIR%%/TODO.txt
+%%PORTDOCS%%%%DOCSDIR%%/focus.txt
+%%PORTDOCS%%%%DOCSDIR%%/focus2.txt
+%%PORTDOCS%%%%DOCSDIR%%/holosync.txt
+%%PORTDOCS%%%%DOCSDIR%%/theory.txt
+%%PORTDOCS%%%%DOCSDIR%%/theory2.txt
+%%PORTDOCS%%%%DOCSDIR%%/wave.txt
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/prog-chakras-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/prog-drop-00d.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/prog-drop-old-demo.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/prog-slide-alpha-10.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/prog-slide-beta-16.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/prog-spin-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/ts-brain-alpha.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/ts-brain-beta.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/ts-brain-delta.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics/ts-brain-theta.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-aspirin.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-awakened-mind.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-einstein.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-inspiration.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-obe.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-runners-high.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-running-high.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-schumann-cycle.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ch-sonic-caffeine.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/cjm-tempus-fugit.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/bells-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/bells-2.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/bells-3.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-001.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-002.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-007.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-008.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-009.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-010.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-011.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-012.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-013.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/drop-014.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/mod-003.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/mod-004.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/mod-005.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/mod-006.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/mod-12-0.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/mod-7-83.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/modulations-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/modulations-2.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/modulations-3.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/modulations-4.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/modulations-5.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/modulations-6.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/modulations-7.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/planets.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/pulse-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/pulse-2.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/pulse-3.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/pulse-4.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/pulse-5.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/pulse-6.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/pulse-7.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/shaman-dance.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/shaman-epileptic.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ghostlab/shaman.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-010221.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-010301.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990102.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990103.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990104.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990105.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990106.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990107.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990108.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990111.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990112.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990118.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-990209.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-NSDWS-example.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-scan-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-tape-1-hp.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-tape-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-tape-2.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-tape-3.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/prog-test-wave.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-calm.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-calm2.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-mix1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-purring-cat.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-recharge.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-test10.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-test10b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-test10c.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/jim/ts-truth-other.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/kh-lost-storm.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/ng-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/rusty-1.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/xota-powermed1-pink.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/contrib/zeljko.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-03-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-03-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-10-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-10-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-12-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-12-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-15-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-15-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-21-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-21-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-21-c.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-22-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-23-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-23-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-24-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-24-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-25-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-26-a.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-26-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/focus-27-b.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-catnapper.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-concentration.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-focus03.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-focus10.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-focus12.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-focus15.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-focus21.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-homing.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/ts1-intro.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-01.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-02.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-03.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-04.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-05.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-06.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-07.sbg
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/focus/wave-08.sbg
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/focus
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/jim
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib/ghostlab
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/contrib
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/basics
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%