[Midnightbsd-cvs] mports [19982] trunk/java/classpath: fix build

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Sat Aug 22 19:03:19 EDT 2015 

Revision: 19982
          http://svnweb.midnightbsd.org/mports/?rev=19982
Author:   laffer1
Date:     2015-08-22 19:03:18 -0400 (Sat, 22 Aug 2015)
Log Message:
-----------
fix build

Modified Paths:
--------------
    trunk/java/classpath/Makefile
    trunk/java/classpath/pkg-plist

Modified: trunk/java/classpath/Makefile
===================================================================
--- trunk/java/classpath/Makefile	2015-08-22 23:00:24 UTC (rev 19981)
+++ trunk/java/classpath/Makefile	2015-08-22 23:03:18 UTC (rev 19982)
@@ -2,21 +2,20 @@
 
 PORTNAME=	classpath
 PORTVERSION=	0.99
+PORTREVISION=	1
 CATEGORIES=	java devel
-MASTER_SITES=	${MASTER_SITE_GNU} \
-		${MASTER_SITE_SAVANNAH}
-MASTER_SITE_SUBDIR=	${PORTNAME:S|$|:src|}
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:src
+MASTER_SITES=	GNU \
+		SAVANNAH
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	A GNU project to create a free Java class library
+COMMENT=	GNU project to create a free Java class library
 
 LICENSE=	gpl2
 
 GNU_CONFIGURE=	yes
-USES=		pkgconfig iconv
-USE_GMAKE=	yes
+USES=		gmake iconv libtool perl5 pkgconfig
 USE_LDCONFIG=	yes
 USE_PERL5_BUILD=yes
 USE_XORG=	x11 ice xtst xaw xproto xext
@@ -31,24 +30,11 @@
 CONFIGURE_ENV+=	JAVACFLAGS="${JAVACFLAGS}"
 MAKE_ENV+=	JAVACFLAGS="${JAVACFLAGS}"
 
-MAN1=		gappletviewer.1 \
-		gcjh.1 \
-		gjar.1 \
-		gjarsigner.1 \
-		gjavah.1 \
-		gkeytool.1 \
-		gnative2ascii.1 \
-		gorbd.1 \
-		grmid.1 \
-		grmiregistry.1 \
-		gserialver.1 \
-		gtnameserv.1
-
 INFO=		cp-hacking cp-tools cp-vmintegration
 
 CONFLICTS=	sablevm-classpath-1.13 sablevm-classpath-1.13_[1-9]
 
-OPTIONS_DEFINE=	CAIRO ECJ GCONF GJDOC GMP GTK2 QT4
+OPTIONS_DEFINE=	CAIRO ECJ GCONF GJDOC GMP GTK2 QT4 EXAMPLES
 OPTIONS_DEFAULT=GMP GJDOC GTK2
 CAIRO_DESC=	Use Gtk+ Cairo based Graphics2D
 ECJ_DESC=	Embed ECJ as com.sun.tools.javac
@@ -60,8 +46,7 @@
 .include <bsd.mport.options.mk>
 
 .if ${PORT_OPTIONS:MECJ}
-MASTER_SITES+=		${MASTER_SITE_ECLIPSE:S|$|:ecj|}
-MASTER_SITE_SUBDIR+=	R-${ECJ_VERSION}-${ECJ_DROPDATE}/:ecj
+MASTER_SITES+=		ECLIPSE/R-${ECJ_VERSION}-${ECJ_DROPDATE}:ecj
 DISTFILES+=		${ECJ_JAR}:ecj
 ECJ_VERSION=		3.8.1
 ECJ_DROPDATE=		201209141540
@@ -89,7 +74,6 @@
 ANTLR_JAR=		antlr-2.7.7.jar
 MASTER_SITES+=		http://www.antlr2.org/download/:antlr
 DISTFILES+=		${ANTLR_JAR}:antlr
-MAN1+=			gjdoc.1
 CONFIGURE_ARGS+=	--with-antlr-jar=${DISTDIR}/${ANTLR_JAR}
 PLIST_SUB+=		GJDOC=""
 .else
@@ -98,7 +82,7 @@
 .endif
 
 .if ${PORT_OPTIONS:MGMP}
