From 02e06ac28ccae59c574a63abc05aa014b605df57 Mon Sep 17 00:00:00 2001 From: Joe Marcus Clarke Date: Sat, 19 Jun 2004 00:51:17 +0000 Subject: * Try a little harder to get firefox to work without first running as root * Make sure optimized CFLAGS are actually respected [1] * Frobnicate the mozconfig file a little bit to be more inline with typical Linux builds * Try a safer hack to ensure the install completes okay Reported by: kris [1] --- www/firefox15/Makefile | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'www/firefox15/Makefile') diff --git a/www/firefox15/Makefile b/www/firefox15/Makefile index ec944c9ba17b..6c77fb3bc839 100644 --- a/www/firefox15/Makefile +++ b/www/firefox15/Makefile @@ -7,7 +7,7 @@ PORTNAME= firefox PORTVERSION= 0.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= www MASTER_SITES= ${MASTER_SITE_MOZILLA} MASTER_SITE_SUBDIR= ${PORTNAME}/releases/${PORTVERSION} @@ -57,10 +57,6 @@ OPTIONS= DEBUG "Build a debugging image" off \ .include -.if ${ARCH} == "i386" -CONFIGURE_ENV+= WITH_REORDER=yes -.endif # ${ARCH} == "i386" - .if defined(WITH_DEBUG) WITH_LOGGING= yes CONFIGURE_ENV+= WITH_DEBUG=yes @@ -68,6 +64,9 @@ CONFIGURE_ENV+= WITH_DEBUG=yes .if defined(WITH_OPTIMIZED_CFLAGS) CFLAGS+= -O2 +CONFIGURE_ENV+= WITH_OPTIMIZE=-O2 +.else +CONFIGURE_ENV+= WITH_OPTIMIZE=-O .endif # defined(WITH_OPTIMIZED_CFLAGS) .if defined(WITH_LOGGING) @@ -137,10 +136,11 @@ pre-configure: fi post-build: - # XXX This works around an install problem that is triggered when - # toolkit/profile/src is built after profile/src. - @(cd ${WRKSRC}/dist/lib && ${LN} -sf ../../profile/src/libprofile_s.a \ - .) +# XXX This works around an install problem that is triggered when +# toolkit/profile/src is built after profile/src. +# @(cd ${WRKSRC}/dist/lib && ${LN} -sf ../../profile/src/libprofile_s.a \ +# .) + @${TOUCH} -f ${WRKSRC}/profile/build/libprofile.so pre-install: # Overview: the program installs itself in FAKEDIR, then a list is made of the -- cgit v1.2.3