Attachment #211183 for bug #243719

View | Details | Raw Unified | Return to bug 243719
Collapse All | Expand All

Lines 14003-14005 Link Here

(-)MOVED (+1 lines)
14003	games/vegastrike-data\|\|2020-01-27\|Removed	14003	games/vegastrike-data\|\|2020-01-27\|Removed
14004	textproc/gnome-doc-utils\|\|2020-01-27\|Abandoned upstream, Python 2.7 only	14004	textproc/gnome-doc-utils\|\|2020-01-27\|Abandoned upstream, Python 2.7 only
14005	java/jakarta-commons-discovery\|java/apache-commons-discovery\|2020-01-29\|Renamed upstream	14005	java/jakarta-commons-discovery\|java/apache-commons-discovery\|2020-01-29\|Renamed upstream
		14006	java/jakarta-commons-commons-beanutils\|apache-commons-beanutils\|2020-01-31\|Renamed upstream

Lines 3-9 Link Here

(-)databases/jasperreports/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= jasperreports	4	PORTNAME= jasperreports
5	PORTVERSION= 5.5.2	5	PORTVERSION= 5.5.2
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= databases print java	7	CATEGORIES= databases print java
8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JasperReports%20${PORTVERSION}	8	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JasperReports%20${PORTVERSION}
9	DISTFILES= ${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-applet-${PORTVERSION}.jar	9	DISTFILES= ${PORTNAME}-${PORTVERSION}.jar ${PORTNAME}-applet-${PORTVERSION}.jar
Lines 17-23 Link Here
17	${JAVALIBDIR}/poi.jar:textproc/apache-poi \	17	${JAVALIBDIR}/poi.jar:textproc/apache-poi \
18	${JAVALIBDIR}/jfreechart.jar:java/jfreechart \	18	${JAVALIBDIR}/jfreechart.jar:java/jfreechart \
19	${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \	19	${LOCALBASE}/share/java/batik/lib/batik-all.jar:graphics/batik \
20	${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils\	20	${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils\
21	${JAVALIBDIR}/commons-digester.jar:textproc/apache-commons-digester	21	${JAVALIBDIR}/commons-digester.jar:textproc/apache-commons-digester
22		22
23	OPTIONS_DEFINE= MYSQL PGSQL HSQLDB	23	OPTIONS_DEFINE= MYSQL PGSQL HSQLDB

Lines 3-8 Link Here

(-)devel/apache-commons-configuration/Makefile (-1 / +2 lines)
3		3
4	PORTNAME= commons-configuration	4	PORTNAME= commons-configuration
5	PORTVERSION= 1.10	5	PORTVERSION= 1.10
		6	PORTREVISION= 1
6	CATEGORIES= devel java	7	CATEGORIES= devel java
7	MASTER_SITES= APACHE_COMMONS_BINARIES	8	MASTER_SITES= APACHE_COMMONS_BINARIES
8	PKGNAMEPREFIX= apache-	9	PKGNAMEPREFIX= apache-
Lines 13-19 Link Here
13		14
14	LICENSE= APACHE20	15	LICENSE= APACHE20
15		16
16	RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \	17	RUN_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
17	${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \	18	${JAVALIBDIR}/commons-lang.jar:java/apache-commons-lang \
18	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging	19	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging
19		20

Lines 4-9 Link Here

(-)java/Makefile (-1 / +1 lines)
4	COMMENT = Java language support	4	COMMENT = Java language support
5		5
6	SUBDIR += apache-bcel	6	SUBDIR += apache-bcel
		7	SUBDIR += apache-commons-beanutils
7	SUBDIR += apache-commons-cli	8	SUBDIR += apache-commons-cli
8	SUBDIR += apache-commons-codec	9	SUBDIR += apache-commons-codec
9	SUBDIR += apache-commons-collections	10	SUBDIR += apache-commons-collections
Lines 47-53 Link Here
47	SUBDIR += intellij-ultimate	48	SUBDIR += intellij-ultimate
48	SUBDIR += jad	49	SUBDIR += jad
49	SUBDIR += jai	50	SUBDIR += jai
50	SUBDIR += jakarta-commons-beanutils
51	SUBDIR += jakarta-oro	51	SUBDIR += jakarta-oro
52	SUBDIR += jakarta-regexp	52	SUBDIR += jakarta-regexp
53	SUBDIR += jasmin	53	SUBDIR += jasmin




# $FreeBSD$

PORTNAME=	commons-beanutils
PORTVERSION=	1.9.4
PORTREVISION=	1
CATEGORIES=	java devel
MASTER_SITES=	APACHE_COMMONS_SOURCE
PKGNAMEPREFIX=	apache-
DISTNAME=	${PORTNAME}-${PORTVERSION}-src

MAINTAINER=	olgeni@FreeBSD.org

		-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar

JARFILE=	${PORTNAME}.jar
PLIST_FILES=	${JAVAJARDIR}/${JARFILE}

OPTIONS_DEFINE=	DOCS


PORTDOCS=	${APIDOCS} ${OTHERDOCS}
.endif

pre-build:
	@${REINPLACE_CMD} -e 's!1.9.3-SNAPSHOT!${PORTVERSION}!g;' \
		${WRKSRC}/build.xml
do-install:
	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVALIBDIR}/${JARFILE}
.if ${PORT_OPTIONS:MDOCS}

Lines 1-2 Link Here

(-)java/apache-commons-beanutils/distinfo (-2 / +3 lines)
1	SHA256 (commons-beanutils-1.9.2-src.tar.gz) = 91fccad3b65f278bad98df1aa8467f2d3df6095f41b2db39d2c12863fb2c0049	1	TIMESTAMP = 1580359877
2	SIZE (commons-beanutils-1.9.2-src.tar.gz) = 396910	2	SHA256 (commons-beanutils-1.9.4-src.tar.gz) = 2d46a5ac37000cad57ed338dbc5a0ae08cb924471afb5b3d4cff084afa0c728e
		3	SIZE (commons-beanutils-1.9.4-src.tar.gz) = 412606

Lines 1-5 Link Here

(-)java/apache-commons-beanutils/pkg-descr (-1 / +3 lines)
		1	Commons BeanUtils
		2
1	JavaBeans utility library. It provides wrappers around getters	3	JavaBeans utility library. It provides wrappers around getters
2	and setters for a property in an object for classes that conform	4	and setters for a property in an object for classes that conform
3	to the JavaBeans naming standard.	5	to the JavaBeans naming standard.
4		6
5	WWW: http://jakarta.apache.org/commons/beanutils/	7	WWW: http://commons.apache.org/proper/commons-beanutils/




# Created by: Ernst de Haan <znerd@FreeBSD.org>
# $FreeBSD$

PORTNAME=	commons-beanutils
PORTVERSION=	1.9.2
PORTREVISION=	1
CATEGORIES=	java devel
MASTER_SITES=	APACHE_COMMONS_SOURCE
PKGNAMEPREFIX=	jakarta-
DISTNAME=	${PORTNAME}-${PORTVERSION}-src

MAINTAINER=	olgeni@FreeBSD.org
COMMENT=	JavaBeans utility library

LICENSE=	APACHE20

BUILD_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
		${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections
RUN_DEPENDS=	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
		${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections

USES=		dos2unix
USE_JAVA=	yes
USE_ANT=	yes
DOS2UNIX_FILES=	build.xml
ALL_TARGET=	dist
MAKE_ARGS+=	-Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
		-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar

JARFILE=	${PORTNAME}.jar
PLIST_FILES=	%%JAVAJARDIR%%/${JARFILE}

OPTIONS_DEFINE=	DOCS

.include <bsd.port.options.mk>

.if ${PORT_OPTIONS:MDOCS}
APIDOCS=	api
OTHERDOCS=	LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
PORTDOCS=	${APIDOCS} ${OTHERDOCS}
.endif

do-install:
	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVALIBDIR}/${JARFILE}
.if ${PORT_OPTIONS:MDOCS}
	cd ${WRKSRC}/dist/docs \
	  && ${FIND} ${APIDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
	  && ${FIND} ${APIDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
.endif

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)java/jakarta-commons-beanutils/distinfo (-2 lines)
1	SHA256 (commons-beanutils-1.9.2-src.tar.gz) = 91fccad3b65f278bad98df1aa8467f2d3df6095f41b2db39d2c12863fb2c0049
2	SIZE (commons-beanutils-1.9.2-src.tar.gz) = 396910

Lines 1-11 Link Here

(-)java/jakarta-commons-beanutils/files/patch-build.xml (-11 lines)
1	--- build.xml.orig
2	+++ build.xml
3	@@ -212,8 +212,6 @@
4	todir="${dist.home}"/>
5	<copy file="RELEASE-NOTES.txt"
6	todir="${dist.home}"/>
7	- <copy file="README.txt"
8	- todir="${dist.home}"/>
9	<antcall target="jar"/>
10	</target>
11

Lines 1-5 Link Here

(-)java/jakarta-commons-beanutils/pkg-descr (-5 lines)
1	JavaBeans utility library. It provides wrappers around getters
2	and setters for a property in an object for classes that conform
3	to the JavaBeans naming standard.
4
5	WWW: http://jakarta.apache.org/commons/beanutils/

Lines 3-9 Link Here

(-)math/scilab/Makefile (-2 / +2 lines)
3		3
4	PORTNAME= scilab	4	PORTNAME= scilab
5	PORTVERSION= 5.5.2	5	PORTVERSION= 5.5.2
6	PORTREVISION= 22	6	PORTREVISION= 23
7	CATEGORIES= math cad java	7	CATEGORIES= math cad java
8	MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/	8	MASTER_SITES= https://www.scilab.org/download/${PORTVERSION}/
9	DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}	9	DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
Lines 82-88 Link Here
82	${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \	82	${JAVALIBDIR}/commons-io.jar:devel/apache-commons-io \
83	${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons	83	${JAVALIBDIR}/xmlgraphics-commons.jar:graphics/xmlgraphics-commons
84	# Code quality:	84	# Code quality:
85	_GUI_DEPENDS+= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \	85	_GUI_DEPENDS+= ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
86	${JAVALIBDIR}/antlr.jar:devel/antlr \	86	${JAVALIBDIR}/antlr.jar:devel/antlr \
87	${JAVALIBDIR}/junit4.jar:java/junit \	87	${JAVALIBDIR}/junit4.jar:java/junit \
88	${LOCALBASE}/bin/splint:devel/splint	88	${LOCALBASE}/bin/splint:devel/splint





PORTNAME=	commons-digester
PORTVERSION=	2.1
PORTREVISION=	2
CATEGORIES=	textproc java devel
MASTER_SITES=	APACHE_COMMONS_BINARIES
PKGNAMEPREFIX=	apache-

USE_JAVA=	yes

JARFILE=	${PORTNAME}.jar
PLIST_FILES=	${JAVAJARDIR}/${JARFILE}

OPTIONS_DEFINE=	DOCS



.include <bsd.port.pre.mk>

JAR_DEPENDS=	${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
		${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
		${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \
		${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j

Return to bug 243719

Lines 2-12 Link Here

(-)java/apache-commons-beanutils/Makefile (-4 / +6 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= commons-beanutils	4	PORTNAME= commons-beanutils
5	PORTVERSION= 1.9.2	5	PORTVERSION= 1.9.4
6	PORTREVISION= 1
7	CATEGORIES= java devel	6	CATEGORIES= java devel
8	MASTER_SITES= APACHE_COMMONS_SOURCE	7	MASTER_SITES= APACHE_COMMONS_SOURCE
9	PKGNAMEPREFIX= jakarta-	8	PKGNAMEPREFIX= apache-
10	DISTNAME= ${PORTNAME}-${PORTVERSION}-src	9	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
11		10
12	MAINTAINER= olgeni@FreeBSD.org	11	MAINTAINER= olgeni@FreeBSD.org
Lines 28-34 Link Here
28	-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar	27	-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
29		28
30	JARFILE= ${PORTNAME}.jar	29	JARFILE= ${PORTNAME}.jar
31	PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}	30	PLIST_FILES= ${JAVAJARDIR}/${JARFILE}
32		31
33	OPTIONS_DEFINE= DOCS	32	OPTIONS_DEFINE= DOCS
34		33
Lines 40-45 Link Here
40	PORTDOCS= ${APIDOCS} ${OTHERDOCS}	39	PORTDOCS= ${APIDOCS} ${OTHERDOCS}
41	.endif	40	.endif
42		41
		42	pre-build:
		43	@${REINPLACE_CMD} -e 's!1.9.3-SNAPSHOT!${PORTVERSION}!g;' \
		44	${WRKSRC}/build.xml
43	do-install:	45	do-install:
44	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVALIBDIR}/${JARFILE}	46	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVALIBDIR}/${JARFILE}
45	.if ${PORT_OPTIONS:MDOCS}	47	.if ${PORT_OPTIONS:MDOCS}

Lines 1-52 Link Here

(-)java/jakarta-commons-beanutils/Makefile (-52 lines)
1	# Created by: Ernst de Haan <znerd@FreeBSD.org>
2	# $FreeBSD$
3
4	PORTNAME= commons-beanutils
5	PORTVERSION= 1.9.2
6	PORTREVISION= 1
7	CATEGORIES= java devel
8	MASTER_SITES= APACHE_COMMONS_SOURCE
9	PKGNAMEPREFIX= jakarta-
10	DISTNAME= ${PORTNAME}-${PORTVERSION}-src
11
12	MAINTAINER= olgeni@FreeBSD.org
13	COMMENT= JavaBeans utility library
14
15	LICENSE= APACHE20
16
17	BUILD_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
18	${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections
19	RUN_DEPENDS= ${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
20	${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections
21
22	USES= dos2unix
23	USE_JAVA= yes
24	USE_ANT= yes
25	DOS2UNIX_FILES= build.xml
26	ALL_TARGET= dist
27	MAKE_ARGS+= -Dcommons-collections.jar=${JAVALIBDIR}/commons-collections.jar \
28	-Dcommons-logging.jar=${JAVALIBDIR}/commons-logging.jar
29
30	JARFILE= ${PORTNAME}.jar
31	PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}
32
33	OPTIONS_DEFINE= DOCS
34
35	.include <bsd.port.options.mk>
36
37	.if ${PORT_OPTIONS:MDOCS}
38	APIDOCS= api
39	OTHERDOCS= LICENSE.txt NOTICE.txt RELEASE-NOTES.txt
40	PORTDOCS= ${APIDOCS} ${OTHERDOCS}
41	.endif
42
43	do-install:
44	${INSTALL_DATA} ${WRKSRC}/dist/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVALIBDIR}/${JARFILE}
45	.if ${PORT_OPTIONS:MDOCS}
46	cd ${WRKSRC}/dist/docs \
47	&& ${FIND} ${APIDOCS} -type d -exec ${MKDIR} ${STAGEDIR}${DOCSDIR}/{} \; \
48	&& ${FIND} ${APIDOCS} -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DOCSDIR}/{} \;
49	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}/
50	.endif
51
52	.include <bsd.port.mk>

Lines 3-9 Link Here

(-)textproc/apache-commons-digester/Makefile (-3 / +3 lines)
3		3
4	PORTNAME= commons-digester	4	PORTNAME= commons-digester
5	PORTVERSION= 2.1	5	PORTVERSION= 2.1
6	PORTREVISION= 1	6	PORTREVISION= 2
7	CATEGORIES= textproc java devel	7	CATEGORIES= textproc java devel
8	MASTER_SITES= APACHE_COMMONS_BINARIES	8	MASTER_SITES= APACHE_COMMONS_BINARIES
9	PKGNAMEPREFIX= apache-	9	PKGNAMEPREFIX= apache-
Lines 24-30 Link Here
24	USE_JAVA= yes	24	USE_JAVA= yes
25		25
26	JARFILE= ${PORTNAME}.jar	26	JARFILE= ${PORTNAME}.jar
27	PLIST_FILES= %%JAVAJARDIR%%/${JARFILE}	27	PLIST_FILES= ${JAVAJARDIR}/${JARFILE}
28		28
29	OPTIONS_DEFINE= DOCS	29	OPTIONS_DEFINE= DOCS
30		30
Lines 33-39 Link Here
33		33
34	.include <bsd.port.pre.mk>	34	.include <bsd.port.pre.mk>
35		35
36	JAR_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/jakarta-commons-beanutils \	36	JAR_DEPENDS= ${JAVALIBDIR}/commons-beanutils.jar:java/apache-commons-beanutils \
37	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \	37	${JAVALIBDIR}/commons-logging.jar:java/apache-commons-logging \
38	${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \	38	${JAVALIBDIR}/commons-collections.jar:java/apache-commons-collections \
39	${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j	39	${JAVALIBDIR}/xercesImpl.jar:textproc/xerces-j