aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2013-10-11 00:49:02 +0800
committerjkim <jkim@FreeBSD.org>2013-10-11 00:49:02 +0800
commite0ba235971b21104bb80f3626bc497cdf066981a (patch)
treed839ad7395fc8d071050ca0f3216195c7cb7df8f /java
parent7eb8a1392dea923a8c5cc75a5b80c6814b23ae55 (diff)
downloadfreebsd-ports-gnome-e0ba235971b21104bb80f3626bc497cdf066981a.tar.gz
freebsd-ports-gnome-e0ba235971b21104bb80f3626bc497cdf066981a.tar.zst
freebsd-ports-gnome-e0ba235971b21104bb80f3626bc497cdf066981a.zip
- Remove redundant bsd.port.pre.mk.
- Convert LIB_DEPENDS to new formats. Submitted by: bar
Diffstat (limited to 'java')
-rw-r--r--java/openjdk6/Makefile6
1 files changed, 2 insertions, 4 deletions
diff --git a/java/openjdk6/Makefile b/java/openjdk6/Makefile
index 9587297d4ab4..f510398c979a 100644
--- a/java/openjdk6/Makefile
+++ b/java/openjdk6/Makefile
@@ -25,7 +25,7 @@ LICENSE_DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
BUILD_DEPENDS= ${LOCALBASE}/bin/zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
${LOCALBASE}/include/cups/cups.h:${PORTSDIR}/print/cups-client
-LIB_DEPENDS= freetype:${PORTSDIR}/print/freetype2
+LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2
RUN_DEPENDS= javavm:${PORTSDIR}/java/javavmwrapper \
${LOCALBASE}/lib/X11/fonts/dejavu:${PORTSDIR}/x11-fonts/dejavu
@@ -69,8 +69,6 @@ JTREG_BUILD= b05_29_nov_2012
JTREGFILE= jtreg-4.1-bin-${JTREG_BUILD}.zip
UPDATE_VERSION= 32
-.include <bsd.port.pre.mk>
-
.if ${PORT_OPTIONS:MIPV6}
CATEGORIES+= ipv6
.endif
@@ -147,7 +145,7 @@ MAKE_ENV+= DONT_ENABLE_IPV6="YES"
.if ${PORT_OPTIONS:MSOUND}
EXTRA_PATCHES+= ${FILESDIR}/alsa-enable.patch
-LIB_DEPENDS+= asound:${PORTSDIR}/audio/alsa-lib
+LIB_DEPENDS+= libasound.so:${PORTSDIR}/audio/alsa-lib
RUN_DEPENDS+= ${LOCALBASE}/lib/alsa-lib/libasound_module_pcm_oss.so:${PORTSDIR}/audio/alsa-plugins
.else
EXTRA_PATCHES+= ${FILESDIR}/alsa-disable.patch