CVS commit: pkgsrc/www/seamonkey

["Nia Alarie" <nia%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   nia
Date:           Sat Mar  8 16:15:58 UTC 2025

Modified Files:
        pkgsrc/www/seamonkey: Makefile mozilla-common.mk options.mk

Log Message:
seamonkey: Cleanup, delint

Removed broken and unused PLIST_VARS and workarounds that are no
longer valid.


To generate a diff of this commit:
cvs rdiff -u -r1.278 -r1.279 pkgsrc/www/seamonkey/Makefile
cvs rdiff -u -r1.25 -r1.26 pkgsrc/www/seamonkey/mozilla-common.mk
cvs rdiff -u -r1.46 -r1.47 pkgsrc/www/seamonkey/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/seamonkey/Makefile
diff -u pkgsrc/www/seamonkey/Makefile:1.278 pkgsrc/www/seamonkey/Makefile:1.279
--- pkgsrc/www/seamonkey/Makefile:1.278 Wed Feb 12 06:45:40 2025
+++ pkgsrc/www/seamonkey/Makefile       Sat Mar  8 16:15:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.278 2025/02/12 06:45:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.279 2025/03/08 16:15:58 nia Exp $
 
 DISTNAME=      seamonkey-${SM_VER}.source
 PKGNAME=       seamonkey-${SM_VER:S/b/beta/}
@@ -43,6 +43,8 @@ CONFIGURE_ARGS+=      --enable-application=co
 CONFIGURE_ARGS+=       --enable-calendar
 CONFIGURE_ARGS+=       --enable-irc
 CONFIGURE_ARGS+=       --enable-dominspector
+CONFIGURE_ARGS+=       --disable-jemalloc
+CONFIGURE_ARGS+=       --disable-webrtc
 
 ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
 #ALL_ENV+=             MOZ_APP_NAME=${PKGBASE}
@@ -60,7 +62,7 @@ CHECK_INTERPRETER_SKIP+=      lib/seamonkey-s
 
 CHECK_WRKREF_SKIP+=            lib/seamonkey/omni.ja
 
-CKSUM_CRATES+= third_party/rust/libc/
+CKSUM_CRATES+= third_party/rust/libc/
 # src/unix/bsd/netbsdlike/netbsd/other/mod.rs
 CKSUMS+=       4d9f7091af8e166943ac6f42ce85558909e5b6e61325039bff7adfbcf4b90212
 CKSUMS+=       30c5211b393d9314f880f63e29833785c8b55369102eec21170a0fe0fd1c4a16

Index: pkgsrc/www/seamonkey/mozilla-common.mk
diff -u pkgsrc/www/seamonkey/mozilla-common.mk:1.25 pkgsrc/www/seamonkey/mozilla-common.mk:1.26
--- pkgsrc/www/seamonkey/mozilla-common.mk:1.25 Sat Aug  3 09:34:01 2024
+++ pkgsrc/www/seamonkey/mozilla-common.mk      Sat Mar  8 16:15:58 2025
@@ -1,4 +1,4 @@
-# $NetBSD: mozilla-common.mk,v 1.25 2024/08/03 09:34:01 nia Exp $
+# $NetBSD: mozilla-common.mk,v 1.26 2025/03/08 16:15:58 nia Exp $
 #
 # common Makefile fragment for mozilla packages based on gecko 2.0.
 #
@@ -7,7 +7,6 @@
 HAS_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --prefix=${PREFIX}
 USE_TOOLS+=            pkg-config perl gmake autoconf213 unzip zip
-USE_LANGUAGES+=                c99 c++
 UNLIMIT_RESOURCES+=    datasize virtualsize
 
 GCC_REQD+=             4.9
@@ -128,53 +127,10 @@ OBJDIR=                   ${WRKDIR}/build
 CONFIGURE_DIRS=                ${OBJDIR}
 CONFIGURE_SCRIPT=      ${WRKSRC}/configure
 
-PLIST_VARS+=   sps vorbis tremor glskia throwwrapper mozglue avx86
-
-.include "../../mk/endian.mk"
-.if ${MACHINE_ENDIAN} == "little"
-PLIST.glskia=  yes
-.endif
-
-.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64" || \
-    ${MACHINE_ARCH} == "aarch64"
-PLIST.avx86=   yes     # see media/libav/README_MOZILLA
-.endif
-
-.if ${MACHINE_ARCH} != "sparc64"
-# For some reasons the configure test for GCC bug 26905 still triggers on
-# sparc64, which makes mozilla skip the installation of a few wrapper headers.
-# Other archs end up with one additional file in the SDK headers
-PLIST.throwwrapper=    yes
-.endif
-
-.if !empty(MACHINE_PLATFORM:S/i386/x86/:MLinux-*-x86*)
-PLIST.sps=     yes
-.endif
-
-.if !empty(MACHINE_PLATFORM:MLinux-*-arm*)
-PLIST.tremor=  yes
-.else
-PLIST.vorbis=  yes
-.endif
-
-# See ${WRKSRC}/mozglue/build/moz.build: libmozglue is built and
-# installed as a shared library on these platforms.
-.if ${OPSYS} == "Cygwin" || ${OPSYS} == "Darwin" # or Android
-PLIST.mozglue= yes
-.endif
-
 # See ${WRKSRC}/security/sandbox/mac/Sandbox.mm: On Darwin, sandboxing
 # support is only available when the toolkit is cairo-cocoa.
 CONFIGURE_ARGS.Darwin+=        --disable-sandbox
 
-# See ${WRKSRC}/configure.in: It tries to use MacOS X 10.6 SDK by
-# default, which is not always possible.
-.if !empty(MACHINE_PLATFORM:MDarwin-8.*-*)
-CONFIGURE_ARGS+=       --enable-macos-target=10.4
-.elif !empty(MACHINE_PLATFORM:MDarwin-9.*-*)
-CONFIGURE_ARGS+=       --enable-macos-target=10.5
-.endif
-
 # Makefiles sometimes call "rm -f" without more arguments. Kludge around ...
 .PHONY: create-rm-wrapper
 pre-configure: create-rm-wrapper
@@ -192,14 +148,6 @@ CONFIGURE_ENV.NetBSD+=     ac_cv_thread_keyw
 PREFER.bzip2?= pkgsrc
 .endif
 
-.if ${OPSYS} == "OpenBSD"
-PLIST_SUBST+=  DLL_SUFFIX=".so.1.0"
-.elif ${OPSYS} == "Darwin"
-PLIST_SUBST+=  DLL_SUFFIX=".dylib"
-.else
-PLIST_SUBST+=  DLL_SUFFIX=".so"
-.endif
-
 .include "../../mk/atomic64.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libevent+=       libevent>=1.1

Index: pkgsrc/www/seamonkey/options.mk
diff -u pkgsrc/www/seamonkey/options.mk:1.46 pkgsrc/www/seamonkey/options.mk:1.47
--- pkgsrc/www/seamonkey/options.mk:1.46        Mon Feb  8 12:26:20 2021
+++ pkgsrc/www/seamonkey/options.mk     Sat Mar  8 16:15:58 2025
@@ -1,20 +1,17 @@
-# $NetBSD: options.mk,v 1.46 2021/02/08 12:26:20 ryoon Exp $
+# $NetBSD: options.mk,v 1.47 2025/03/08 16:15:58 nia Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.seamonkey
 
-PKG_SUPPORTED_OPTIONS= official-mozilla-branding
-PKG_SUPPORTED_OPTIONS+=        debug debug-info mozilla-jemalloc webrtc
+PKG_SUPPORTED_OPTIONS+=        debug debug-info
 PKG_SUPPORTED_OPTIONS+=        alsa pulseaudio dbus
-PLIST_VARS+=           jemalloc debug
+PLIST_VARS+=           debug
 
 .if ${OPSYS} == "Linux"
-PKG_SUGGESTED_OPTIONS+=        alsa pulseaudio mozilla-jemalloc dbus
+PKG_SUGGESTED_OPTIONS+=        alsa pulseaudio dbus
 .else
 PKG_SUGGESTED_OPTIONS+=        dbus
 .endif
 
-PKG_SUGGESTED_OPTIONS.Linux+=  webrtc
-
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Malsa)
@@ -24,14 +21,6 @@ CONFIGURE_ARGS+=     --enable-alsa
 CONFIGURE_ARGS+=       --disable-alsa
 .endif
 
