CVS commit: pkgsrc

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc
From: "Tobias Nygren" <tnn%netbsd.org@localhost>
Date: Tue, 29 Jan 2019 22:33:58 +0000

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Jan 29 22:33:58 UTC 2019

Modified Files:
        pkgsrc/devel/xulrunner192: Makefile
        pkgsrc/devel/xulrunner45: Makefile
        pkgsrc/mail/thunderbird: Makefile
        pkgsrc/mail/thunderbird45: Makefile
        pkgsrc/mail/thunderbird52: Makefile
        pkgsrc/www/firefox: Makefile
        pkgsrc/www/firefox36: Makefile
        pkgsrc/www/firefox45: Makefile
        pkgsrc/www/firefox52: Makefile
        pkgsrc/www/firefox60: Makefile
        pkgsrc/www/seamonkey: Makefile
Removed Files:
        pkgsrc/mail/thunderbird: hacks.mk
        pkgsrc/mail/thunderbird45: hacks.mk
        pkgsrc/mail/thunderbird52: hacks.mk
        pkgsrc/www/firefox: hacks.mk
        pkgsrc/www/firefox45: hacks.mk
        pkgsrc/www/firefox52: hacks.mk
        pkgsrc/www/firefox60: hacks.mk
        pkgsrc/www/seamonkey: hacks.mk

Log Message:
remove obsolete hacks.mk & reduce diffs between mozilla derivative packages


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/devel/xulrunner192/Makefile
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/xulrunner45/Makefile
cvs rdiff -u -r1.218 -r1.219 pkgsrc/mail/thunderbird/Makefile
cvs rdiff -u -r1.8 -r0 pkgsrc/mail/thunderbird/hacks.mk
cvs rdiff -u -r1.11 -r1.12 pkgsrc/mail/thunderbird45/Makefile
cvs rdiff -u -r1.2 -r0 pkgsrc/mail/thunderbird45/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/mail/thunderbird52/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/mail/thunderbird52/hacks.mk
cvs rdiff -u -r1.356 -r1.357 pkgsrc/www/firefox/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/www/firefox/hacks.mk
cvs rdiff -u -r1.59 -r1.60 pkgsrc/www/firefox36/Makefile
cvs rdiff -u -r1.44 -r1.45 pkgsrc/www/firefox45/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/www/firefox45/hacks.mk
cvs rdiff -u -r1.37 -r1.38 pkgsrc/www/firefox52/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/www/firefox52/hacks.mk
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/firefox60/Makefile
cvs rdiff -u -r1.1 -r0 pkgsrc/www/firefox60/hacks.mk
cvs rdiff -u -r1.186 -r1.187 pkgsrc/www/seamonkey/Makefile
cvs rdiff -u -r1.5 -r0 pkgsrc/www/seamonkey/hacks.mk

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

Modified files:

Index: pkgsrc/devel/xulrunner192/Makefile
diff -u pkgsrc/devel/xulrunner192/Makefile:1.67 pkgsrc/devel/xulrunner192/Makefile:1.68
--- pkgsrc/devel/xulrunner192/Makefile:1.67     Sun Dec  9 18:52:26 2018
+++ pkgsrc/devel/xulrunner192/Makefile  Tue Jan 29 22:33:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2018/12/09 18:52:26 adam Exp $
+# $NetBSD: Makefile,v 1.68 2019/01/29 22:33:58 tnn Exp $
 
 .include "dist.mk"
 PKGNAME=       xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
@@ -25,7 +25,7 @@ CONFIGURE_ARGS+=      --enable-application=xu
 CONFIGURE_ARGS+=       --enable-libxul
 CONFIGURE_ARGS+=       --disable-ipc
 
-ALL_ENV+=              MOZILLA_PKG_NAME=xulrunner192
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
 
 MAKE_ENV+=             FREEBL_NO_DEPEND=0
 

