Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 09 Dec 2012 18:05:31 +0100
From:      nemysis <nemysis@gmx.ch>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/174304: [PATCH] audio/jmusic: update to 1.6.3, take maintainership, OptionsNG, documentation
Message-ID:  <20121209170537.35A45D6@hub.freebsd.org>
Resent-Message-ID: <201212091710.qB9HA0Um095687@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         174304
>Category:       ports
>Synopsis:       [PATCH] audio/jmusic: update to 1.6.3, take maintainership, OptionsNG, documentation
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Dec 09 17:10:00 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     nemysis
>Release:        FreeBSD 9.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD FreeBSD_Ports 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan  3 07:46:30 UTC
>Description:
- Update to 1.6.3
- Take maintainership

Makefile changed:
+MASTER_SITES=
+DISTFILES=
+DIST_SUBDIR=	${PORTNAME}
+EXTRACT_ONLY=
+PORTDOCS=	*
+.include <bsd.port.options.mk>
+post-install:

Changed and refined:
 do-install:
 pkg-plist

Generated and tested manually, tested with port test, sent with FreeBSD Port Tools 0.99_6 (mode: update, diff: ports)
>How-To-Repeat:

portlint -A
looks fine.

port test: clean

>Fix:

--- jmusic-1.6.3.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/audio/jmusic/Makefile ./Makefile
--- /usr/ports/audio/jmusic/Makefile	2012-12-05 00:40:46.000000000 +0100
+++ ./Makefile	2012-12-09 17:29:53.000000000 +0100
@@ -2,13 +2,19 @@
 # $FreeBSD: head/audio/jmusic/Makefile 304602 2012-09-20 22:00:46Z bapt $
 
 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,19 @@
 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 -ruN --exclude=CVS /usr/ports/audio/jmusic/distinfo ./distinfo
--- /usr/ports/audio/jmusic/distinfo	2012-12-05 00:40:46.000000000 +0100
+++ ./distinfo	2012-12-09 17:38:58.000000000 +0100
@@ -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 -ruN --exclude=CVS /usr/ports/audio/jmusic/pkg-plist ./pkg-plist
--- /usr/ports/audio/jmusic/pkg-plist	2012-12-05 00:40:46.000000000 +0100
+++ ./pkg-plist	2012-12-09 17:39:44.000000000 +0100
@@ -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
--- jmusic-1.6.3.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20121209170537.35A45D6>