View | Details | Raw Unified | Return to bug 219125 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-5 / +10 lines)
Lines 38-45 Link Here
38
BUILD_DEPENDS=	zip:archivers/zip \
38
BUILD_DEPENDS=	zip:archivers/zip \
39
		${LOCALBASE}/include/cups/cups.h:print/cups \
39
		${LOCALBASE}/include/cups/cups.h:print/cups \
40
		bash:shells/bash
40
		bash:shells/bash
41
LIB_DEPENDS=	libasound.so:audio/alsa-lib \
41
LIB_DEPENDS=	libfreetype.so:print/freetype2
42
		libfreetype.so:print/freetype2
43
X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
42
X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \
44
		libgif.so:graphics/giflib
43
		libgif.so:graphics/giflib
45
RUN_DEPENDS=	javavm:java/javavmwrapper \
44
RUN_DEPENDS=	javavm:java/javavmwrapper \
Lines 237-243 Link Here
237
CONFIGURE_ARGS+=	--disable-ccache \
236
CONFIGURE_ARGS+=	--disable-ccache \
238
			--disable-freetype-bundling \
237
			--disable-freetype-bundling \
239
			--disable-zip-debug-info \
238
			--disable-zip-debug-info \
240
			--with-alsa=${LOCALBASE} \
241
			--with-cacerts-file=${FILESDIR}/cacerts \
239
			--with-cacerts-file=${FILESDIR}/cacerts \
242
			--with-cups=${LOCALBASE} \
240
			--with-cups=${LOCALBASE} \
243
			--with-debug-level=${JDK_BUILD_TYPE} \
241
			--with-debug-level=${JDK_BUILD_TYPE} \
Lines 255-263 Link Here
255
CONFIGURE_SCRIPT=	../../configure
253
CONFIGURE_SCRIPT=	../../configure
256
CONFIGURE_WRKSRC=	${WRKSRC}/common/autoconf
254
CONFIGURE_WRKSRC=	${WRKSRC}/common/autoconf
257
255
258
OPTIONS_DEFINE=		POLICY TZUPDATE X11
256
OPTIONS_DEFINE=		ALSA POLICY TZUPDATE X11
259
OPTIONS_DEFINE_armv6=	FPUHACK
257
OPTIONS_DEFINE_armv6=	FPUHACK
260
OPTIONS_DEFAULT=	POLICY TZUPDATE X11
258
OPTIONS_DEFAULT=	ALSA POLICY TZUPDATE X11
261
OPTIONS_DEFAULT_armv6=	FPUHACK
259
OPTIONS_DEFAULT_armv6=	FPUHACK
262
FPUHACK_DESC=		Hack denormalized numbers in flush-to-zero mode
260
FPUHACK_DESC=		Hack denormalized numbers in flush-to-zero mode
263
POLICY_DESC=		Install the Unlimited Strength Policy Files
261
POLICY_DESC=		Install the Unlimited Strength Policy Files
Lines 280-285 Link Here
280
RELEASE_DESC=		Build for release (default)
278
RELEASE_DESC=		Build for release (default)
281
TEST_DESC=		Run regression tests
279
TEST_DESC=		Run regression tests
282
280
281
ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
282
ALSA_CONFIGURE_ON=	--with-alsa=${LOCALBASE}
283
ALSA_CONFIGURE_ENV_OFF=	ALSA_NOT_NEEDED=yes
283
DEBUG_VARS=		JDK_BUILD_TYPE=slowdebug
284
DEBUG_VARS=		JDK_BUILD_TYPE=slowdebug
284
DEBUGFAST_VARS=		JDK_BUILD_TYPE=fastdebug
285
DEBUGFAST_VARS=		JDK_BUILD_TYPE=fastdebug
285
RELEASE_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/objcopy:devel/binutils
286
RELEASE_BUILD_DEPENDS_OFF=	${LOCALBASE}/bin/objcopy:devel/binutils
Lines 419-424 Link Here
419
.endif
420
.endif
420
	@${CHMOD} 755 ${WRKSRC}/configure
421
	@${CHMOD} 755 ${WRKSRC}/configure
421
422
423
post-patch-ALSA-off:
424
	@${REINPLACE_CMD} '/EXTRA_SOUND_JNI_LIBS += jsoundalsa/d' \
425
		${WRKSRC}/jdk/make/lib/SoundLibraries.gmk
426
422
pre-configure:
427
pre-configure:
423
	@cd ${CONFIGURE_WRKSRC} && \
428
	@cd ${CONFIGURE_WRKSRC} && \
424
	${SED} -e "s|@DATE_WHEN_GENERATED@|$$(date +%s)|" configure.ac > \
429
	${SED} -e "s|@DATE_WHEN_GENERATED@|$$(date +%s)|" configure.ac > \

Return to bug 219125