Index: pkgsrc/devel/xulrunner45/Makefile
diff -u pkgsrc/devel/xulrunner45/Makefile:1.20 pkgsrc/devel/xulrunner45/Makefile:1.21
--- pkgsrc/devel/xulrunner45/Makefile:1.20      Thu Nov 29 11:21:46 2018
+++ pkgsrc/devel/xulrunner45/Makefile   Tue Jan 29 22:33:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2018/11/29 11:21:46 prlw1 Exp $
+# $NetBSD: Makefile,v 1.21 2019/01/29 22:33:58 tnn Exp $
 
 MOZ_BRANCH=            45.9
 MOZ_BRANCH_MINOR=      .0esr
@@ -8,7 +8,7 @@ MASTER_SITES=           ${MASTER_SITE_MOZILLA_ALL
 #MASTER_SITES+=                ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/}
 EXTRACT_SUFX=          .tar.xz
 
-PKGNAME=       xulrunner45-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//:S/b/beta/}
+PKGNAME=       xulrunner${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/esr//:S/b/beta/}
 PKGREVISION=   7
 CATEGORIES=    devel www
 
@@ -38,18 +38,18 @@ PKGCONFIG_OVERRIDE+=        xulrunner45/install
 CONFIGURE_ARGS+=       --enable-application=xulrunner
 CONFIGURE_ARGS+=       --enable-libxul
 
-ALL_ENV+=              MOZILLA_PKG_NAME=xulrunner45
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
 
 MAKE_ENV+=             FREEBL_NO_DEPEND=0
 
-# workround for link of xulrunner-bin etc.
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/xulrunner45 ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS.SunOS+=                -lm
 
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/header.py
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/typelib.py
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/xpidl.py
-CHECK_INTERPRETER_SKIP+=lib/xulrunner45/sdk/bin/xpt.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/header.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/typelib.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/xpidl.py
+CHECK_INTERPRETER_SKIP+=lib/${PKGBASE}/sdk/bin/xpt.py
 
 .include "../../www/firefox45/mozilla-common.mk"
 .include "../../www/firefox45/options.mk"

Index: pkgsrc/mail/thunderbird/Makefile
diff -u pkgsrc/mail/thunderbird/Makefile:1.218 pkgsrc/mail/thunderbird/Makefile:1.219
--- pkgsrc/mail/thunderbird/Makefile:1.218      Sat Jan  5 00:38:22 2019
+++ pkgsrc/mail/thunderbird/Makefile    Tue Jan 29 22:33:57 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.218 2019/01/05 00:38:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.219 2019/01/29 22:33:57 tnn Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
 PKGNAME=       thunderbird-${TB_VER}
@@ -23,12 +23,11 @@ CONFIGURE_ARGS+=    --enable-application=co
 # Disable WebRTC support for Thunderbird unconditionally.
 CONFIGURE_ARGS+=       --disable-webrtc
 
-MOZILLA_PKG_NAME=      thunderbird
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/thunderbird
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/thunderbird-bin
 
-NOT_PAX_MPROTECT_SAFE+=        lib/${MOZILLA_PKG_NAME}/${MOZILLA_PKG_NAME}
-NOT_PAX_MPROTECT_SAFE+=        lib/${MOZILLA_PKG_NAME}/${MOZILLA_PKG_NAME}-bin
-
-ALL_ENV+=              MOZILLA_PKG_NAME=${MOZILLA_PKG_NAME}
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -40,7 +39,7 @@ ALL_ENV+=             MOZILLA_PKG_NAME=${MOZILLA_PK
 #SUBST_FILES.ext-compat+=      calendar/*/*/install.rdf
 #SUBST_SED.ext-compat=         -e 's,\(<em:maxVersion>\).*<,\19.0<,g'
 
-CHECK_WRKREF_SKIP+=lib/${MOZILLA_PKG_NAME}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 
 post-extract:
        mv ${WRKSRC}${MOZILLA_DIR}/gfx/ycbcr/yuv_row_arm.s \
@@ -57,8 +56,8 @@ do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
        cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
-MOZILLA=${MOZILLA_PKG_NAME}
-MOZILLA_NAME=${MOZILLA_PKG_NAME}
+MOZILLA=       ${PKGBASE}
+MOZILLA_NAME=  ${PKGBASE}
 post-build:
        ${SED} -e 's|@MOZILLA@|${MOZILLA}|g'                            \
          -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'                       \
@@ -66,7 +65,7 @@ post-build:
          < ${FILESDIR}/desktop.in                                      \
          > ${WRKDIR}/desktop
 
-INSTALLATION_DIRS+=    lib/${MOZILLA}/extensions
+INSTALLATION_DIRS+=    lib/${PKGBASE}/extensions
 INSTALLATION_DIRS+=    share/applications share/pixmaps
 post-install:
        ${ECHO} '#! /bin/sh' > ${DESTDIR}${PREFIX}/bin/${MOZILLA}

Index: pkgsrc/mail/thunderbird45/Makefile
diff -u pkgsrc/mail/thunderbird45/Makefile:1.11 pkgsrc/mail/thunderbird45/Makefile:1.12
--- pkgsrc/mail/thunderbird45/Makefile:1.11     Thu Nov 29 11:21:53 2018
+++ pkgsrc/mail/thunderbird45/Makefile  Tue Jan 29 22:33:57 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2018/11/29 11:21:53 prlw1 Exp $
+# $NetBSD: Makefile,v 1.12 2019/01/29 22:33:57 tnn Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
-PKGNAME=       thunderbird45-${TB_VER}
+PKGNAME=       thunderbird${TB_VER:C/\..*$//}-${TB_VER}
 PKGREVISION=   9
 TB_VER=                45.8.0
 CATEGORIES=    mail
@@ -24,10 +24,11 @@ CONFIGURE_ARGS+=    --enable-application=ma
 # Disable WebRTC support for Thunderbird unconditionally.
 CONFIGURE_ARGS+=       --disable-webrtc
 
-NOT_PAX_MPROTECT_SAFE+=        lib/thunderbird45/thunderbird
-NOT_PAX_MPROTECT_SAFE+=        lib/thunderbird45/thunderbird-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/thunderbird
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/thunderbird-bin
 
-ALL_ENV+=              MOZILLA_PKG_NAME=thunderbird45
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -61,8 +62,8 @@ do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
        cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
-MOZILLA=thunderbird45
-MOZILLA_NAME=thunderbird45
+MOZILLA=       ${PKGBASE}
+MOZILLA_NAME=  ${PKGBASE}
 post-build:
        ${SED} -e 's|@MOZILLA@|${MOZILLA}|g'                            \
          -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'                       \
@@ -70,7 +71,7 @@ post-build:
          < ${FILESDIR}/desktop.in                                      \
          > ${WRKDIR}/desktop
 
-INSTALLATION_DIRS+=    lib/${MOZILLA}/extensions
+INSTALLATION_DIRS+=    lib/${PKGBASE}/extensions
 INSTALLATION_DIRS+=    share/applications share/pixmaps
 post-install:
        ${INSTALL_DATA} ${WRKDIR}/desktop                               \

Index: pkgsrc/mail/thunderbird52/Makefile
diff -u pkgsrc/mail/thunderbird52/Makefile:1.1 pkgsrc/mail/thunderbird52/Makefile:1.2
--- pkgsrc/mail/thunderbird52/Makefile:1.1      Sun Dec 16 08:29:48 2018
+++ pkgsrc/mail/thunderbird52/Makefile  Tue Jan 29 22:33:57 2019
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1 2018/12/16 08:29:48 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2019/01/29 22:33:57 tnn Exp $
 
 DISTNAME=      thunderbird-${TB_VER}.source
-PKGNAME=       thunderbird52-${TB_VER}
+PKGNAME=       thunderbird${TB_VER:C/\..*$//}-${TB_VER}
 PKGREVISION=   3
 TB_VER=                52.9.1
 CATEGORIES=    mail
@@ -17,8 +17,6 @@ WRKSRC=               ${WRKDIR}/${DISTNAME:S/.source/
 MOZILLA_DIR=   mozilla/
 PLIST_SRC+=    ${PLIST_SRC_DFLT}
 
-MOZILLA_PKG_NAME=      thunderbird52
-
 CONFIG_GUESS_OVERRIDE+=        ldap/sdks/c-sdk/config/autoconf/config.guess
 CONFIG_SUB_OVERRIDE+=  ldap/sdks/c-sdk/config/autoconf/config.sub
 
@@ -26,10 +24,12 @@ CONFIGURE_ARGS+=    --enable-application=ma
 # Disable WebRTC support for Thunderbird unconditionally.
 CONFIGURE_ARGS+=       --disable-webrtc
 
-NOT_PAX_MPROTECT_SAFE+=        lib/${MOZILLA_PKG_NAME}/thunderbird
-NOT_PAX_MPROTECT_SAFE+=        lib/${MOZILLA_PKG_NAME}/thunderbird-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/thunderbird
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/thunderbird-bin
+
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
 
-ALL_ENV+=              MOZILLA_PKG_NAME=${MOZILLA_PKG_NAME}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -47,7 +47,7 @@ SUBST_MESSAGE.sys-dic=        Reference to syst
 SUBST_FILES.sys-dic=   mozilla/extensions/spellcheck/hunspell/glue/mozHunspell.cpp
 SUBST_VARS.sys-dic=    LOCALBASE
 
-CHECK_WRKREF_SKIP+=lib/${MOZILLA_PKG_NAME}/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 
 post-extract:
        mv ${WRKSRC}/mozilla/gfx/ycbcr/yuv_row_arm.s \
@@ -64,8 +64,8 @@ do-build:
 # XXX for some reason it doesn't work unless -j is explicitly specified
        cd ${WRKSRC}/${OBJDIR} && ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} -j${MAKE_JOBS:U1}
 
-MOZILLA=${MOZILLA_PKG_NAME}
-MOZILLA_NAME=${MOZILLA_PKG_NAME}
+MOZILLA=       ${PKGBASE}
+MOZILLA_NAME=  ${PKGBASE}
 post-build:
        ${SED} -e 's|@MOZILLA@|${MOZILLA}|g'                            \
          -e 's|@MOZILLA_NAME@|${MOZILLA_NAME}|g'                       \
@@ -73,7 +73,7 @@ post-build:
          < ${FILESDIR}/desktop.in                                      \
          > ${WRKDIR}/desktop
 
-INSTALLATION_DIRS+=    lib/${MOZILLA}/extensions
+INSTALLATION_DIRS+=    lib/${PKGBASE}/extensions
 INSTALLATION_DIRS+=    share/applications share/pixmaps
 post-install:
        ${INSTALL_DATA} ${WRKDIR}/desktop                               \

Index: pkgsrc/www/firefox/Makefile
diff -u pkgsrc/www/firefox/Makefile:1.356 pkgsrc/www/firefox/Makefile:1.357
--- pkgsrc/www/firefox/Makefile:1.356   Tue Jan 29 16:28:22 2019
+++ pkgsrc/www/firefox/Makefile Tue Jan 29 22:33:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.356 2019/01/29 16:28:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.357 2019/01/29 22:33:58 tnn Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            65.0
@@ -26,18 +26,18 @@ CONFIGURE_ARGS+=    --enable-application=br
 CFLAGS+=       -I${PREFIX}/include/nspr
 # for lang/gcc6
 CFLAGS+=       -D_GLIBCXX_INCLUDE_NEXT_C_HEADERS
-
 CFLAGS.SunOS+= -D_POSIX_PTHREAD_SEMANTICS
 
-# workround for link of libxul.so etc.
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS.DragonFly+=    -lplc4 -lnspr4
+LDFLAGS.FreeBSD+=      -lplc4 -lnspr4
+LDFLAGS.Linux+=                -lnspr4
 LDFLAGS.SunOS+=                -lm
 
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox/firefox
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox/firefox-bin
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox/plugin-container
-
-ALL_ENV+=              MOZILLA_PKG_NAME=firefox
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
 
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections
@@ -50,10 +50,6 @@ SUBST_MESSAGE.dfly_malloc_h= Dont includ
 SUBST_SED.dfly_malloc_h=       -e 's,HAVE_MALLOC_H,HAVE_MALLOC_H \&\& !defined(__DragonFly__),g'
 SUBST_FILES.dfly_malloc_h+=    media/ffvpx/libavutil/mem.c
 
-LDFLAGS.DragonFly=     -lplc4 -lnspr4
-LDFLAGS.FreeBSD=       -lplc4 -lnspr4
-LDFLAGS.Linux=         -lnspr4
-
 .include "mozilla-common.mk"
 .include "options.mk"
 
@@ -64,7 +60,7 @@ CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/
 
 CHECK_WRKREF_SKIP+=lib/firefox/chrome/toolkit/content/global/buildconfig.html
 
-MOZILLA=firefox
+MOZILLA=       ${PKGBASE}
 MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=  Firefox

Index: pkgsrc/www/firefox36/Makefile
diff -u pkgsrc/www/firefox36/Makefile:1.59 pkgsrc/www/firefox36/Makefile:1.60
--- pkgsrc/www/firefox36/Makefile:1.59  Sun Dec  9 18:52:49 2018
+++ pkgsrc/www/firefox36/Makefile       Tue Jan 29 22:33:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2018/12/09 18:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.60 2019/01/29 22:33:58 tnn Exp $
 
 .include "../../devel/xulrunner192/dist.mk"
 PKGNAME=       firefox36-${FIREFOX_VER}
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=      --enable-application=br
 CONFIGURE_ARGS+=       --with-libxul-sdk=${PREFIX}/lib/xulrunner192-sdk
 CONFIGURE_ARGS+=       --with-system-libxul
 
-ALL_ENV+=              MOZILLA_PKG_NAME=firefox36
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
 
 SUBST_CLASSES+=                        fix-paths2
 SUBST_STAGE.fix-paths2=                pre-configure
@@ -30,7 +30,7 @@ SUBST_SED.fix-paths2=         -e 's,/etc/gre.d,
 CONFIGURE_ARGS+=               --enable-chrome-format=jar
 .include "options.mk"
 
-MOZILLA=firefox36
+MOZILLA=       ${PKGBASE}
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=  Firefox 3.6
 MOZILLA_ICON=  ${WRKSRC}/other-licenses/branding/firefox/default48.png

Index: pkgsrc/www/firefox45/Makefile
diff -u pkgsrc/www/firefox45/Makefile:1.44 pkgsrc/www/firefox45/Makefile:1.45
--- pkgsrc/www/firefox45/Makefile:1.44  Sun Dec  9 18:52:49 2018
+++ pkgsrc/www/firefox45/Makefile       Tue Jan 29 22:33:58 2019
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.44 2018/12/09 18:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.45 2019/01/29 22:33:58 tnn Exp $
 
-MOZILLA_PKG_NAME=      firefox45
 PKGREVISION=           18
 FIREFOX_VER=   ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=    45.9
 MOZ_BRANCH_MINOR=      .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
-PKGNAME=       ${MOZILLA_PKG_NAME}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 MASTER_SITES+= ${MASTER_SITE_MOZILLA_ALL:=firefox/releases/${FIREFOX_VER}/source/}
@@ -25,24 +24,22 @@ MOZILLA_DIR=        # empty
 # Note: when updating remember to conditionalise about-background.png in PLIST
 CONFIGURE_ARGS+=       --enable-application=browser
 
-# workround for link of libxul.so etc.
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${MOZILLA_PKG_NAME}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS.DragonFly+=    -lplc4 -lnspr4
+LDFLAGS.FreeBSD+=      -lplc4 -lnspr4
+LDFLAGS.Linux+=                -lnspr4
 LDFLAGS.SunOS+=                -lm
 
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox45/firefox
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox45/firefox-bin
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox45/plugin-container
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
 
-ALL_ENV+=              MOZILLA_PKG_NAME=${MOZILLA_PKG_NAME}
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
 
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections
 BUILDLINK_TRANSFORM.SunOS+=    rm:-ffunction-sections
 
-LDFLAGS.DragonFly=     -lplc4 -lnspr4
-LDFLAGS.FreeBSD=       -lplc4 -lnspr4
-LDFLAGS.Linux=         -lnspr4
-
 .include "mozilla-common.mk"
 .include "options.mk"
 
@@ -51,7 +48,7 @@ CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
 
-MOZILLA=${MOZILLA_PKG_NAME}
+MOZILLA=       ${PKGBASE}
 MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=  Firefox

Index: pkgsrc/www/firefox52/Makefile
diff -u pkgsrc/www/firefox52/Makefile:1.37 pkgsrc/www/firefox52/Makefile:1.38
--- pkgsrc/www/firefox52/Makefile:1.37  Sun Dec  9 18:52:49 2018
+++ pkgsrc/www/firefox52/Makefile       Tue Jan 29 22:33:58 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.37 2018/12/09 18:52:49 adam Exp $
+# $NetBSD: Makefile,v 1.38 2019/01/29 22:33:58 tnn Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            52.9
 MOZ_BRANCH_MINOR=      .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
-PKGNAME=       firefox52-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
+PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 PKGREVISION=   12
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
@@ -24,15 +24,18 @@ MOZILLA_DIR=        # empty
 # Note: when updating remember to conditionalise about-background.png in PLIST
 CONFIGURE_ARGS+=       --enable-application=browser
 
-# workround for link of libxul.so etc.
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox52 ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS.DragonFly+=    -lplc4 -lnspr4
+LDFLAGS.FreeBSD+=      -lplc4 -lnspr4
+LDFLAGS.Linux+=                -lnspr4
 LDFLAGS.SunOS+=                -lm
 
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox52/firefox
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox52/firefox-bin
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox52/plugin-container
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
 
-ALL_ENV+=              MOZILLA_PKG_NAME=firefox52
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
 
 # Avoid ld "invalid section index" errors.
 BUILDLINK_TRANSFORM.SunOS+=    rm:-fdata-sections
@@ -45,10 +48,6 @@ SUBST_SED.dfly_malloc_h=     -e 's,HAVE_MALL
 SUBST_FILES.dfly_malloc_h=     media/libav/libavutil/mem.c
 SUBST_FILES.dfly_malloc_h+=    media/ffvpx/libavutil/mem.c
 
-LDFLAGS.DragonFly=     -lplc4 -lnspr4
-LDFLAGS.FreeBSD=       -lplc4 -lnspr4
-LDFLAGS.Linux=         -lnspr4
-
 .include "mozilla-common.mk"
 .include "options.mk"
 
@@ -57,9 +56,9 @@ CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/firefox52/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 
-MOZILLA=firefox52
+MOZILLA=       ${PKGBASE}
 MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/firefox/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=  Firefox

Index: pkgsrc/www/firefox60/Makefile
diff -u pkgsrc/www/firefox60/Makefile:1.12 pkgsrc/www/firefox60/Makefile:1.13
--- pkgsrc/www/firefox60/Makefile:1.12  Sun Dec 16 07:38:47 2018
+++ pkgsrc/www/firefox60/Makefile       Tue Jan 29 22:33:58 2019
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2018/12/16 07:38:47 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2019/01/29 22:33:58 tnn Exp $
 
 FIREFOX_VER=           ${MOZ_BRANCH}${MOZ_BRANCH_MINOR}
 MOZ_BRANCH=            60.4
 MOZ_BRANCH_MINOR=      .0esr
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
-PKGNAME=       ${DISTNAME:S/firefox-/firefox60-/:S/.source//:S/b/beta/:S/esr//}
+PKGNAME=       firefox${MOZ_BRANCH:C/\..*$//}-${MOZ_BRANCH}${MOZ_BRANCH_MINOR:S/b/beta/:S/esr//}
 CATEGORIES=    www
 MASTER_SITES+= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.xz
@@ -24,13 +24,16 @@ CONFIGURE_ARGS+=    --enable-application=br
 
 CFLAGS+=       -I${PREFIX}/include/nspr
 
-# workround for link of libxul.so etc.
-LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/firefox60 ${COMPILER_RPATH_FLAG}${PREFIX}/lib
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib
 LDFLAGS.SunOS+=                -lm
-
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox60/firefox60
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox60/firefox60-bin
-NOT_PAX_MPROTECT_SAFE+=        lib/firefox60/plugin-container
+LDFLAGS.DragonFly+=    -lplc4 -lnspr4
+LDFLAGS.FreeBSD+=      -lplc4 -lnspr4
+LDFLAGS.Linux+=                -lnspr4
+
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox60
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/firefox60-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/plugin-container
 
 ALL_ENV+=              MOZ_APP_NAME=firefox60
 
@@ -45,10 +48,6 @@ SUBST_SED.dfly_malloc_h=     -e 's,HAVE_MALL
 SUBST_FILES.dfly_malloc_h=     media/libav/libavutil/mem.c
 SUBST_FILES.dfly_malloc_h+=    media/ffvpx/libavutil/mem.c
 
-LDFLAGS.DragonFly=     -lplc4 -lnspr4
-LDFLAGS.FreeBSD=       -lplc4 -lnspr4
-LDFLAGS.Linux=         -lnspr4
-
 .include "mozilla-common.mk"
 .include "options.mk"
 
@@ -57,9 +56,9 @@ CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpidl.py
 CHECK_INTERPRETER_SKIP+=lib/firefox-sdk/sdk/bin/xpt.py
 
-CHECK_WRKREF_SKIP+=lib/firefox60/chrome/toolkit/content/global/buildconfig.html
+CHECK_WRKREF_SKIP+=lib/${PKGBASE}/chrome/toolkit/content/global/buildconfig.html
 
-MOZILLA=firefox60
+MOZILLA=       ${PKGBASE}
 MOZILLA_ICON=  ${WRKSRC}/${OBJDIR}/dist/firefox60/browser/chrome/icons/default/default48.png
 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding)
 MOZILLA_NAME=  Firefox

Index: pkgsrc/www/seamonkey/Makefile
diff -u pkgsrc/www/seamonkey/Makefile:1.186 pkgsrc/www/seamonkey/Makefile:1.187
--- pkgsrc/www/seamonkey/Makefile:1.186 Sun Dec  9 18:52:50 2018
+++ pkgsrc/www/seamonkey/Makefile       Tue Jan 29 22:33:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.186 2018/12/09 18:52:50 adam Exp $
+# $NetBSD: Makefile,v 1.187 2019/01/29 22:33:58 tnn Exp $
 
 DISTNAME=      seamonkey-${SM_VER}.source
 PKGNAME=       seamonkey-${SM_VER:S/b/beta/}
@@ -18,8 +18,8 @@ PLIST_SRC+=   ${PLIST_SRC_DFLT}
 USE_LANGUAGES+=        c c++
 USE_TOOLS+=    unzip pax
 
-NOT_PAX_MPROTECT_SAFE+=        lib/seamonkey/seamonkey
-NOT_PAX_MPROTECT_SAFE+=        lib/seamonkey/seamonkey-bin
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/seamonkey
+NOT_PAX_MPROTECT_SAFE+=        lib/${PKGBASE}/seamonkey-bin
 
 .include "../../mk/bsd.prefs.mk"
 .include "options.mk"
@@ -33,7 +33,9 @@ CONFIG_SUB_OVERRIDE+= ldap/sdks/c-sdk/co
 
 CONFIGURE_ARGS+=       --enable-application=suite
 
-ALL_ENV+=              MOZILLA_PKG_NAME=seamonkey
+ALL_ENV+=              MOZILLA_PKG_NAME=${PKGBASE}
+
+LDFLAGS+=              ${COMPILER_RPATH_FLAG}${PREFIX}/lib/${PKGBASE}
 
 .include "../../mk/bsd.prefs.mk"

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/mk/tools
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/mk/tools
Indexes:

Home | Main Index | Thread Index | Old Index