-LIB_DEPENDS+=		gmp:${PORTSDIR}/math/gmp
+LIB_DEPENDS+=		libgmp.so:${PORTSDIR}/math/gmp
 CONFIGURE_ARGS+=	--with-gmp=${LOCALBASE}
 PLIST_SUB+=		GMP=""
 .else
@@ -148,7 +132,7 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -i.bak -e 's|@JAVA@|$${JAVACMD:-java}|g' \
+	@${REINPLACE_CMD} -e 's|@JAVA@|$${JAVACMD:-java}|g' \
 	    ${WRKSRC}/tools/g*.in
 
 .include <bsd.port.mk>

Modified: trunk/java/classpath/pkg-plist
===================================================================
--- trunk/java/classpath/pkg-plist	2015-08-22 23:00:24 UTC (rev 19981)
+++ trunk/java/classpath/pkg-plist	2015-08-22 23:03:18 UTC (rev 19982)
@@ -15,41 +15,47 @@
 include/jawt_md.h
 include/jni.h
 include/jni_md.h
-%%GCONF%%lib/classpath/libgconfpeer.la
 %%GCONF%%lib/classpath/libgconfpeer.so
 %%GTK2%%lib/classpath/libgtkpeer.so
-%%GTK2%%lib/classpath/libgtkpeer.la
-lib/classpath/libjavaio.la
 lib/classpath/libjavaio.so
 lib/classpath/libjavaio.so.0
-lib/classpath/libjavalang.la
+lib/classpath/libjavaio.so.0.0.0
 lib/classpath/libjavalang.so
 lib/classpath/libjavalang.so.0
-lib/classpath/libjavalangmanagement.la
+lib/classpath/libjavalang.so.0.0.0
 lib/classpath/libjavalangmanagement.so
 lib/classpath/libjavalangmanagement.so.0
-lib/classpath/libjavalangreflect.la
+lib/classpath/libjavalangmanagement.so.0.0.0
 lib/classpath/libjavalangreflect.so
 lib/classpath/libjavalangreflect.so.0
-lib/classpath/libjavanet.la
+lib/classpath/libjavalangreflect.so.0.0.0
 lib/classpath/libjavanet.so
 lib/classpath/libjavanet.so.0
-lib/classpath/libjavanio.la
+lib/classpath/libjavanet.so.0.0.0
 lib/classpath/libjavanio.so
 lib/classpath/libjavanio.so.0
-lib/classpath/libjavautil.la
+lib/classpath/libjavanio.so.0.0.0
 lib/classpath/libjavautil.so
 lib/classpath/libjavautil.so.0
-%%GMP%%lib/classpath/libjavamath.la
+lib/classpath/libjavautil.so.0.0.0
 %%GMP%%lib/classpath/libjavamath.so
 %%GTK2%%lib/classpath/libjawt.so
-%%GTK2%%lib/classpath/libjawt.la
 %%QT4%%lib/classpath/libqtpeer.so
-%%QT4%%lib/classpath/libqtpeer.la
 lib/logging.properties
 lib/security/classpath.security
- at dirrm lib/classpath
- at dirrmtry lib/security
+man/man1/gappletviewer.1.gz
+man/man1/gcjh.1.gz
+man/man1/gjar.1.gz
+man/man1/gjarsigner.1.gz
+man/man1/gjavah.1.gz
+%%GJDOC%%man/man1/gjdoc.1.gz
+man/man1/gkeytool.1.gz
+man/man1/gnative2ascii.1.gz
+man/man1/gorbd.1.gz
+man/man1/grmid.1.gz
+man/man1/grmiregistry.1.gz
+man/man1/gserialver.1.gz
+man/man1/gtnameserv.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.java2d
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile.jawt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
@@ -172,25 +178,3 @@
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnu/classpath/examples/swing/welcome.html
 %%DATADIR%%/glibj.zip
 %%DATADIR%%/tools.zip
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/swing
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/sound
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/print
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/midi
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/management
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/jawt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/java2d
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/icons
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/html
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/datatransfer
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/awt
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing/x5
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/swing
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication/communication
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/SimpleCommunication
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA/NamingService
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples/CORBA
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath/examples
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu/classpath
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%/gnu
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
- at dirrm %%DATADIR%%

More information about the Midnightbsd-cvs mailing list