head	1.3;
access;
symbols;
locks; strict;
comment	@# @;


1.3
date	2013.01.10.23.03.35;	author svnexp;	state dead;
branches;
next	1.2;

1.2
date	2012.11.20.23.18.40;	author svnexp;	state Exp;
branches;
next	1.1;

1.1
date	2012.09.07.22.10.01;	author flo;	state Exp;
branches;
next	;


desc
@@


1.3
log
@## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/310207
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r310207 | flo | 2013-01-10 22:29:23 +0000 (Thu, 10 Jan 2013) | 9 lines
## SVN ##
## SVN ## - update www/firefox to 18.0
## SVN ## - update www/firefox-esr to 17.0.2
## SVN ## - update www/seamonkey to 2.15 (enigmail to 1.5.0)
## SVN ## - remove QT4 option to avoid confusion (it turned out to be too experimental)
## SVN ##
## SVN ## In collaboration with: Jan Beich <jbeich@@tormail.org>
## SVN ##
## SVN ## Security:	http://www.vuxml.org/freebsd/a4ed6632-5aa9-11e2-8fcb-c8600054b392.html
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@# Bug 788039 - With no prefix search libevent via pkg-config.

--- configure.in~
+++ configure.in
@@@@ -3854,7 +3854,7 @@@@ fi
 dnl system libevent Support
 dnl ========================================================
 MOZ_ARG_WITH_STRING(system-libevent,
-[  --with-system-libevent=[PFX]
+[  --with-system-libevent[=PFX]
                           Use system libevent [installed at prefix PFX]],
     LIBEVENT_DIR=$withval)
 
@@@@ -3863,10 +3863,11 @@@@ _SAVE_LDFLAGS=$LDFLAGS
 _SAVE_LIBS=$LIBS
 if test -z "$LIBEVENT_DIR" -o "$LIBEVENT_DIR" = no; then
     MOZ_NATIVE_LIBEVENT=
+elif test "$LIBEVENT_DIR" = yes; then
+    PKG_CHECK_MODULES(MOZ_LIBEVENT, libevent,
+        MOZ_NATIVE_LIBEVENT=1,
+        AC_MSG_ERROR([--with-system-libevent requested but libevent package not found]))
 else
-    if test "${LIBEVENT_DIR}" = "yes"; then
-        LIBEVENT_DIR=/usr
-    fi
     CFLAGS="-I${LIBEVENT_DIR}/include $CFLAGS"
     LDFLAGS="-L${LIBEVENT_DIR}/lib $LDFLAGS"
     MOZ_CHECK_HEADER(event.h,
@@@@ -3876,16 +3877,16 @@@@ else
         AC_MSG_ERROR([--with-system-libevent requested but event.h not found]))
     AC_CHECK_LIB(event, event_init,
                  [MOZ_NATIVE_LIBEVENT=1
-                  MOZ_LIBEVENT_INCLUDES="${LIBEVENT_DIR}/include"
+                  MOZ_LIBEVENT_CFLAGS="-I${LIBEVENT_DIR}/include"
                   MOZ_LIBEVENT_LIBS="-L${LIBEVENT_DIR}/lib -levent"],
-                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_INCLUDES= MOZ_LIBEVENT_LIBS=])
+                 [MOZ_NATIVE_LIBEVENT= MOZ_LIBEVENT_CFLAGS= MOZ_LIBEVENT_LIBS=])
 fi
 CFLAGS=$_SAVE_CFLAGS
 LDFLAGS=$_SAVE_LDFLAGS
 LIBS=$_SAVE_LIBS
 
 AC_SUBST(MOZ_NATIVE_LIBEVENT)
-AC_SUBST(MOZ_LIBEVENT_INCLUDES)
+AC_SUBST(MOZ_LIBEVENT_CFLAGS)
 AC_SUBST(MOZ_LIBEVENT_LIBS)
 
 dnl ========================================================
@


1.2
log
@## SVN ##
## SVN ## Exported commit - http://svnweb.freebsd.org/changeset/base/ 307606
## SVN ## CVS IS DEPRECATED: http://wiki.freebsd.org/CvsIsDeprecated
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ## r307606 | flo | 2012-11-20 23:01:15 +0000 (Tue, 20 Nov 2012) | 14 lines
## SVN ##
## SVN ## - Update firefox and thunderbird to 17.0
## SVN ## - Update seamonkey to 2.14
## SVN ## - Update ESR ports and libxul to 10.0.11
## SVN ## - support more h264 codecs when using GSTREAMER with YouTube
## SVN ## - Unbreak firefox-esr, thunderbird-esr and libxul on head >= 1000024 [1]
## SVN ## - Buildsystem is not python 3 aware, use python up to 2.7 [2]
## SVN ##
## SVN ## PR:		ports/173679 [1]
## SVN ## Submitted by:	swills [1], demon [2]
## SVN ## In collaboration with:	Jan Beich <jbeich@@tormail.org>
## SVN ## Security:	d23119df-335d-11e2-b64c-c8600054b392
## SVN ## Approved by:	portmgr (beat)
## SVN ## Feature safe:	yes
## SVN ##
## SVN ## ------------------------------------------------------------------------
## SVN ##
@
text
@@


1.1
log
@SVN rev 303831 on 2012-09-07 22:10:01Z by flo

- Update firefox to 15.0.1
- Sync changes from gecko repository@@r995
 general
 - don't specify prefix for libevent when using pkg-config
 - ia64 and sparc64 use 8k pagesize by default
 - add visibility hack for clang 3.2 with libc++
 - fix build using clang 3.2 (on FreeBSD 10-CURRENT)
 - rename a few more patches to ease tracking of bugzilla bugs
 www/seamonkey
 - unbreak unsetting LDAP and MAILNEWS options after bug 707305
 - use compile time debugging WITH_DEBUG
 security/nss
 - unbreak install WITH_DEBUG
 - unbreak powerpc64
 devel/nspr
 - use absolute paths when specifiying srcdir to make gdb(1) happy

In collaboration with:	andreast, zeising, Jan Beich <jbeich@@tormail.org>
@
text
@a2 11
--- config/autoconf.mk.in~
+++ config/autoconf.mk.in
@@@@ -227,7 +227,7 @@@@ MOZ_HUNSPELL_CFLAGS = @@MOZ_HUNSPELL_CFLA
 
 MOZ_NATIVE_LIBEVENT = @@MOZ_NATIVE_LIBEVENT@@
 MOZ_LIBEVENT_LIBS = @@MOZ_LIBEVENT_LIBS@@
-MOZ_LIBEVENT_INCLUDES = @@MOZ_LIBEVENT_INCLUDES@@
+MOZ_LIBEVENT_CFLAGS = @@MOZ_LIBEVENT_CFLAGS@@
 
 MOZ_NATIVE_LIBVPX = @@MOZ_NATIVE_LIBVPX@@
 MOZ_LIBVPX_LIBS = @@MOZ_LIBVPX_LIBS@@
@

