Disable jpeg version checks. Remove entries from PLIST that are related

to the custom jpeg version. Bump revision.

4 files changed, 26 insertions, 16 deletions

diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 83697db8174..267e957114f 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.98 2013/06/06 14:08:46 ryoon Exp $
+# $NetBSD: Makefile,v 1.99 2013/07/03 13:49:28 joerg Exp $
 #
 
 DISTNAME=	# empty
 PKGNAME=	seamonkey-${SM_VER:S/b/beta/}
+PKGREVISION=	1
 SM_VER=		2.18b4
 #LIGHTNINGVER=	1.9
 PKGREVISION=	4
diff --git a/www/seamonkey/PLIST b/www/seamonkey/PLIST
index 25a54d6adb5..65bc760de28 100644
--- a/www/seamonkey/PLIST
+++ b/www/seamonkey/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2013/05/23 13:25:30 ryoon Exp $
+@comment $NetBSD: PLIST,v 1.36 2013/07/03 13:49:28 joerg Exp $
 bin/seamonkey
 include/seamonkey/AbstractMediaDecoder.h
 include/seamonkey/AccEvent.h
@@ -218,12 +218,6 @@ include/seamonkey/inISearchObserver.h
 include/seamonkey/inISearchProcess.h
 include/seamonkey/ipc/IPCMessageUtils.h
 include/seamonkey/jArray.h
-include/seamonkey/jconfig.h
-include/seamonkey/jerror.h
-include/seamonkey/jinclude.h
-include/seamonkey/jmorecfg.h
-include/seamonkey/jpegint.h
-include/seamonkey/jpeglib.h
 include/seamonkey/js-config.h
 include/seamonkey/js.msg
 include/seamonkey/js/Anchor.h
diff --git a/www/seamonkey/distinfo b/www/seamonkey/distinfo
index 4e2bfeab38f..49631983591 100644
--- a/www/seamonkey/distinfo
+++ b/www/seamonkey/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.98 2013/05/23 13:25:30 ryoon Exp $
+$NetBSD: distinfo,v 1.99 2013/07/03 13:49:28 joerg Exp $
 
 SHA1 (enigmail-1.5.1.tar.gz) = fec4c169731a9f0f47d1e443ea6f427196f759a7
 RMD160 (enigmail-1.5.1.tar.gz) = b7e3adc5f09d7671ac8c419a3cdd73f567351c79
@@ -7,7 +7,7 @@ SHA1 (seamonkey-2.18b4.source.tar.bz2) = 82e202bdd1b462fffac22b526e6a8cf8642da53
 RMD160 (seamonkey-2.18b4.source.tar.bz2) = 388ae233f5ce5384a243577e7c5b9d5508d1478a
 Size (seamonkey-2.18b4.source.tar.bz2) = 129351650 bytes
 SHA1 (patch-aa) = f39a2bc4665f70b3bdfca4cbec89951a09f8a727
-SHA1 (patch-aa-toplevel) = fe60b8b841eae442269993facb2680d13cefd457
+SHA1 (patch-aa-toplevel) = 284ab663b7bf204546447d22ffa5bf79f763fa58
 SHA1 (patch-ak) = a36dd36a037a76a40955316200b1f4603b9ed8e9
 SHA1 (patch-al) = 06ddb5f0f55ca02bee0d55ddb5316ddd9099f2d9
 SHA1 (patch-am) = 3c1343b4e71dd2ffa66ed0d4b59f9e7a1c5be2e0
diff --git a/www/seamonkey/patches/patch-aa-toplevel b/www/seamonkey/patches/patch-aa-toplevel
index 79d76d6374b..e6b6ede1c3d 100644
--- a/www/seamonkey/patches/patch-aa-toplevel
+++ b/www/seamonkey/patches/patch-aa-toplevel
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa-toplevel,v 1.11 2013/03/22 21:02:46 ryoon Exp $
+$NetBSD: patch-aa-toplevel,v 1.12 2013/07/03 13:49:28 joerg Exp $
 
---- configure.in.orig	2013-02-18 03:58:37.000000000 +0000
+--- configure.in.orig	2013-05-03 03:02:28.000000000 +0000
 +++ configure.in
-@@ -1573,7 +1573,7 @@ ld.])
+@@ -1590,7 +1590,7 @@ ld.])
      MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin'
      ;;
  
@@ -11,7 +11,7 @@ $NetBSD: patch-aa-toplevel,v 1.11 2013/03/22 21:02:46 ryoon Exp $
      if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then
  	DLL_SUFFIX=".so.1.0"
  	DSO_LDOPTS="-shared"
-@@ -1581,6 +1581,9 @@ ld.])
+@@ -1598,6 +1598,9 @@ ld.])
      if test ! "$GNU_CC"; then
  	DSO_LDOPTS="-Bshareable $DSO_LDOPTS"
      fi
@@ -21,7 +21,7 @@ $NetBSD: patch-aa-toplevel,v 1.11 2013/03/22 21:02:46 ryoon Exp $
      ;; 
  
  ia64*-hpux*)
-@@ -2511,6 +2514,9 @@ dnl ====================================
+@@ -2533,6 +2536,9 @@ dnl ====================================
  case $target in
  *-hpux11.*)
  	;;
@@ -31,7 +31,7 @@ $NetBSD: patch-aa-toplevel,v 1.11 2013/03/22 21:02:46 ryoon Exp $
  *)
  	AC_CHECK_LIB(c_r, gethostbyname_r)
  	;;
-@@ -2821,6 +2827,9 @@ AC_CACHE_CHECK(
+@@ -2843,6 +2849,9 @@ AC_CACHE_CHECK(
          #ifdef linux
          #define _BSD_SOURCE 1
          #endif
@@ -41,3 +41,18 @@ $NetBSD: patch-aa-toplevel,v 1.11 2013/03/22 21:02:46 ryoon Exp $
          #include <resolv.h>
          ],
          [int foo = res_ninit(&_res);],
+@@ -3668,13 +3677,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then
+     AC_TRY_COMPILE([ #include <stdio.h>
+                      #include <sys/types.h>
+                      #include <jpeglib.h> ],
+-                   [ #if JPEG_LIB_VERSION < $MOZJPEG
+-                     #error "Insufficient JPEG library version ($MOZJPEG required)."
+-                     #endif
+-                     #ifndef JCS_EXTENSIONS
+-                     #error "libjpeg-turbo JCS_EXTENSIONS required"
+-                     #endif
+-                     ],
++                   [ ],
+                    MOZ_NATIVE_JPEG=1,
+                    AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
+ fi