Date: Fri, 24 Aug 2012 12:37:14 GMT From: svn-freebsd-gecko@chruetertee.ch To: freebsd-gecko@freebsd.org Subject: [SVN-Commit] r951 - in branches/experimental: Mk www/seamonkey/files Message-ID: <201208241237.q7OCbEcf037557@trillian.chruetertee.ch>
next in thread | raw e-mail | index | archive | help
Author: jbeich
Date: Fri Aug 24 12:37:14 2012
New Revision: 951
Log:
cleanup and get rid of GENERIC_MOZCONFIG
Deleted:
branches/experimental/www/seamonkey/files/mozconfig-generic.in
Modified:
branches/experimental/Mk/bsd.gecko.mk
Modified: branches/experimental/Mk/bsd.gecko.mk
==============================================================================
--- branches/experimental/Mk/bsd.gecko.mk Fri Aug 24 12:37:06 2012 (r950)
+++ branches/experimental/Mk/bsd.gecko.mk Fri Aug 24 12:37:14 2012 (r951)
@@ -526,7 +526,6 @@
MOZ_PIS_DIR?= lib/${MOZILLA}/init.d
-GENERIC_MOZCONFIG?= ${.CURDIR}/../../www/seamonkey/files/mozconfig-generic.in
PORT_MOZCONFIG?= ${FILESDIR}/mozconfig.in
MOZCONFIG?= ${WRKSRC}/.mozconfig
MOZILLA_PLIST_DIRS?= bin lib
@@ -544,6 +543,10 @@
MOZ_PKGCONFIG_FILES?= ${MOZILLA}-gtkmozembed ${MOZILLA}-js \
${MOZILLA}-xpcom ${MOZILLA}-plugin
+MOZ_EXPORT+= ${CONFIGURE_ENV} \
+ LIBS="${LIBS}" PERL="${PERL}"
+MOZ_OPTIONS+= --prefix="${FAKEDIR}"
+
CPPFLAGS+= -isystem${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -641,8 +644,6 @@
--disable-necko-wifi \
--disable-updater \
--disable-pedantic
-MOZ_MK_OPTIONS+= XP_UNIX=1 \
- PERL=${PERL}
.if ${CXXFLAGS:M-stdlib=libc++}
LIBS+= -lcxxrt
@@ -799,9 +800,6 @@
.endif
@${RM} -f ${MOZCONFIG}
.if !defined(NOMOZCONFIG)
-.if exists(${GENERIC_MOZCONFIG})
- @${MOZCONFIG_SED} < ${GENERIC_MOZCONFIG} >> ${MOZCONFIG}
-.endif
@if [ -e ${PORT_MOZCONFIG} ] ; then \
${MOZCONFIG_SED} < ${PORT_MOZCONFIG} >> ${MOZCONFIG} ; \
fi
Deleted: branches/experimental/www/seamonkey/files/mozconfig-generic.in
==============================================================================
--- branches/experimental/www/seamonkey/files/mozconfig-generic.in Fri Aug 24 12:37:14 2012 (r950)
+++ /dev/null 00:00:00 1970 (deleted)
@@ -1,8 +0,0 @@
-ac_add_options --prefix=@FAKEDIR@
-export CPPFLAGS="@CPPFLAGS@"
-export CFLAGS="@CFLAGS@"
-export LIBS="@LIBS@"
-export LDFLAGS="@LDFLAGS@"
-export CONFIG_SH=/bin/sh
-export XP_UNIX=1
-export PERL="@PERL@"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201208241237.q7OCbEcf037557>