Disable jpeg version checks. Remove entries from PLIST that are related to the custom jpeg version. Bump revision.diff -r1.98 -r1.99 pkgsrc/www/seamonkey/Makefile
(joerg)
@@ -1,18 +1,19 @@ | @@ -1,18 +1,19 @@ | |||
1 | # $NetBSD: Makefile,v 1.98 2013/06/06 14:08:46 ryoon Exp $ | 1 | # $NetBSD: Makefile,v 1.99 2013/07/03 13:49:28 joerg Exp $ | |
2 | # | 2 | # | |
3 | 3 | |||
4 | DISTNAME= # empty | 4 | DISTNAME= # empty | |
5 | PKGNAME= seamonkey-${SM_VER:S/b/beta/} | 5 | PKGNAME= seamonkey-${SM_VER:S/b/beta/} | |
6 | PKGREVISION= 1 | |||
6 | SM_VER= 2.18b4 | 7 | SM_VER= 2.18b4 | |
7 | #LIGHTNINGVER= 1.9 | 8 | #LIGHTNINGVER= 1.9 | |
8 | PKGREVISION= 4 | 9 | PKGREVISION= 4 | |
9 | CATEGORIES= www | 10 | CATEGORIES= www | |
10 | MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} \ | 11 | MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${SM_VER}/source/} \ | |
11 | ${MASTER_SITE_MOZILLA_ALL:=seamonkey/releases/${SM_VER}/source/} | 12 | ${MASTER_SITE_MOZILLA_ALL:=seamonkey/releases/${SM_VER}/source/} | |
12 | DISTFILES= seamonkey-${SM_VER}.source.tar.bz2 | 13 | DISTFILES= seamonkey-${SM_VER}.source.tar.bz2 | |
13 | # lightning-${LIGHTNINGVER}.source.tar.bz2 | 14 | # lightning-${LIGHTNINGVER}.source.tar.bz2 | |
14 | #SITES.lightning-${LIGHTNINGVER}.source.tar.bz2= ${MASTER_SITE_MOZILLA:=calendar/lightning/releases/${LIGHTNINGVER}/source/} | 15 | #SITES.lightning-${LIGHTNINGVER}.source.tar.bz2= ${MASTER_SITE_MOZILLA:=calendar/lightning/releases/${LIGHTNINGVER}/source/} | |
15 | EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2= ${WRKSRC}/lightning | 16 | EXTRACT_DIR.lightning-${LIGHTNINGVER}.source.tar.bz2= ${WRKSRC}/lightning | |
16 | 17 | |||
17 | MAINTAINER= pkgsrc-users@NetBSD.org | 18 | MAINTAINER= pkgsrc-users@NetBSD.org | |
18 | HOMEPAGE= http://www.seamonkey-project.org/ | 19 | HOMEPAGE= http://www.seamonkey-project.org/ |
@@ -1,23 +1,23 @@ | @@ -1,23 +1,23 @@ | |||
1 | $NetBSD: distinfo,v 1.98 2013/05/23 13:25:30 ryoon Exp $ | 1 | $NetBSD: distinfo,v 1.99 2013/07/03 13:49:28 joerg Exp $ | |
2 | 2 | |||
3 | SHA1 (enigmail-1.5.1.tar.gz) = fec4c169731a9f0f47d1e443ea6f427196f759a7 | 3 | SHA1 (enigmail-1.5.1.tar.gz) = fec4c169731a9f0f47d1e443ea6f427196f759a7 | |
4 | RMD160 (enigmail-1.5.1.tar.gz) = b7e3adc5f09d7671ac8c419a3cdd73f567351c79 | 4 | RMD160 (enigmail-1.5.1.tar.gz) = b7e3adc5f09d7671ac8c419a3cdd73f567351c79 | |
5 | Size (enigmail-1.5.1.tar.gz) = 1213954 bytes | 5 | Size (enigmail-1.5.1.tar.gz) = 1213954 bytes | |
6 | SHA1 (seamonkey-2.18b4.source.tar.bz2) = 82e202bdd1b462fffac22b526e6a8cf8642da537 | 6 | SHA1 (seamonkey-2.18b4.source.tar.bz2) = 82e202bdd1b462fffac22b526e6a8cf8642da537 | |
7 | RMD160 (seamonkey-2.18b4.source.tar.bz2) = 388ae233f5ce5384a243577e7c5b9d5508d1478a | 7 | RMD160 (seamonkey-2.18b4.source.tar.bz2) = 388ae233f5ce5384a243577e7c5b9d5508d1478a | |
8 | Size (seamonkey-2.18b4.source.tar.bz2) = 129351650 bytes | 8 | Size (seamonkey-2.18b4.source.tar.bz2) = 129351650 bytes | |
9 | SHA1 (patch-aa) = f39a2bc4665f70b3bdfca4cbec89951a09f8a727 | 9 | SHA1 (patch-aa) = f39a2bc4665f70b3bdfca4cbec89951a09f8a727 | |
10 | SHA1 (patch-aa-toplevel) = fe60b8b841eae442269993facb2680d13cefd457 | 10 | SHA1 (patch-aa-toplevel) = 284ab663b7bf204546447d22ffa5bf79f763fa58 | |
11 | SHA1 (patch-ak) = a36dd36a037a76a40955316200b1f4603b9ed8e9 | 11 | SHA1 (patch-ak) = a36dd36a037a76a40955316200b1f4603b9ed8e9 | |
12 | SHA1 (patch-al) = 06ddb5f0f55ca02bee0d55ddb5316ddd9099f2d9 | 12 | SHA1 (patch-al) = 06ddb5f0f55ca02bee0d55ddb5316ddd9099f2d9 | |
13 | SHA1 (patch-am) = 3c1343b4e71dd2ffa66ed0d4b59f9e7a1c5be2e0 | 13 | SHA1 (patch-am) = 3c1343b4e71dd2ffa66ed0d4b59f9e7a1c5be2e0 | |
14 | SHA1 (patch-an) = a76456ccf059756b6582c0586cbf76c1cdabf1c3 | 14 | SHA1 (patch-an) = a76456ccf059756b6582c0586cbf76c1cdabf1c3 | |
15 | SHA1 (patch-ao) = 330d7ed17b5cee49c408c9bc48edc3cedeb04061 | 15 | SHA1 (patch-ao) = 330d7ed17b5cee49c408c9bc48edc3cedeb04061 | |
16 | SHA1 (patch-as) = 4f80d55984623c5924ecb36cfee6ee2530d7e630 | 16 | SHA1 (patch-as) = 4f80d55984623c5924ecb36cfee6ee2530d7e630 | |
17 | SHA1 (patch-au) = 9a7352ed6251a7e19ef8b8684057e994ed21d8e6 | 17 | SHA1 (patch-au) = 9a7352ed6251a7e19ef8b8684057e994ed21d8e6 | |
18 | SHA1 (patch-az) = 74191395f7cae0914111e86af390b8d115c3b93d | 18 | SHA1 (patch-az) = 74191395f7cae0914111e86af390b8d115c3b93d | |
19 | SHA1 (patch-ba) = 453e13f23c8935a6d6edb4a12f6f128558227257 | 19 | SHA1 (patch-ba) = 453e13f23c8935a6d6edb4a12f6f128558227257 | |
20 | SHA1 (patch-bd) = d148a08d6aa03c559d9250cf9a30ca66f1a76859 | 20 | SHA1 (patch-bd) = d148a08d6aa03c559d9250cf9a30ca66f1a76859 | |
21 | SHA1 (patch-bf) = a199d37e83823dee168c1a32f5aeac834b96714f | 21 | SHA1 (patch-bf) = a199d37e83823dee168c1a32f5aeac834b96714f | |
22 | SHA1 (patch-bg) = 1b4da74724d24693d863392e1963fa674d34b72e | 22 | SHA1 (patch-bg) = 1b4da74724d24693d863392e1963fa674d34b72e | |
23 | SHA1 (patch-bi) = 904ec1a966d6224f873836d8cbee2eb80eb2d2a9 | 23 | SHA1 (patch-bi) = 904ec1a966d6224f873836d8cbee2eb80eb2d2a9 |
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | @comment $NetBSD: PLIST,v 1.35 2013/05/23 13:25:30 ryoon Exp $ | 1 | @comment $NetBSD: PLIST,v 1.36 2013/07/03 13:49:28 joerg Exp $ | |
2 | bin/seamonkey | 2 | bin/seamonkey | |
3 | include/seamonkey/AbstractMediaDecoder.h | 3 | include/seamonkey/AbstractMediaDecoder.h | |
4 | include/seamonkey/AccEvent.h | 4 | include/seamonkey/AccEvent.h | |
5 | include/seamonkey/AnimationCommon.h | 5 | include/seamonkey/AnimationCommon.h | |
6 | include/seamonkey/AudioAvailableEventManager.h | 6 | include/seamonkey/AudioAvailableEventManager.h | |
7 | include/seamonkey/AudioChannelAgent.h | 7 | include/seamonkey/AudioChannelAgent.h | |
8 | include/seamonkey/AudioChannelCommon.h | 8 | include/seamonkey/AudioChannelCommon.h | |
9 | include/seamonkey/AudioChannelFormat.h | 9 | include/seamonkey/AudioChannelFormat.h | |
10 | include/seamonkey/AudioChannelService.h | 10 | include/seamonkey/AudioChannelService.h | |
11 | include/seamonkey/AudioChannelServiceChild.h | 11 | include/seamonkey/AudioChannelServiceChild.h | |
12 | include/seamonkey/AudioEventTimeline.h | 12 | include/seamonkey/AudioEventTimeline.h | |
13 | include/seamonkey/AudioNodeEngine.h | 13 | include/seamonkey/AudioNodeEngine.h | |
14 | include/seamonkey/AudioNodeStream.h | 14 | include/seamonkey/AudioNodeStream.h | |
@@ -208,32 +208,26 @@ include/seamonkey/imgIScriptedNotificati | @@ -208,32 +208,26 @@ include/seamonkey/imgIScriptedNotificati | |||
208 | include/seamonkey/imgITools.h | 208 | include/seamonkey/imgITools.h | |
209 | include/seamonkey/imgLoader.h | 209 | include/seamonkey/imgLoader.h | |
210 | include/seamonkey/imgRequest.h | 210 | include/seamonkey/imgRequest.h | |
211 | include/seamonkey/imgRequestProxy.h | 211 | include/seamonkey/imgRequestProxy.h | |
212 | include/seamonkey/inICSSValueSearch.h | 212 | include/seamonkey/inICSSValueSearch.h | |
213 | include/seamonkey/inIDOMUtils.h | 213 | include/seamonkey/inIDOMUtils.h | |
214 | include/seamonkey/inIDOMView.h | 214 | include/seamonkey/inIDOMView.h | |
215 | include/seamonkey/inIDeepTreeWalker.h | 215 | include/seamonkey/inIDeepTreeWalker.h | |
216 | include/seamonkey/inIFlasher.h | 216 | include/seamonkey/inIFlasher.h | |
217 | include/seamonkey/inISearchObserver.h | 217 | include/seamonkey/inISearchObserver.h | |
218 | include/seamonkey/inISearchProcess.h | 218 | include/seamonkey/inISearchProcess.h | |
219 | include/seamonkey/ipc/IPCMessageUtils.h | 219 | include/seamonkey/ipc/IPCMessageUtils.h | |
220 | include/seamonkey/jArray.h | 220 | include/seamonkey/jArray.h | |
221 | include/seamonkey/jconfig.h | |||
222 | include/seamonkey/jerror.h | |||
223 | include/seamonkey/jinclude.h | |||
224 | include/seamonkey/jmorecfg.h | |||
225 | include/seamonkey/jpegint.h | |||
226 | include/seamonkey/jpeglib.h | |||
227 | include/seamonkey/js-config.h | 221 | include/seamonkey/js-config.h | |
228 | include/seamonkey/js.msg | 222 | include/seamonkey/js.msg | |
229 | include/seamonkey/js/Anchor.h | 223 | include/seamonkey/js/Anchor.h | |
230 | include/seamonkey/js/CharacterEncoding.h | 224 | include/seamonkey/js/CharacterEncoding.h | |
231 | include/seamonkey/js/GCAPI.h | 225 | include/seamonkey/js/GCAPI.h | |
232 | include/seamonkey/js/HashTable.h | 226 | include/seamonkey/js/HashTable.h | |
233 | include/seamonkey/js/HeapAPI.h | 227 | include/seamonkey/js/HeapAPI.h | |
234 | include/seamonkey/js/LegacyIntTypes.h | 228 | include/seamonkey/js/LegacyIntTypes.h | |
235 | include/seamonkey/js/MemoryMetrics.h | 229 | include/seamonkey/js/MemoryMetrics.h | |
236 | include/seamonkey/js/PropertyKey.h | 230 | include/seamonkey/js/PropertyKey.h | |
237 | include/seamonkey/js/RequiredDefines.h | 231 | include/seamonkey/js/RequiredDefines.h | |
238 | include/seamonkey/js/TemplateLib.h | 232 | include/seamonkey/js/TemplateLib.h | |
239 | include/seamonkey/js/Utility.h | 233 | include/seamonkey/js/Utility.h |
@@ -1,43 +1,58 @@ | @@ -1,43 +1,58 @@ | |||
1 | $NetBSD: patch-aa-toplevel,v 1.11 2013/03/22 21:02:46 ryoon Exp $ | 1 | $NetBSD: patch-aa-toplevel,v 1.12 2013/07/03 13:49:28 joerg Exp $ | |
2 | 2 | |||
3 | --- configure.in.orig 2013-02-18 03:58:37.000000000 +0000 | 3 | --- configure.in.orig 2013-05-03 03:02:28.000000000 +0000 | |
4 | +++ configure.in | 4 | +++ configure.in | |
5 | @@ -1573,7 +1573,7 @@ ld.]) | 5 | @@ -1590,7 +1590,7 @@ ld.]) | |
6 | MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' | 6 | MOZ_FIX_LINK_PATHS='-Wl,-executable_path,$(LIBXUL_DIST)/bin' | |
7 | ;; | 7 | ;; | |
8 | 8 | |||
9 | -*-freebsd*) | 9 | -*-freebsd*) | |
10 | +*-freebsd* | *-dragonfly*) | 10 | +*-freebsd* | *-dragonfly*) | |
11 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | 11 | if test `test -x /usr/bin/objformat && /usr/bin/objformat || echo elf` != "elf"; then | |
12 | DLL_SUFFIX=".so.1.0" | 12 | DLL_SUFFIX=".so.1.0" | |
13 | DSO_LDOPTS="-shared" | 13 | DSO_LDOPTS="-shared" | |
14 | @@ -1581,6 +1581,9 @@ ld.]) | 14 | @@ -1598,6 +1598,9 @@ ld.]) | |
15 | if test ! "$GNU_CC"; then | 15 | if test ! "$GNU_CC"; then | |
16 | DSO_LDOPTS="-Bshareable $DSO_LDOPTS" | 16 | DSO_LDOPTS="-Bshareable $DSO_LDOPTS" | |
17 | fi | 17 | fi | |
18 | + if test "$LIBRUNPATH"; then | 18 | + if test "$LIBRUNPATH"; then | |
19 | + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" | 19 | + DSO_LDOPTS="-Wl,-R$LIBRUNPATH $DSO_LDOPTS" | |
20 | + fi | 20 | + fi | |
21 | ;; | 21 | ;; | |
22 | 22 | |||
23 | ia64*-hpux*) | 23 | ia64*-hpux*) | |
24 | @@ -2511,6 +2514,9 @@ dnl ==================================== | 24 | @@ -2533,6 +2536,9 @@ dnl ==================================== | |
25 | case $target in | 25 | case $target in | |
26 | *-hpux11.*) | 26 | *-hpux11.*) | |
27 | ;; | 27 | ;; | |
28 | +*-dragonfly*) | 28 | +*-dragonfly*) | |
29 | + AC_CHECK_LIB(c, gethostbyname_r) | 29 | + AC_CHECK_LIB(c, gethostbyname_r) | |
30 | + ;; | 30 | + ;; | |
31 | *) | 31 | *) | |
32 | AC_CHECK_LIB(c_r, gethostbyname_r) | 32 | AC_CHECK_LIB(c_r, gethostbyname_r) | |
33 | ;; | 33 | ;; | |
34 | @@ -2821,6 +2827,9 @@ AC_CACHE_CHECK( | 34 | @@ -2843,6 +2849,9 @@ AC_CACHE_CHECK( | |
35 | #ifdef linux | 35 | #ifdef linux | |
36 | #define _BSD_SOURCE 1 | 36 | #define _BSD_SOURCE 1 | |
37 | #endif | 37 | #endif | |
38 | + #ifdef __NetBSD__ | 38 | + #ifdef __NetBSD__ | |
39 | + #error use of global _res variable in threaded programs is not portable | 39 | + #error use of global _res variable in threaded programs is not portable | |
40 | + #endif | 40 | + #endif | |
41 | #include <resolv.h> | 41 | #include <resolv.h> | |
42 | ], | 42 | ], | |
43 | [int foo = res_ninit(&_res);], | 43 | [int foo = res_ninit(&_res);], | |
44 | @@ -3668,13 +3677,7 @@ if test "$MOZ_NATIVE_JPEG" = 1; then | |||
45 | AC_TRY_COMPILE([ #include <stdio.h> | |||
46 | #include <sys/types.h> | |||
47 | #include <jpeglib.h> ], | |||
48 | - [ #if JPEG_LIB_VERSION < $MOZJPEG | |||
49 | - #error "Insufficient JPEG library version ($MOZJPEG required)." | |||
50 | - #endif | |||
51 | - #ifndef JCS_EXTENSIONS | |||
52 | - #error "libjpeg-turbo JCS_EXTENSIONS required" | |||
53 | - #endif | |||
54 | - ], | |||
55 | + [ ], | |||
56 | MOZ_NATIVE_JPEG=1, | |||
57 | AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg])) | |||
58 | fi |