Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jun 2020 12:29:23 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r540514 - in head: . devel devel/jgoodies-looks devel/looks graphics/jdraw math/scilab
Message-ID:  <202006261229.05QCTNC2009845@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Fri Jun 26 12:29:23 2020
New Revision: 540514
URL: https://svnweb.freebsd.org/changeset/ports/540514

Log:
  devel/looks:
  - Rename to devel/jgoodies-looks to match upstream and update to 2.7.0
  - Add SRC option to install source jar

Added:
  head/devel/jgoodies-looks/
     - copied from r540513, head/devel/looks/
Deleted:
  head/devel/looks/
Modified:
  head/MOVED
  head/devel/Makefile
  head/devel/jgoodies-looks/Makefile
  head/devel/jgoodies-looks/distinfo
  head/graphics/jdraw/Makefile
  head/math/scilab/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Fri Jun 26 12:21:28 2020	(r540513)
+++ head/MOVED	Fri Jun 26 12:29:23 2020	(r540514)
@@ -15107,3 +15107,4 @@ www/redmine-redcarpet_formatter|www/redmine4|2020-06-2
 www/redmine-single_auth|www/redmine4|2020-06-25|Removed, build-time extension of www/redmine
 www/redmine-wiki_notes|www/redmine4|2020-06-25|Removed, build-time extension of www/redmine
 devel/p5-IO-stringy|devel/p5-IO-Stringy|2020-06-26|New development starts as IO-Stringy
+devel/looks|devel/jgoodies-looks|2020-06-26|Renamed to match upstream

Modified: head/devel/Makefile
==============================================================================
--- head/devel/Makefile	Fri Jun 26 12:21:28 2020	(r540513)
+++ head/devel/Makefile	Fri Jun 26 12:29:23 2020	(r540514)
@@ -994,6 +994,7 @@
     SUBDIR += jetbrains-goland
     SUBDIR += jetbrains-phpstorm
     SUBDIR += jetbrains-webstorm
+    SUBDIR += jgoodies-looks
     SUBDIR += jiic
     SUBDIR += jiri
     SUBDIR += jline
@@ -1422,7 +1423,6 @@
     SUBDIR += log4shib
     SUBDIR += lokalize
     SUBDIR += loki
-    SUBDIR += looks
     SUBDIR += love
     SUBDIR += love07
     SUBDIR += love08

Modified: head/devel/jgoodies-looks/Makefile
==============================================================================
--- head/devel/looks/Makefile	Fri Jun 26 12:21:28 2020	(r540513)
+++ head/devel/jgoodies-looks/Makefile	Fri Jun 26 12:29:23 2020	(r540514)
@@ -1,38 +1,44 @@
 # Created by: Thierry Thomas <thierry@pompo.net>
 # $FreeBSD$
 
-PORTNAME=	looks
-DISTVERSION=	2_6_0
+PORTNAME=	jgoodies-looks
+DISTVERSION=	2.7.0
 CATEGORIES=	devel java
-MASTER_SITES=	http://www.jgoodies.com/download/libraries/${PORTNAME}/ \
-		LOCAL/makc
-DISTNAME=	jgoodies-${PORTNAME}-${DISTVERSION}
+MASTER_SITES=	https://repo1.maven.org/maven2/com/jgoodies/${PORTNAME}/${DISTVERSION}/
+DISTFILES=	${JARFILE} ${JAVADOCFILE} ${JAVASRCFILE}
+EXTRACT_ONLY=	# nothing to extract
 
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Improved appearance for Java Swing applications
 
 LICENSE=	BSD3CLAUSE
 
-USES=		zip
 USE_JAVA=	yes
+NO_ARCH=	yes
 NO_BUILD=	yes
+NO_WRKSUBDIR=	yes
 
-WRKSRC=		${WRKDIR}/jgoodies-${PORTNAME}-${PORTVERSION}
+JARFILE=	${PORTNAME}-${PORTVERSION}.jar
 
-JARFILE=	jgoodies-${PORTNAME}-${PORTVERSION}.jar
+PLIST_FILES=	${JAVAJARDIR}/${JARFILE} \
+		${JAVAJARDIR}/looks.jar
 
-PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE} \
-		%%JAVAJARDIR%%/looks.jar
-DOCFILES=	README.html RELEASE-NOTES.txt
-PORTDOCS=	*
+OPTIONS_DEFINE=	DOCS SRC
+SRC_DESC=	Install source jarfile
+DOCS_VARS=	JAVADOCFILE=${PORTNAME}-${PORTVERSION}-javadoc.jar
+SRC_VARS=	JAVASRCFILE=${PORTNAME}-${PORTVERSION}-sources.jar
 
