[Midnightbsd-cvs] mports [20151] trunk/java/openjdk7/Makefile: fix depends and java registration

[laffer1 at midnightbsd.org]

Revision: 20151
          http://svnweb.midnightbsd.org/mports/?rev=20151
Author:   laffer1
Date:     2015-08-30 16:49:12 -0400 (Sun, 30 Aug 2015)
Log Message:
-----------
fix depends and java registration

Modified Paths:
--------------
    trunk/java/openjdk7/Makefile

Modified: trunk/java/openjdk7/Makefile
===================================================================
--- trunk/java/openjdk7/Makefile	2015-08-30 20:42:10 UTC (rev 20150)
+++ trunk/java/openjdk7/Makefile	2015-08-30 20:49:12 UTC (rev 20151)
@@ -47,13 +47,13 @@
 ANT_VERSION=		1.8.4
 ANT_DISTFILE=		apache-ant-${ANT_VERSION}-bin
 
-LIB_DEPENDS+=	freetype:${PORTSDIR}/print/freetype2 \
-		asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2 \
+		libasound.so:${PORTSDIR}/audio/alsa-lib
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip \
 		unzip:${PORTSDIR}/archivers/unzip \
 		${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
 RUN_DEPENDS+=	javavm:${PORTSDIR}/java/javavmwrapper \
-		${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
+		${LOCALBASE}/share/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
 
 USE_DOS2UNIX=	jdk/src/share/classes/com/sun/org/apache/xml/internal/security/resource/xmlsecurity_en.properties
 
@@ -183,11 +183,11 @@
 	@${CHOWN} ${BINOWN}:${BINGRP} ${INSTALLDIR}/jre/lib/${ARCH}/jexec
 	@${CHMOD} ${BINMODE} ${INSTALLDIR}/jre/lib/${ARCH}/jexec
 	@${INSTALL_DATA} ${FILESDIR}/cacerts ${INSTALLDIR}/jre/lib/security/cacerts
-	@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${TRUE_PREFIX}${PORTNAME}/${JDK_MAJOR_VERSION}/bin/java" >> ${TMPPLIST}
+	@${ECHO} "@unexec ${LOCALBASE}/bin/unregistervm ${TRUE_PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}/bin/java" >> ${TMPPLIST}
 	@${FIND} -s ${INSTALLDIR} -not -type d | ${SORT} | \
 		${SED} -e 's#^${PREFIX}/##' >> ${TMPPLIST}
 	@${FIND} ${INSTALLDIR} -type d | ${SORT} -r | \
 		${SED} -e 's,^${PREFIX}/, at dirrm ,' >> ${TMPPLIST}
-	@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${TRUE_PREFIX}${PORTNAME}/${JDK_MAJOR_VERSION}/bin/java # OpenJDK${JDK_MAJOR_VERSION}'" >> ${TMPPLIST}
+	@${ECHO} "@exec ${LOCALBASE}/bin/registervm '${TRUE_PREFIX}/${PORTNAME}${JDK_MAJOR_VERSION}/bin/java # OpenJDK${JDK_MAJOR_VERSION}'" >> ${TMPPLIST}
 
 .include <bsd.port.mk>