diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2013-10-10 16:49:02 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2013-10-10 16:49:02 +0000 |
| commit | 738fcd72c1ecf9876f1ea6e027c33854867dc18f (patch) | |
| tree | d839ad7395fc8d071050ca0f3216195c7cb7df8f /java | |
| parent | - Mark BROKEN, set very short EXPIRATION_DATE (diff) | |
- Remove redundant bsd.port.pre.mk.
- Convert LIB_DEPENDS to new formats.
Submitted by: bar
Notes
Notes:
svn path=/head/; revision=330018
Diffstat (limited to 'java')
| -rw-r--r-- | java/openjdk6/Makefile | 6 |
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 |