-OPTIONS_DEFINE=	DOCS
+DOCS_PLIST_FILES=	${JAVAJARDIR}/${JAVADOCFILE}
+SRC_PLIST_FILES=	${JAVAJARDIR}/${JAVASRCFILE}
 
 do-install:
-	${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
+	${INSTALL_DATA} ${DISTDIR}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
 	${LN} -sf ${JARFILE} ${STAGEDIR}${JAVAJARDIR}/looks.jar
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${DOCFILES:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC}/docs/ && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+
+do-install-DOCS-on:
+	${INSTALL_DATA} ${DISTDIR}/${JAVADOCFILE} ${STAGEDIR}${JAVAJARDIR}
+
+do-install-SRC-on:
+	${INSTALL_DATA} ${DISTDIR}/${JAVASRCFILE} ${STAGEDIR}${JAVAJARDIR}
 
 .include <bsd.port.mk>

Modified: head/devel/jgoodies-looks/distinfo
==============================================================================
--- head/devel/looks/distinfo	Fri Jun 26 12:21:28 2020	(r540513)
+++ head/devel/jgoodies-looks/distinfo	Fri Jun 26 12:29:23 2020	(r540514)
@@ -1,2 +1,7 @@
-SHA256 (jgoodies-looks-2_6_0.zip) = 2f992c25309e00aadba7c6a3af5c6596b3d487bff64fb1a5e94921647929f7e5
-SIZE (jgoodies-looks-2_6_0.zip) = 2444893
+TIMESTAMP = 1593170033
+SHA256 (jgoodies-looks-2.7.0.jar) = d7dfb4d041c28eae836aa0910c91c1b95b29c28e833200d2ef6d311fa66b4c6d
+SIZE (jgoodies-looks-2.7.0.jar) = 400791
+SHA256 (jgoodies-looks-2.7.0-javadoc.jar) = 5d6472aff6eb450784d93594454f1c8dc5fe878c938f79aadd62eb817d218afb
+SIZE (jgoodies-looks-2.7.0-javadoc.jar) = 700140
+SHA256 (jgoodies-looks-2.7.0-sources.jar) = 9379737818c1d655b503d0a363f3cd30174517539075b861df959bd081ec7141
+SIZE (jgoodies-looks-2.7.0-sources.jar) = 351214

Modified: head/graphics/jdraw/Makefile
==============================================================================
--- head/graphics/jdraw/Makefile	Fri Jun 26 12:21:28 2020	(r540513)
+++ head/graphics/jdraw/Makefile	Fri Jun 26 12:29:23 2020	(r540514)
@@ -3,7 +3,7 @@
 
 PORTNAME=	jdraw
 PORTVERSION=	1.1.5
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	graphics java
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}%20${PORTVERSION}
 DISTNAME=	${PORTNAME}_v${PORTVERSION}
@@ -35,7 +35,7 @@ do-install:
 
 .if ${PORT_OPTIONS:MPLASTIC3D}
 PLASTIC3D=	"-Dlf=\"com.jgoodies.looks.plastic.Plastic3DLookAndFeel\""
-RUN_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/looks
+RUN_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/jgoodies-looks
 .endif
 
 .include <bsd.port.mk>

Modified: head/math/scilab/Makefile
==============================================================================
--- head/math/scilab/Makefile	Fri Jun 26 12:21:28 2020	(r540513)
+++ head/math/scilab/Makefile	Fri Jun 26 12:29:23 2020	(r540514)
@@ -3,7 +3,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	6.1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math cad java
 MASTER_SITES=	https://www.scilab.org/download/${PORTVERSION}/
 DISTFILES=	${DISTNAME}-src${EXTRACT_SUFX}
@@ -88,7 +88,7 @@ _GUI_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/javahelp
 		${JAVALIBDIR}/xml-apis-ext.jar:textproc/xml-commons \
 		xsltproc:textproc/libxslt
 # Other gui deps:
-_GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/looks \
+_GUI_DEPENDS+=	${JAVALIBDIR}/looks.jar:devel/jgoodies-looks \
 		${JAVALIBDIR}/skinlf.jar:x11-toolkits/skinlf
 
 # Can't use USE_ANT because it overrides do-build target



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