-.if !empty(PKG_OPTIONS:Mmozilla-jemalloc)
-PLIST.jemalloc=                yes
-CONFIGURE_ARGS+=       --enable-jemalloc
-CONFIGURE_ARGS+=       --enable-replace-malloc
-.else
-CONFIGURE_ARGS+=       --disable-jemalloc
-.endif
-
 .include "../../mk/compiler.mk"
 .if !empty(PKGSRC_COMPILER:Mgcc)
 .  if ${CC_VERSION:S/gcc-//:S/.//g} >= 480
@@ -73,24 +62,3 @@ CONFIGURE_ARGS+=     --enable-dbus
 .else
 CONFIGURE_ARGS+=       --disable-dbus
 .endif
-
-PLIST_VARS+=           branding nobranding
-.if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
-CONFIGURE_ARGS+=       --enable-official-branding
-LICENSE=               mozilla-trademark-license
-RESTRICTED=            Trademark holder prohibits distribution of modified versions.
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
-PLIST.branding=                yes
-.else
-PLIST.nobranding=      yes
-.endif
-
-PLIST_VARS+=           webrtc
-.if !empty(PKG_OPTIONS:Mwebrtc)
-.include "../../graphics/libv4l/buildlink3.mk"
-CONFIGURE_ARGS+=       --enable-webrtc
-PLIST.webrtc=          yes
-.else
-CONFIGURE_ARGS+=       --disable-webrtc
-.endif