- Update to version 1.6.3

- Support DOCS option
- Give maintainership to submitter

PR:		ports/174304
Submitted by:	nemysis <nemysis@gmx.ch>

3 files changed, 31 insertions, 92 deletions

diff --git a/audio/jmusic/Makefile b/audio/jmusic/Makefile
index 986f15ddd0d8..a6f40ea9ddc2 100644
--- a/audio/jmusic/Makefile
+++ b/audio/jmusic/Makefile
@@ -2,13 +2,19 @@
 # $FreeBSD$
 
 PORTNAME=	jmusic
-PORTVERSION=	1.5
-PORTREVISION=	2
+PORTVERSION=	1.6.3
 CATEGORIES=	audio java
-MASTER_SITES=	SF/${PORTNAME}/jMusic_Stable/${PORTVERSION}
-DISTNAME=	${PORTNAME}_${PORTVERSION}
+MASTER_SITES=	SF/${PORTNAME}/jMusic_Stable/${PORTVERSION} \
+		SF/${PORTNAME}/jMusic_Instruments/${PORTVERSION:S/.3//}/:instruments \
+		SF/${PORTNAME}/jMusic_Docs/${PORTVERSION}/:docs
+DISTFILES=	jMusic${PORTVERSION}.jar \
+		jMusic_1.6_inst.zip:instruments \
+		jMusic_doc_1.6.3.zip:docs
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=	jMusic_1.6_inst.zip \
+		jMusic_doc_1.6.3.zip
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	nemysis@gmx.ch
 COMMENT=	Composition in Java
 
 USE_JAVA=	yes
@@ -16,9 +22,20 @@ JAVA_VERSION=	1.6+
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
+PORTDOCS=	*
+
+.include <bsd.port.options.mk>
+
 do-install:
-	@${MKDIR} ${JAVAJARDIR}/${PORTNAME}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.jar ${JAVAJARDIR}/${PORTNAME}
-	@${CP} -R ${WRKSRC}/inst ${JAVAJARDIR}/${PORTNAME}
+	${MKDIR} ${JAVAJARDIR}/${PORTNAME}
+	@${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/jMusic${PORTVERSION}.jar \
+		${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} inst ${JAVAJARDIR}/${PORTNAME})
+
+post-install:
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	@(cd ${WRKSRC} && ${COPYTREE_SHARE} doc ${DOCSDIR})
+.endif
 
 .include <bsd.port.mk>
diff --git a/audio/jmusic/distinfo b/audio/jmusic/distinfo
index 2628e489f96f..b0a6428861e1 100644
--- a/audio/jmusic/distinfo
+++ b/audio/jmusic/distinfo
@@ -1,2 +1,6 @@
-SHA256 (jmusic_1.5.tar.gz) = 421e264e67bb5bec220f58798cd4333279c516f5df4b1a92df752510349b2480
-SIZE (jmusic_1.5.tar.gz) = 507379
+SHA256 (jmusic/jMusic1.6.3.jar) = c9850d215c4bbb5a113b88c5d541554f942d01ea62379124eff9d76add473b94
+SIZE (jmusic/jMusic1.6.3.jar) = 403572
+SHA256 (jmusic/jMusic_1.6_inst.zip) = 269a82691125c498df87f1c8bc2c5885bafd1a165cb494b3984fb0ea8201ffef
+SIZE (jmusic/jMusic_1.6_inst.zip) = 72126
+SHA256 (jmusic/jMusic_doc_1.6.3.zip) = ba1d7c7d15e493ace11c524f1c479f287d5c7298a8246d6c6cc4739f24531683
+SIZE (jmusic/jMusic_doc_1.6.3.zip) = 1495618
diff --git a/audio/jmusic/pkg-plist b/audio/jmusic/pkg-plist
index db84ca9c3b2b..6397977fdc0a 100644
--- a/audio/jmusic/pkg-plist
+++ b/audio/jmusic/pkg-plist
@@ -1,156 +1,74 @@
-%%JAVAJARDIR%%/jmusic/inst/.DS_Store
-%%JAVAJARDIR%%/jmusic/inst/.SubtractiveSynthInst.java.swp
-%%JAVAJARDIR%%/jmusic/inst/.nbattrs
-%%JAVAJARDIR%%/jmusic/inst/AMInst.class
 %%JAVAJARDIR%%/jmusic/inst/AMInst.java
-%%JAVAJARDIR%%/jmusic/inst/AMNoiseInst.class
 %%JAVAJARDIR%%/jmusic/inst/AMNoiseInst.java
-%%JAVAJARDIR%%/jmusic/inst/AddInst.class
 %%JAVAJARDIR%%/jmusic/inst/AddInst.java
-%%JAVAJARDIR%%/jmusic/inst/AddMorphInst.class
 %%JAVAJARDIR%%/jmusic/inst/AddMorphInst.java
-%%JAVAJARDIR%%/jmusic/inst/AddSynthInst.class
 %%JAVAJARDIR%%/jmusic/inst/AddSynthInst.java
-%%JAVAJARDIR%%/jmusic/inst/BandPassFilterInst.class
 %%JAVAJARDIR%%/jmusic/inst/BandPassFilterInst.java
-%%JAVAJARDIR%%/jmusic/inst/BowedPluckInst.class
 %%JAVAJARDIR%%/jmusic/inst/BowedPluckInst.java
-%%JAVAJARDIR%%/jmusic/inst/BreathyFluteInst.class
 %%JAVAJARDIR%%/jmusic/inst/BreathyFluteInst.java
-%%JAVAJARDIR%%/jmusic/inst/CVS/Entries
-%%JAVAJARDIR%%/jmusic/inst/CVS/Repository
-%%JAVAJARDIR%%/jmusic/inst/CVS/Root
-%%JAVAJARDIR%%/jmusic/inst/CVS/netbeans.cmd.cache
-%%JAVAJARDIR%%/jmusic/inst/ChiffInst.class
 %%JAVAJARDIR%%/jmusic/inst/ChiffInst.java
-%%JAVAJARDIR%%/jmusic/inst/ControlledHPFInst.class
 %%JAVAJARDIR%%/jmusic/inst/ControlledHPFInst.java
-%%JAVAJARDIR%%/jmusic/inst/DynamicFilterInst.class
 %%JAVAJARDIR%%/jmusic/inst/DynamicFilterInst.java
-%%JAVAJARDIR%%/jmusic/inst/FGTRInst.class
 %%JAVAJARDIR%%/jmusic/inst/FGTRInst.java
-%%JAVAJARDIR%%/jmusic/inst/FMNoiseInst.class
 %%JAVAJARDIR%%/jmusic/inst/FMNoiseInst.java
-%%JAVAJARDIR%%/jmusic/inst/FractalInst.class
 %%JAVAJARDIR%%/jmusic/inst/FractalInst.java
-%%JAVAJARDIR%%/jmusic/inst/GranularInst.class
 %%JAVAJARDIR%%/jmusic/inst/GranularInst.java
-%%JAVAJARDIR%%/jmusic/inst/GranularInstRT.class
 %%JAVAJARDIR%%/jmusic/inst/GranularInstRT.java
-%%JAVAJARDIR%%/jmusic/inst/HarmonicsInst.class
 %%JAVAJARDIR%%/jmusic/inst/HarmonicsInst.java
-%%JAVAJARDIR%%/jmusic/inst/LFOFilteredSquareInst.class
 %%JAVAJARDIR%%/jmusic/inst/LFOFilteredSquareInst.java
-%%JAVAJARDIR%%/jmusic/inst/LPFilterEnvInst.class
 %%JAVAJARDIR%%/jmusic/inst/LPFilterEnvInst.java
-%%JAVAJARDIR%%/jmusic/inst/NoiseCombInst.class
 %%JAVAJARDIR%%/jmusic/inst/NoiseCombInst.java
-%%JAVAJARDIR%%/jmusic/inst/NoiseInst.class
 %%JAVAJARDIR%%/jmusic/inst/NoiseInst.java
-%%JAVAJARDIR%%/jmusic/inst/OddEvenInst.class
 %%JAVAJARDIR%%/jmusic/inst/OddEvenInst.java
-%%JAVAJARDIR%%/jmusic/inst/OvertoneInst.class
 %%JAVAJARDIR%%/jmusic/inst/OvertoneInst.java
-%%JAVAJARDIR%%/jmusic/inst/PluckInst.class
 %%JAVAJARDIR%%/jmusic/inst/PluckInst.java
-%%JAVAJARDIR%%/jmusic/inst/PluckSampleInst.class
-%%JAVAJARDIR%%/jmusic/inst/PluckSampleInst.java
-%%JAVAJARDIR%%/jmusic/inst/PrintSineInst.class
 %%JAVAJARDIR%%/jmusic/inst/PrintSineInst.java
-%%JAVAJARDIR%%/jmusic/inst/PulseFifthsInst.class
 %%JAVAJARDIR%%/jmusic/inst/PulseFifthsInst.java
-%%JAVAJARDIR%%/jmusic/inst/PulsewaveInst.class
 %%JAVAJARDIR%%/jmusic/inst/PulsewaveInst.java
-%%JAVAJARDIR%%/jmusic/inst/RTPluckInst.class
 %%JAVAJARDIR%%/jmusic/inst/RTPluckInst.java
-%%JAVAJARDIR%%/jmusic/inst/RTSimpleFMInst.class
 %%JAVAJARDIR%%/jmusic/inst/RTSimpleFMInst.java
-%%JAVAJARDIR%%/jmusic/inst/ResSawInst.class
 %%JAVAJARDIR%%/jmusic/inst/ResSawInst.java
-%%JAVAJARDIR%%/jmusic/inst/ReverseResampledInst.class
 %%JAVAJARDIR%%/jmusic/inst/ReverseResampledInst.java
-%%JAVAJARDIR%%/jmusic/inst/RingModulationInst.class
 %%JAVAJARDIR%%/jmusic/inst/RingModulationInst.java
-%%JAVAJARDIR%%/jmusic/inst/SabersawInst.class
 %%JAVAJARDIR%%/jmusic/inst/SabersawInst.java
-%%JAVAJARDIR%%/jmusic/inst/SawCombInst.class
 %%JAVAJARDIR%%/jmusic/inst/SawCombInst.java
-%%JAVAJARDIR%%/jmusic/inst/SawHPFInst.class
 %%JAVAJARDIR%%/jmusic/inst/SawHPFInst.java
-%%JAVAJARDIR%%/jmusic/inst/SawLPFInst.class
 %%JAVAJARDIR%%/jmusic/inst/SawLPFInst.java
-%%JAVAJARDIR%%/jmusic/inst/SawLPFInstB.class
 %%JAVAJARDIR%%/jmusic/inst/SawLPFInstB.java
-%%JAVAJARDIR%%/jmusic/inst/SawLPFInstE.class
 %%JAVAJARDIR%%/jmusic/inst/SawLPFInstE.java
-%%JAVAJARDIR%%/jmusic/inst/SawLPFInstF.class
 %%JAVAJARDIR%%/jmusic/inst/SawLPFInstF.java
-%%JAVAJARDIR%%/jmusic/inst/SawLPFInstG.class
 %%JAVAJARDIR%%/jmusic/inst/SawLPFInstG.java
-%%JAVAJARDIR%%/jmusic/inst/SawLPFInstRT.class
 %%JAVAJARDIR%%/jmusic/inst/SawLPFInstRT.java
-%%JAVAJARDIR%%/jmusic/inst/SawtoothInst.class
 %%JAVAJARDIR%%/jmusic/inst/SawtoothInst.java
-%%JAVAJARDIR%%/jmusic/inst/Sawtooth_LPF_Env_Inst.class
 %%JAVAJARDIR%%/jmusic/inst/Sawtooth_LPF_Env_Inst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleAMInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleAMInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleAllPassInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleAllPassInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleFMInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleFMInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleFMInstRT.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleFMInstRT.java
-%%JAVAJARDIR%%/jmusic/inst/SimplePluckInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimplePluckInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleReverbInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleReverbInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleSampleInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleSampleInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleSineInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleSineInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimpleTremoloInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimpleTremoloInst.java
-%%JAVAJARDIR%%/jmusic/inst/SimplestInst.class
 %%JAVAJARDIR%%/jmusic/inst/SimplestInst.java
-%%JAVAJARDIR%%/jmusic/inst/SineInst.class
 %%JAVAJARDIR%%/jmusic/inst/SineInst.java
-%%JAVAJARDIR%%/jmusic/inst/SlowSineInst.class
 %%JAVAJARDIR%%/jmusic/inst/SlowSineInst.java
-%%JAVAJARDIR%%/jmusic/inst/SmoothSquareInst.class
-%%JAVAJARDIR%%/jmusic/inst/SquareBackwardsInst.class
 %%JAVAJARDIR%%/jmusic/inst/SquareBackwardsInst.java
-%%JAVAJARDIR%%/jmusic/inst/SquareCombInst.class
 %%JAVAJARDIR%%/jmusic/inst/SquareCombInst.java
-%%JAVAJARDIR%%/jmusic/inst/SquareInst.class
 %%JAVAJARDIR%%/jmusic/inst/SquareInst.java
-%%JAVAJARDIR%%/jmusic/inst/SquareLPFInst.class
 %%JAVAJARDIR%%/jmusic/inst/SquareLPFInst.java
-%%JAVAJARDIR%%/jmusic/inst/SubtractiveSampleInst.class
 %%JAVAJARDIR%%/jmusic/inst/SubtractiveSampleInst.java
-%%JAVAJARDIR%%/jmusic/inst/SubtractiveSynthInst.class
 %%JAVAJARDIR%%/jmusic/inst/SubtractiveSynthInst.java
-%%JAVAJARDIR%%/jmusic/inst/SuperSawInst.class
 %%JAVAJARDIR%%/jmusic/inst/SuperSawInst.java
-%%JAVAJARDIR%%/jmusic/inst/TextInst.class
 %%JAVAJARDIR%%/jmusic/inst/TextInst.java
-%%JAVAJARDIR%%/jmusic/inst/TimpaniInst.class
 %%JAVAJARDIR%%/jmusic/inst/TimpaniInst.java
-%%JAVAJARDIR%%/jmusic/inst/TremoloInst.class
 %%JAVAJARDIR%%/jmusic/inst/TremoloInst.java
-%%JAVAJARDIR%%/jmusic/inst/TriangleInst.class
 %%JAVAJARDIR%%/jmusic/inst/TriangleInst.java
-%%JAVAJARDIR%%/jmusic/inst/TriangleRepeatInst.class
 %%JAVAJARDIR%%/jmusic/inst/TriangleRepeatInst.java
-%%JAVAJARDIR%%/jmusic/inst/VaryDecaySineInst.class
 %%JAVAJARDIR%%/jmusic/inst/VaryDecaySineInst.java
-%%JAVAJARDIR%%/jmusic/inst/VibesInst.class
 %%JAVAJARDIR%%/jmusic/inst/VibesInst.java
-%%JAVAJARDIR%%/jmusic/inst/VibratoInst.class
 %%JAVAJARDIR%%/jmusic/inst/VibratoInst.java
-%%JAVAJARDIR%%/jmusic/inst/VibratoInstRT.class
 %%JAVAJARDIR%%/jmusic/inst/VibratoInstRT.java
 %%JAVAJARDIR%%/jmusic/jmusic.jar
-@dirrm %%JAVAJARDIR%%/jmusic/inst/CVS
 @dirrm %%JAVAJARDIR%%/jmusic/inst
 @dirrm %%JAVAJARDIR%%/jmusic