Wed Mar 18 00:08:41 2009 UTC ()
Unify all the mozilla projects into using a single Makefile.common and
INSTALL, and put it in seamonkey.
Ensure all build with USE_DESTDIR.
Bump PKGREVISIONs


(abs)
diff -r1.33 -r1.34 pkgsrc/mail/thunderbird/Makefile
diff -r1.42 -r1.43 pkgsrc/mail/thunderbird/Makefile-thunderbird.common
diff -r1.20 -r1.21 pkgsrc/mail/thunderbird-gtk1/Makefile
diff -r1.5 -r1.6 pkgsrc/time/sunbird/Makefile
diff -r1.12 -r1.13 pkgsrc/time/sunbird/Makefile-sunbird.common
diff -r1.2 -r0 pkgsrc/www/firefox/INSTALL
diff -r1.48 -r1.49 pkgsrc/www/firefox/Makefile
diff -r1.62 -r1.63 pkgsrc/www/firefox/Makefile-firefox.common
diff -r1.26 -r0 pkgsrc/www/firefox/Makefile.common
diff -r1.21 -r1.22 pkgsrc/www/firefox-gtk1/Makefile
diff -r1.24 -r1.25 pkgsrc/www/firefox3/Makefile
diff -r1.24 -r1.25 pkgsrc/www/seamonkey/Makefile
diff -r1.22 -r1.23 pkgsrc/www/seamonkey/Makefile-seamonkey.common
diff -r1.32 -r1.33 pkgsrc/www/seamonkey/Makefile.common
diff -r1.15 -r1.16 pkgsrc/www/seamonkey/PLIST
diff -r1.17 -r1.18 pkgsrc/www/seamonkey-gtk1/Makefile
diff -r1.6 -r1.7 pkgsrc/www/seamonkey-gtk1/buildlink3.mk
diff -r1.7 -r1.8 pkgsrc/www/seamonkey/files/moz-install
cvs diff -r1.33 -r1.34 pkgsrc/mail/thunderbird/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/Makefile 2009/01/07 14:23:03 1.33
+++ pkgsrc/mail/thunderbird/Makefile 2009/03/18 00:08:39 1.34
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.33 2009/01/07 14:23:03 ghen Exp $ 1# $NetBSD: Makefile,v 1.34 2009/03/18 00:08:39 abs Exp $
2 2
3MOZILLA= thunderbird 3MOZILLA= thunderbird
4PKGREVISION= 1 4PKGREVISION= 2
5COMMENT= Mozilla mail client 5COMMENT= Mozilla mail client
6 6
7MOZILLA_USE_GTK2= # yes 7MOZILLA_USE_GTK2= # yes
8MOZILLA_USE_XFT= YES 8MOZILLA_USE_XFT= YES
9 9
10# thunderbird passes LD_LIBRARY_PATH to mime handlers, making them fail: 10# thunderbird passes LD_LIBRARY_PATH to mime handlers, making them fail:
11# https://bugzilla.mozilla.org/show_bug.cgi?id=392327 11# https://bugzilla.mozilla.org/show_bug.cgi?id=392327
12 12
13.include "../../mail/thunderbird/Makefile-thunderbird.common" 13.include "../../mail/thunderbird/Makefile-thunderbird.common"
14.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.42 -r1.43 pkgsrc/mail/thunderbird/Attic/Makefile-thunderbird.common (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird/Attic/Makefile-thunderbird.common 2009/01/07 14:23:03 1.42
+++ pkgsrc/mail/thunderbird/Attic/Makefile-thunderbird.common 2009/03/18 00:08:39 1.43
@@ -1,51 +1,46 @@ @@ -1,51 +1,46 @@
1# $NetBSD: Makefile-thunderbird.common,v 1.42 2009/01/07 14:23:03 ghen Exp $ 1# $NetBSD: Makefile-thunderbird.common,v 1.43 2009/03/18 00:08:39 abs Exp $
2# used by mail/thunderbird/Makefile 2# used by mail/thunderbird/Makefile
3# used by mail/thunderbird-gtk1/Makefile 3# used by mail/thunderbird-gtk1/Makefile
4 4
5MOZILLA_BIN= thunderbird-bin 5MOZILLA_BIN= thunderbird-bin
6MOZ_VER= 2.0.0.19 6MOZ_VER= 2.0.0.19
7EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
8DISTNAME= thunderbird-${MOZ_VER}-source 8DISTNAME= thunderbird-${MOZ_VER}-source
9CATEGORIES= mail 9CATEGORIES= mail
10MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${MOZ_VER}/source/} 10MASTER_SITES= ${MASTER_SITE_MOZILLA:=thunderbird/releases/${MOZ_VER}/source/}
11 11
12HOMEPAGE= http://www.mozilla.com/en-US/thunderbird/ 12HOMEPAGE= http://www.mozilla.com/en-US/thunderbird/
13 13
14CONFIGURE_ENV+= MOZ_THUNDERBIRD=1 14CONFIGURE_ENV+= MOZ_THUNDERBIRD=1
15MAKE_ENV+= MOZ_THUNDERBIRD=1 15MAKE_ENV+= MOZ_THUNDERBIRD=1
16 16
17DISTINFO_FILE= ${.CURDIR}/../../mail/thunderbird/distinfo 17DISTINFO_FILE= ${.CURDIR}/../../mail/thunderbird/distinfo
18PATCHDIR= ${.CURDIR}/../../mail/thunderbird/patches 18PATCHDIR= ${.CURDIR}/../../mail/thunderbird/patches
19 19
20CONFIGURE_ARGS+= --enable-application=mail 20CONFIGURE_ARGS+= --enable-application=mail
21CONFIGURE_ARGS+= --enable-debug=-g 21CONFIGURE_ARGS+= --enable-debug=-g
22CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no 
23 22
24CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest 23CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
25CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat 24CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
26CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat 25CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
27 26
28INSTALL_TEMPLATES+= ${.CURDIR}/../../mail/thunderbird/INSTALL 
29 
30USE_DIRS+= xdg-1.4 27USE_DIRS+= xdg-1.4
31 28
32post-install: 29.PHONY: install-desktop
33 ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \; 30post-install: install-desktop
 31install-desktop:
34 ${SED} \ 32 ${SED} \
35 -e 's|@MOZILLA@|${MOZILLA}|g' \ 33 -e 's|@MOZILLA@|${MOZILLA}|g' \
36 -e 's|@MOZILLA_NAME@|Thunderbird|g' \ 34 -e 's|@MOZILLA_NAME@|Thunderbird|g' \
37 -e 's|@MOZILLA_ICON@|${MOZILLA}.xpm|g' \ 35 -e 's|@MOZILLA_ICON@|${MOZILLA}.xpm|g' \
38 < ${.CURDIR}/../../mail/thunderbird/files/thunderbird.desktop.in \ 36 < ${.CURDIR}/../../mail/thunderbird/files/thunderbird.desktop.in \
39 > ${WRKDIR}/${MOZILLA}.desktop 37 > ${WRKDIR}/${MOZILLA}.desktop
40 ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop \ 38 ${INSTALL_DATA} ${WRKDIR}/${MOZILLA}.desktop \
41 ${DESTDIR:Q}${PREFIX:Q}/share/applications/${MOZILLA}.desktop 39 ${DESTDIR:Q}${PREFIX:Q}/share/applications/${MOZILLA}.desktop
42 ${LN} -sf ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/chrome/icons/default/default.xpm \ 40 ${LN} -sf ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/chrome/icons/default/default.xpm \
43 ${DESTDIR:Q}${PREFIX:Q}/share/pixmaps/${MOZILLA}.xpm 41 ${DESTDIR:Q}${PREFIX:Q}/share/pixmaps/${MOZILLA}.xpm
44 42
45.include "../../mk/bsd.fast.prefs.mk" 43INSTALLATION_DIRS+= share/applications share/pixmaps
46 44PKG_DESTDIR_SUPPORT= user-destdir
47.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" 
48CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0 
49.endif 
50 45
51.include "../../www/seamonkey/Makefile.common" 46.include "../../www/seamonkey/Makefile.common"
cvs diff -r1.20 -r1.21 pkgsrc/mail/thunderbird-gtk1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/thunderbird-gtk1/Attic/Makefile 2009/01/07 14:23:03 1.20
+++ pkgsrc/mail/thunderbird-gtk1/Attic/Makefile 2009/03/18 00:08:39 1.21
@@ -1,9 +1,9 @@ @@ -1,9 +1,9 @@
1# $NetBSD: Makefile,v 1.20 2009/01/07 14:23:03 ghen Exp $ 1# $NetBSD: Makefile,v 1.21 2009/03/18 00:08:39 abs Exp $
2 2
3MOZILLA= thunderbird-gtk1 3MOZILLA= thunderbird-gtk1
4PKGREVISION= 1 4PKGREVISION= 2
5 5
6COMMENT= Mozilla mail client using the older GTK1 toolkit 6COMMENT= Mozilla mail client using the older GTK1 toolkit
7 7
8.include "../../mail/thunderbird/Makefile-thunderbird.common" 8.include "../../mail/thunderbird/Makefile-thunderbird.common"
9.include "../../mk/bsd.pkg.mk" 9.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/time/sunbird/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/time/sunbird/Attic/Makefile 2007/03/02 09:34:17 1.5
+++ pkgsrc/time/sunbird/Attic/Makefile 2009/03/18 00:08:39 1.6
@@ -1,11 +1,12 @@ @@ -1,11 +1,12 @@
1# $NetBSD: Makefile,v 1.5 2007/03/02 09:34:17 ghen Exp $ 1# $NetBSD: Makefile,v 1.6 2009/03/18 00:08:39 abs Exp $
2 2
3MOZILLA= sunbird 3MOZILLA= sunbird
 4PKGREVISION= 1
4 5
5COMMENT= Mozilla stand-alone calendar application 6COMMENT= Mozilla stand-alone calendar application
6 7
7MOZILLA_USE_GTK2= # yes 8MOZILLA_USE_GTK2= # yes
8MOZILLA_USE_XFT= YES 9MOZILLA_USE_XFT= YES
9 10
10.include "../../time/sunbird/Makefile-sunbird.common" 11.include "../../time/sunbird/Makefile-sunbird.common"
11.include "../../mk/bsd.pkg.mk" 12.include "../../mk/bsd.pkg.mk"
cvs diff -r1.12 -r1.13 pkgsrc/time/sunbird/Attic/Makefile-sunbird.common (expand / switch to unified diff)

--- pkgsrc/time/sunbird/Attic/Makefile-sunbird.common 2007/12/22 07:22:10 1.12
+++ pkgsrc/time/sunbird/Attic/Makefile-sunbird.common 2009/03/18 00:08:39 1.13
@@ -1,35 +1,27 @@ @@ -1,35 +1,27 @@
1# $NetBSD: Makefile-sunbird.common,v 1.12 2007/12/22 07:22:10 obache Exp $ 1# $NetBSD: Makefile-sunbird.common,v 1.13 2009/03/18 00:08:39 abs Exp $
 2# used by time/sunbird/Makefile
2 3
3MOZILLA_BIN= sunbird-bin 4MOZILLA_BIN= sunbird-bin
4MOZ_VER= 0.3.1 5MOZ_VER= 0.3.1
5EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
6DISTNAME= sunbird-${MOZ_VER}.source 7DISTNAME= sunbird-${MOZ_VER}.source
7CATEGORIES= time 8CATEGORIES= time
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=calendar/sunbird/releases/${MOZ_VER}/source/} 9MASTER_SITES= ${MASTER_SITE_MOZILLA:=calendar/sunbird/releases/${MOZ_VER}/source/}
9 10
10HOMEPAGE= http://www.mozilla.org/projects/calendar/sunbird/ 11HOMEPAGE= http://www.mozilla.org/projects/calendar/sunbird/
11 12
12CONFIGURE_ENV+= MOZ_SUNBIRD=1 13CONFIGURE_ENV+= MOZ_SUNBIRD=1
13MAKE_ENV+= MOZ_SUNBIRD=1 14MAKE_ENV+= MOZ_SUNBIRD=1
14 15
15DISTINFO_FILE= ${.CURDIR}/../../time/sunbird/distinfo 16DISTINFO_FILE= ${.CURDIR}/../../time/sunbird/distinfo
16PATCHDIR= ${.CURDIR}/../../time/sunbird/patches 17PATCHDIR= ${.CURDIR}/../../time/sunbird/patches
17 18
18CONFIGURE_ARGS+= --enable-application=calendar 19CONFIGURE_ARGS+= --enable-application=calendar
19CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no 
20 20
21CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest 21CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/chrome/app-chrome.manifest
22CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat 22CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/compreg.dat
23CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat 23CHECK_FILES_SKIP+= ${PREFIX}/lib/${MOZILLA}/components/xpti.dat
24 24
25.include "../../mk/bsd.prefs.mk" 25PKG_DESTDIR_SUPPORT= user-destdir
26 
27CONFIG_GUESS_OVERRIDE+= */*/*/*/config.guess 
28CONFIG_SUB_OVERRIDE+= */*/*/*/config.sub 
29 
30post-install: 
31 cd ${PREFIX}/lib/${MOZILLA} && \ 
32 ${SETENV} LD_LIBRARY_PATH=. MOZILLA_FIVE_HOME=. HOME=${WRKSRC:Q} \ 
33 ./${MOZILLA_BIN} -register 
34 26
35.include "../../www/seamonkey/Makefile.common" 27.include "../../www/seamonkey/Makefile.common"
File Deleted: pkgsrc/www/firefox/Attic/INSTALL
cvs diff -r1.48 -r1.49 pkgsrc/www/firefox/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox/Makefile 2008/09/24 14:34:36 1.48
+++ pkgsrc/www/firefox/Makefile 2009/03/18 00:08:39 1.49
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1# $NetBSD: Makefile,v 1.48 2008/09/24 14:34:36 ghen Exp $ 1# $NetBSD: Makefile,v 1.49 2009/03/18 00:08:39 abs Exp $
2 2
3MOZILLA= firefox 3MOZILLA= firefox
 4PKGREVISION= 1
4COMMENT= Lightweight gecko-based web browser 5COMMENT= Lightweight gecko-based web browser
5 6
6MOZILLA_USE_GTK2= # yes 7MOZILLA_USE_GTK2= # yes
7MOZILLA_USE_XFT= YES 8MOZILLA_USE_XFT= YES
8 9
9INSTALLATION_DIRS= lib/pkgconfig 10INSTALLATION_DIRS= lib/pkgconfig
10 11
11.include "../../www/firefox/Makefile-firefox.common" 12.include "../../www/firefox/Makefile-firefox.common"
12.include "../../mk/bsd.pkg.mk" 13.include "../../mk/bsd.pkg.mk"
cvs diff -r1.62 -r1.63 pkgsrc/www/firefox/Attic/Makefile-firefox.common (expand / switch to unified diff)

--- pkgsrc/www/firefox/Attic/Makefile-firefox.common 2008/12/17 17:05:52 1.62
+++ pkgsrc/www/firefox/Attic/Makefile-firefox.common 2009/03/18 00:08:39 1.63
@@ -1,40 +1,31 @@ @@ -1,40 +1,31 @@
1# $NetBSD: Makefile-firefox.common,v 1.62 2008/12/17 17:05:52 ghen Exp $ 1# $NetBSD: Makefile-firefox.common,v 1.63 2009/03/18 00:08:39 abs Exp $
2# used by www/firefox/Makefile 2# used by www/firefox/Makefile
 3# used by www/firefox-gtk1/Makefile
3 4
4MOZILLA_BIN= firefox-bin 5MOZILLA_BIN= firefox-bin
5MOZ_VER= 2.0.0.19 6MOZ_VER= 2.0.0.19
6EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
7 
8DISTNAME= firefox-${MOZ_VER}-source 8DISTNAME= firefox-${MOZ_VER}-source
9 9CATEGORIES= www
10MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/} 10MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${MOZ_VER}/source/}
11 11
 12MAINTAINER= taya@NetBSD.org
12HOMEPAGE= http://www.mozilla.com/en-US/firefox/ 13HOMEPAGE= http://www.mozilla.com/en-US/firefox/
13 14
14PKG_DESTDIR_SUPPORT= user-destdir 
15 
16DISTINFO_FILE= ${.CURDIR}/../../www/firefox/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../www/firefox/distinfo
17PATCHDIR= ${.CURDIR}/../../www/firefox/patches 16PATCHDIR= ${.CURDIR}/../../www/firefox/patches
18 17
19CONFIGURE_ARGS+= --enable-application=browser 18CONFIGURE_ARGS+= --enable-application=browser
20CONFIGURE_ARGS+= --without-gssapi 19CONFIGURE_ARGS+= --without-gssapi
21 
22CONFIGURE_ARGS+= --enable-canvas 20CONFIGURE_ARGS+= --enable-canvas
23 21
24MOZILLA_EXTENSIONS= default 
25CONFIGURE_ARGS+= --enable-extensions=${MOZILLA_EXTENSIONS:Q} 
26CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no 
27 
28.include "../../mk/bsd.fast.prefs.mk" 
29 
30.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" 
31CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0 
32.endif 
33 
34USE_LANGUAGES+= c++ 22USE_LANGUAGES+= c++
35BUILD_SVG= # yes 23BUILD_SVG= # yes
36BUILD_MATHML= # yes 24BUILD_MATHML= # yes
37 25
38.include "../../www/firefox/Makefile.common" 26MOZILLA_EXTENSIONS= default
 27CONFIGURE_ARGS+= --enable-extensions=${MOZILLA_EXTENSIONS:Q}
 28
 29PKG_DESTDIR_SUPPORT= user-destdir
39 30
40INSTALL_TEMPLATES+= ${.CURDIR}/../../www/firefox/INSTALL 31.include "../../www/seamonkey/Makefile.common"
File Deleted: pkgsrc/www/firefox/Attic/Makefile.common
cvs diff -r1.21 -r1.22 pkgsrc/www/firefox-gtk1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox-gtk1/Attic/Makefile 2008/09/24 14:34:36 1.21
+++ pkgsrc/www/firefox-gtk1/Attic/Makefile 2009/03/18 00:08:40 1.22
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1# $NetBSD: Makefile,v 1.21 2008/09/24 14:34:36 ghen Exp $ 1# $NetBSD: Makefile,v 1.22 2009/03/18 00:08:40 abs Exp $
2 2
3MOZILLA= firefox-gtk1 3MOZILLA= firefox-gtk1
 4PKGREVISION= 1
4COMMENT= Lightweight gecko-based web browser built with GTK+-1.x 5COMMENT= Lightweight gecko-based web browser built with GTK+-1.x
5 6
6.include "../../www/firefox/Makefile-firefox.common" 7.include "../../www/firefox/Makefile-firefox.common"
7.include "../../mk/bsd.pkg.mk" 8.include "../../mk/bsd.pkg.mk"
cvs diff -r1.24 -r1.25 pkgsrc/www/firefox3/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/firefox3/Attic/Makefile 2009/03/05 15:44:02 1.24
+++ pkgsrc/www/firefox3/Attic/Makefile 2009/03/18 00:08:40 1.25
@@ -1,20 +1,19 @@ @@ -1,20 +1,19 @@
1# $NetBSD: Makefile,v 1.24 2009/03/05 15:44:02 tron Exp $ 1# $NetBSD: Makefile,v 1.25 2009/03/18 00:08:40 abs Exp $
2 2
3MOZILLA= firefox3 # allow coexisting with firefox2 3MOZILLA= firefox3 # allow coexisting with firefox2
 4PKGREVISION= 1
4COMMENT= Lightweight gecko-based web browser 5COMMENT= Lightweight gecko-based web browser
5 6
6PKG_DESTDIR_SUPPORT= user-destdir 
7 
8MOZILLA_USE_GTK2= # yes 7MOZILLA_USE_GTK2= # yes
9MOZILLA_USE_XFT= YES 8MOZILLA_USE_XFT= YES
10 9
11INSTALLATION_DIRS= lib/pkgconfig share/applications share/pixmaps 10INSTALLATION_DIRS= lib/pkgconfig share/applications share/pixmaps
12 11
13CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh 12CHECK_PORTABILITY_SKIP= security/nss/tests/libpkix/libpkix.sh
14 13
15BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.4 14BUILDLINK_API_DEPENDS.cairo+= cairo>=1.6.4
16 15
17# Pull in standard firefox build framework, and override some things below. 16# Pull in standard firefox build framework, and override some things below.
18# This include must appear first, to ensure that USE_LANGUAGES is set 17# This include must appear first, to ensure that USE_LANGUAGES is set
19# correctly before mk/compiler.mk may be loaded. 18# correctly before mk/compiler.mk may be loaded.
20.include "../../www/firefox/Makefile-firefox.common" 19.include "../../www/firefox/Makefile-firefox.common"
cvs diff -r1.24 -r1.25 pkgsrc/www/seamonkey/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Makefile 2007/10/22 08:04:07 1.24
+++ pkgsrc/www/seamonkey/Makefile 2009/03/18 00:08:40 1.25
@@ -1,11 +1,11 @@ @@ -1,11 +1,11 @@
1# $NetBSD: Makefile,v 1.24 2007/10/22 08:04:07 ghen Exp $ 1# $NetBSD: Makefile,v 1.25 2009/03/18 00:08:40 abs Exp $
2 2
3MOZILLA= seamonkey 3MOZILLA= seamonkey
4 4PKGREVISION= 1
5COMMENT= Full featured gecko-based browser 5COMMENT= Full featured gecko-based browser
6 6
7MOZILLA_USE_GTK2= # yes 7MOZILLA_USE_GTK2= # yes
8MOZILLA_USE_XFT= YES 8MOZILLA_USE_XFT= YES
9 9
10.include "../../www/seamonkey/Makefile-seamonkey.common" 10.include "../../www/seamonkey/Makefile-seamonkey.common"
11.include "../../mk/bsd.pkg.mk" 11.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/www/seamonkey/Attic/Makefile-seamonkey.common (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Attic/Makefile-seamonkey.common 2009/01/05 19:41:06 1.22
+++ pkgsrc/www/seamonkey/Attic/Makefile-seamonkey.common 2009/03/18 00:08:40 1.23
@@ -1,29 +1,26 @@ @@ -1,29 +1,26 @@
1# $NetBSD: Makefile-seamonkey.common,v 1.22 2009/01/05 19:41:06 ghen Exp $ 1# $NetBSD: Makefile-seamonkey.common,v 1.23 2009/03/18 00:08:40 abs Exp $
 2# used by www/seamonkey/Makefile
 3# used by www/seamonkey-gtk1/Makefile
2 4
3MOZILLA_BIN= seamonkey-bin 5MOZILLA_BIN= seamonkey-bin
4MOZ_VER= 1.1.14 6MOZ_VER= 1.1.14
5EXTRACT_SUFX= .tar.bz2 7EXTRACT_SUFX= .tar.bz2
6DISTNAME= seamonkey-${MOZ_DIST_VER}.source 8DISTNAME= seamonkey-${MOZ_DIST_VER}.source
7 
8MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/} 
9CATEGORIES= www 9CATEGORIES= www
 10MASTER_SITES= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
10 11
11MAINTAINER= ghen@NetBSD.org 12MAINTAINER= ghen@NetBSD.org
12HOMEPAGE= http://www.mozilla.org/projects/seamonkey/ 13HOMEPAGE= http://www.mozilla.org/projects/seamonkey/
13 14
14 
15DISTINFO_FILE= ${.CURDIR}/../../www/seamonkey/distinfo 15DISTINFO_FILE= ${.CURDIR}/../../www/seamonkey/distinfo
16PATCHDIR= ${.CURDIR}/../../www/seamonkey/patches 16PATCHDIR= ${.CURDIR}/../../www/seamonkey/patches
17 17
18CONFIGURE_ARGS+= --enable-application=suite 18CONFIGURE_ARGS+= --enable-application=suite
19 19
 20USE_LANGUAGES+= c++
20BUILD_SVG= # yes 21BUILD_SVG= # yes
21BUILD_MATHML= # yes 22BUILD_MATHML= # yes
22 23
23.include "../../mk/bsd.prefs.mk" 24PKG_DESTDIR_SUPPORT= user-destdir
24 
25.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly" 
26CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0 
27.endif 
28 25
29.include "../../www/seamonkey/Makefile.common" 26.include "../../www/seamonkey/Makefile.common"
cvs diff -r1.32 -r1.33 pkgsrc/www/seamonkey/Attic/Makefile.common (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/Attic/Makefile.common 2009/02/18 10:51:40 1.32
+++ pkgsrc/www/seamonkey/Attic/Makefile.common 2009/03/18 00:08:40 1.33
@@ -1,103 +1,94 @@ @@ -1,103 +1,94 @@
1# $NetBSD: Makefile.common,v 1.32 2009/02/18 10:51:40 abs Exp $ 1# $NetBSD: Makefile.common,v 1.33 2009/03/18 00:08:40 abs Exp $
 2# used by www/firefox/Makefile-firefox.common
2# used by mail/thunderbird/Makefile-thunderbird.common 3# used by mail/thunderbird/Makefile-thunderbird.common
3# used by www/seamonkey/Makefile-seamonkey.common 4# used by www/seamonkey/Makefile-seamonkey.common
4# used by time/sunbird/Makefile-sunbird.common 5# used by time/sunbird/Makefile-sunbird.common
5 6
6MOZ_DIST_VER?= ${MOZ_VER} 7MOZ_DIST_VER?= ${MOZ_VER}
7DISTNAME?= seamonkey-${MOZ_DIST_VER}.source 8DISTNAME?= seamonkey-${MOZ_DIST_VER}.source
8PKGNAME= ${MOZILLA}-${MOZ_VER} 9PKGNAME= ${MOZILLA}-${MOZ_VER}
9MASTER_SITES?= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/} 
10CATEGORIES?= www 10CATEGORIES?= www
 11MASTER_SITES?= ${MASTER_SITE_MOZILLA:=seamonkey/releases/${MOZ_DIST_VER}/}
11 12
12FILESDIR= ${.CURDIR}/../../www/seamonkey/files 13FILESDIR= ${.CURDIR}/../../www/seamonkey/files
13 14
14BUILD_DEPENDS+= zip>=2.3:../../archivers/zip 15BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
15 16
16WRKSRC= ${WRKDIR}/mozilla 17WRKSRC= ${WRKDIR}/mozilla
17USE_LANGUAGES= c c++ 18USE_LANGUAGES= c c++
18USE_TOOLS+= autoconf213 gmake perl pkg-config 19USE_TOOLS+= autoconf213 gmake perl pkg-config
19GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
20 21
 22# Mozilla applications require the frame-pointer
 23BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer
 24
21INSTALL_TEMPLATES+= ${.CURDIR}/../../www/seamonkey/INSTALL 25INSTALL_TEMPLATES+= ${.CURDIR}/../../www/seamonkey/INSTALL
22 26
23CONFIG_GUESS_OVERRIDE= build/autoconf/config.guess 27CONFIG_GUESS_OVERRIDE+= */*/*/config.guess */*/*/*/config.guess
24CONFIG_GUESS_OVERRIDE+= nsprpub/build/autoconf/config.guess 28CONFIG_SUB_OVERRIDE+= */*/*/config.sub */*/*/*/config.sub
25CONFIG_GUESS_OVERRIDE+= directory/c-sdk/config/autoconf/config.guess 
26CONFIG_SUB_OVERRIDE= build/autoconf/config.sub 
27CONFIG_SUB_OVERRIDE+= nsprpub/build/autoconf/config.sub 
28CONFIG_SUB_OVERRIDE+= directory/c-sdk/config/autoconf/config.sub 
29CONFIG_STATUS_OVERRIDE= build/config.status 29CONFIG_STATUS_OVERRIDE= build/config.status
30CONFIG_STATUS_OVERRIDE+= nsprpub/config.status 30CONFIG_STATUS_OVERRIDE+= nsprpub/config.status
31CONFIG_STATUS_OVERRIDE+= directory/c-sdk/config.status 31CONFIG_STATUS_OVERRIDE+= directory/c-sdk/config.status
32 32
33PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-gtkmozembed.pc 
34PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-js.pc 
35PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-nspr.pc 
36PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-nss.pc 
37PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-plugin.pc 
38PKGCONFIG_OVERRIDE+= build/unix/${MOZILLA}-xpcom.pc 
39# Some .pc files are filled in by the build process, so we can't fix the 33# Some .pc files are filled in by the build process, so we can't fix the
40# rpaths until this has happened. 34# rpaths until this has happened.
41PKGCONFIG_OVERRIDE_STAGE= post-build 35PKGCONFIG_OVERRIDE_STAGE= post-build
 36PKGCONFIG_OVERRIDE+= build/unix/*.pc
42 37
 38CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no
43CONFIGURE_ARGS+= --disable-tests 39CONFIGURE_ARGS+= --disable-tests
44CONFIGURE_ARGS+= --disable-pedantic 40CONFIGURE_ARGS+= --disable-pedantic
45CONFIGURE_ARGS+= --with-system-jpeg=${BUILDLINK_PREFIX.jpeg:Q} 41CONFIGURE_ARGS+= --with-system-jpeg=${BUILDLINK_PREFIX.jpeg:Q}
46CONFIGURE_ARGS+= --with-system-png=${BUILDLINK_PREFIX.png:Q} 42CONFIGURE_ARGS+= --with-system-png=${BUILDLINK_PREFIX.png:Q}
47CONFIGURE_ARGS+= --enable-crypto 43CONFIGURE_ARGS+= --enable-crypto
48CONFIGURE_ENV+= ac_cv_visibility_pragma=no ac_cv_visibility_hidden=no 
49 44
50SHAREMODE?= 644 45SHAREMODE?= 644
51BUILD_TARGET= # empty 46BUILD_TARGET= # empty
52 47
53UNLIMIT_RESOURCES= datasize memorysize stacksize 48UNLIMIT_RESOURCES= datasize memorysize stacksize
54 49
55.include "../../x11/libXt/buildlink3.mk" 50.include "../../x11/libXt/buildlink3.mk"
56.include "../../graphics/freetype2/buildlink3.mk" 51.include "../../x11/libXi/buildlink3.mk"
57.include "../../graphics/jpeg/buildlink3.mk" 52.include "../../graphics/jpeg/buildlink3.mk"
58.include "../../graphics/png/buildlink3.mk" 53.include "../../graphics/png/buildlink3.mk"
 54
59.if defined(MOZILLA_USE_GTK2) 55.if defined(MOZILLA_USE_GTK2)
60.include "../../net/libIDL/buildlink3.mk" 56.include "../../net/libIDL/buildlink3.mk"
61.include "../../x11/gtk2/buildlink3.mk" 57.include "../../x11/gtk2/buildlink3.mk"
 58.include "../../x11/xextproto/buildlink3.mk"
 59.include "../../x11/libXext/buildlink3.mk"
62CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs 60CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs
63.else 61.else
64.include "../../fonts/fontconfig/buildlink3.mk" 62.include "../../graphics/freetype2/buildlink3.mk"
65.include "../../graphics/gdk-pixbuf/buildlink3.mk" 63.include "../../graphics/gdk-pixbuf/buildlink3.mk"
66.include "../../net/ORBit/buildlink3.mk" 64.include "../../net/ORBit/buildlink3.mk"
67.include "../../x11/gtk/buildlink3.mk" 
68.include "../../x11/libXp/buildlink3.mk" 65.include "../../x11/libXp/buildlink3.mk"
69.include "../../x11/libXrender/buildlink3.mk" 66.include "../../x11/gtk/buildlink3.mk"
70CONFIGURE_ARGS+= --enable-default-toolkit=gtk 67CONFIGURE_ARGS+= --enable-default-toolkit=gtk
71.endif 68.endif
72 69
73# NetBSD-*-m68k builds, but "regchrome" dumps core. 70# NetBSD-*-m68k builds, but "regchrome" dumps core.
74NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k 71NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k
75 72
76# Mozilla applications require the frame-pointer 
77BUILDLINK_TRANSFORM+= rm:-fomit-frame-pointer 
78 
79MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q} 73MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q}
80 74
81MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} 75MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA}
82MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} 76MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q}
83CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} 77CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q}
84LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR} 78LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR}
85 79
86.if defined(BUILD_SVG) 80.if defined(BUILD_SVG)
87MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 
88CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 
89CONFIGURE_ARGS+= --enable-svg 81CONFIGURE_ARGS+= --enable-svg
90CONFIGURE_ARGS+= --enable-svg-renderer-libart 
91CONFIGURE_ARGS+= --enable-svg-renderer=cairo 82CONFIGURE_ARGS+= --enable-svg-renderer=cairo
92.include "../../graphics/cairo/buildlink3.mk" 83.include "../../graphics/cairo/buildlink3.mk"
93CONFIGURE_ARGS+= --enable-system-cairo 84CONFIGURE_ARGS+= --enable-system-cairo
94.endif 85.endif
95 86
96.if defined(BUILD_CALENDAR) 87.if defined(BUILD_CALENDAR)
97CONFIGURE_ARGS+= --enable-calendar 88CONFIGURE_ARGS+= --enable-calendar
98.endif 89.endif
99 90
100.if defined(BUILD_MATHML) 91.if defined(BUILD_MATHML)
101CONFIGURE_ARGS+= --enable-mathml 92CONFIGURE_ARGS+= --enable-mathml
102.endif 93.endif
103 94
@@ -153,80 +144,80 @@ PTHREAD_OPTS+= native optional @@ -153,80 +144,80 @@ PTHREAD_OPTS+= native optional
153.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64") 144.if (${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "x86_64")
154GCC_REQD+= 3.4 145GCC_REQD+= 3.4
155.endif 146.endif
156 147
157.include "../../mk/compiler.mk" 148.include "../../mk/compiler.mk"
158.if !empty(CC_VERSION:Mgcc*) 149.if !empty(CC_VERSION:Mgcc*)
159COPTS?= -O2 150COPTS?= -O2
160.endif 151.endif
161CONFIGURE_ARGS+= --enable-optimize=${COPTS:Q} 152CONFIGURE_ARGS+= --enable-optimize=${COPTS:Q}
162 153
163XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s 154XPTCFILES+= xptcinvoke_asm_sparc64_netbsd.s xptcstubs_asm_sparc64_netbsd.s
164XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp 155XPTCFILES+= xptcinvoke_sparc64_netbsd.cpp xptcstubs_sparc64_netbsd.cpp
165 156
 157.if ${OPSYS} == "NetBSD" || ${OPSYS} == "DragonFly"
 158CPPFLAGS+= -DSQLITE_THREAD_OVERRIDE_LOCK=0
 159.endif
 160
166.if ${OPSYS} == "Darwin" 161.if ${OPSYS} == "Darwin"
167BUILDLINK_PASSTHRU_DIRS+=/Developer 162BUILDLINK_PASSTHRU_DIRS+=/Developer
168.endif 163.endif
169 164
170post-extract: 165post-extract:
171.for f in ${XPTCFILES} 166 cd ${FILESDIR:Q} \
172 ${CP} ${FILESDIR:Q}/${f:Q} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/${f:Q} 167 && ${CP} ${XPTCFILES} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/
173.endfor 
174 168
175pre-configure: 169pre-configure:
176 cd ${WRKSRC:Q} && autoconf 170 cd ${WRKSRC:Q} && autoconf
177 cd ${WRKSRC:Q}/nsprpub && autoconf 171 cd ${WRKSRC:Q}/nsprpub && autoconf
178 cd ${WRKSRC:Q}/directory/c-sdk && autoconf 172 cd ${WRKSRC:Q}/directory/c-sdk && autoconf
179 173
180post-build: 174post-build:
181 ${ECHO} skin,install,select,classic/1.0 >> \ 175 ${ECHO} skin,install,select,classic/1.0 >> \
182 ${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt 176 ${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt
183 ${ECHO} locale,install,select,en-US >> \ 177 ${ECHO} locale,install,select,en-US >> \
184 ${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt 178 ${WRKSRC:Q}/dist/bin/chrome/installed-chrome.txt
185 179
186# The exact set of libfreebl* libs built and installed depends on the 180# The exact set of libfreebl* libs built and installed depends on the
187# operating system and platform. For example, on solaris/sparc you might 181# operating system and platform. For example, on solaris/sparc you might
188# get 182# get
189# libfreebl_32fpu_3.so 183# libfreebl_32fpu_3.so
190# libfreebl_32int_3.so 184# libfreebl_32int_3.so
191# libfreebl_32int64_3.so 185# libfreebl_32int64_3.so
192# and on others 186# and on others
193# libfreebl3.so 187# libfreebl3.so
194# Since this has been a continual problem in many mozilla packages, just 188# Since this has been a continual problem in many mozilla packages, just
195# do that part dynamically rather than trying to always keep our conditionals 189# do that part dynamically rather than trying to always keep our conditionals
196# up to date. Note that the exact set of libfreebl libs has had a history 190# up to date. Note that the exact set of libfreebl libs has had a history
197# of changing even on minor releases. 191# of changing even on minor releases.
198PLIST_SRC= ${WRKDIR}/PLIST 192PLIST_SRC= ${WRKDIR}/PLIST
199pre-install: 193pre-install:
200 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \ 194 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.${SO_SUFFIX} | ${SORT} | \
201 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl 195 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl
202 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.chk | ${SORT} | \ 196 cd ${WRKSRC:Q}/dist/bin && ls libfreebl*.chk | ${SORT} | \
203 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl.chk 197 ${AWK} '{print "lib/$${MOZILLA}/" $$0}' > ${WRKSRC}/PLIST.libfreebl.chk
204 ${AWK} '/@comment libfreebl$$/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC} 198 ${AWK} '/@comment libfreebl$$/ {exit} {print}' ${.CURDIR}/PLIST > ${PLIST_SRC}
205 ${CAT} ${WRKSRC}/PLIST.libfreebl >> ${PLIST_SRC} 199 ${CAT} ${WRKSRC}/PLIST.libfreebl >> ${PLIST_SRC}
206 ${AWK} '/@comment libfreebl.chk/ {exit} ok == 1 {print} /@comment libfreebl$$/ {ok=1}' \ 200 ${AWK} '/@comment libfreebl.chk/ {exit} ok == 1 {print} /@comment libfreebl$$/ {ok=1}' \
207 ${.CURDIR}/PLIST >> ${PLIST_SRC} 201 ${.CURDIR}/PLIST >> ${PLIST_SRC}
208 ${CAT} ${WRKSRC}/PLIST.libfreebl.chk >> ${PLIST_SRC} 202 ${CAT} ${WRKSRC}/PLIST.libfreebl.chk >> ${PLIST_SRC}
209 ${AWK} 'ok == 1 {print} /@comment libfreebl.chk/ {ok=1}' \ 203 ${AWK} 'ok == 1 {print} /@comment libfreebl.chk/ {ok=1}' \
210 ${.CURDIR}/PLIST >> ${PLIST_SRC} 204 ${.CURDIR}/PLIST >> ${PLIST_SRC}
211 205
212do-install: 206do-install:
213 ${SETENV} ${SCRIPTS_ENV} ${SH} ${FILESDIR:Q}/moz-install 207 ${SETENV} ${SCRIPTS_ENV} DESTDIR=${DESTDIR} ${SH} ${FILESDIR:Q}/moz-install
214 208
215.if !target(do-install) 
216post-install: 209post-install:
217 ${FIND} ${PREFIX}/lib/${MOZILLA}/defaults -type f -print | \ 210 ${FIND} ${DESTDIR:Q}${PREFIX:Q}/lib/${MOZILLA}/defaults -type f -exec ${CHMOD} u+w {} \;
218 ${XARGS} ${CHMOD} u+w 
219.endif 
220 211
221.include "../../mk/pthread.buildlink3.mk" 212.include "../../mk/pthread.buildlink3.mk"
222 213
223.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none") 214.if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "none")
224CONFIGURE_ARGS+= --without-pthreads 215CONFIGURE_ARGS+= --without-pthreads
225.else 216.else
226CONFIGURE_ARGS+= --with-pthreads 217CONFIGURE_ARGS+= --with-pthreads
227.endif 218.endif
228 219
229.if ${MOZILLA_USE_XFT} == "YES" 220.if ${MOZILLA_USE_XFT} == "YES"
230CONFIGURE_ARGS+= --enable-xft 221CONFIGURE_ARGS+= --enable-xft
231# pkgconfig defaults to a "build" dependency, which is what we want. 222# pkgconfig defaults to a "build" dependency, which is what we want.
232.include "../../x11/libXft/buildlink3.mk" 223.include "../../x11/libXft/buildlink3.mk"
cvs diff -r1.15 -r1.16 pkgsrc/www/seamonkey/PLIST (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/PLIST 2008/07/05 12:04:38 1.15
+++ pkgsrc/www/seamonkey/PLIST 2009/03/18 00:08:40 1.16
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.15 2008/07/05 12:04:38 ghen Exp $ 1@comment $NetBSD: PLIST,v 1.16 2009/03/18 00:08:40 abs Exp $
2bin/${MOZILLA} 2bin/${MOZILLA}
3@comment begin PROGRAMS 3@comment begin PROGRAMS
4lib/${MOZILLA}/${MOZILLA_BIN} 4lib/${MOZILLA}/${MOZILLA_BIN}
5lib/${MOZILLA}/dirver 5lib/${MOZILLA}/dirver
6lib/${MOZILLA}/mangle 6lib/${MOZILLA}/mangle
7lib/${MOZILLA}/mozilla-xremote-client 7lib/${MOZILLA}/mozilla-xremote-client
8lib/${MOZILLA}/nsinstall 8lib/${MOZILLA}/nsinstall
9lib/${MOZILLA}/regchrome 9lib/${MOZILLA}/regchrome
10lib/${MOZILLA}/regxpcom 10lib/${MOZILLA}/regxpcom
11lib/${MOZILLA}/shlibsign 11lib/${MOZILLA}/shlibsign
12lib/${MOZILLA}/xpcshell 12lib/${MOZILLA}/xpcshell
13lib/${MOZILLA}/xpicleanup 13lib/${MOZILLA}/xpicleanup
14lib/${MOZILLA}/xpidl 14lib/${MOZILLA}/xpidl
@@ -3033,28 +3033,28 @@ include/${MOZILLA}/nss/secmodt.h @@ -3033,28 +3033,28 @@ include/${MOZILLA}/nss/secmodt.h
3033include/${MOZILLA}/nss/secoid.h 3033include/${MOZILLA}/nss/secoid.h
3034include/${MOZILLA}/nss/secoidt.h 3034include/${MOZILLA}/nss/secoidt.h
3035include/${MOZILLA}/nss/secpkcs5.h 3035include/${MOZILLA}/nss/secpkcs5.h
3036include/${MOZILLA}/nss/secpkcs7.h 3036include/${MOZILLA}/nss/secpkcs7.h
3037include/${MOZILLA}/nss/secport.h 3037include/${MOZILLA}/nss/secport.h
3038include/${MOZILLA}/nss/shsign.h 3038include/${MOZILLA}/nss/shsign.h
3039include/${MOZILLA}/nss/smime.h 3039include/${MOZILLA}/nss/smime.h
3040include/${MOZILLA}/nss/ssl.h 3040include/${MOZILLA}/nss/ssl.h
3041include/${MOZILLA}/nss/sslerr.h 3041include/${MOZILLA}/nss/sslerr.h
3042include/${MOZILLA}/nss/sslproto.h 3042include/${MOZILLA}/nss/sslproto.h
3043include/${MOZILLA}/nss/sslt.h 3043include/${MOZILLA}/nss/sslt.h
3044include/${MOZILLA}/nss/watcomfx.h 3044include/${MOZILLA}/nss/watcomfx.h
3045@comment end INCLUDE-PUBLIC 3045@comment end INCLUDE-PUBLIC
3046@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}:%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom 3046@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regxpcom
3047@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA}%D/lib MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome 3047@exec env LD_LIBRARY_PATH=%D/lib/${MOZILLA} MOZILLA_FIVE_HOME=%D/lib/${MOZILLA} %D/lib/${MOZILLA}/regchrome
3048@unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf 3048@unexec ${RM} %D/lib/${MOZILLA}/chrome/chrome.rdf
3049@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlays.rdf 3049@unexec ${RM} %D/lib/${MOZILLA}/chrome/overlays.rdf
3050@unexec ${RM} %D/lib/${MOZILLA}/chrome/stylesheets.rdf 3050@unexec ${RM} %D/lib/${MOZILLA}/chrome/stylesheets.rdf
3051@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat 3051@unexec ${RM} %D/lib/${MOZILLA}/components/compreg.dat
3052@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat 3052@unexec ${RM} %D/lib/${MOZILLA}/components/xpti.dat
3053@comment begin DIRS 3053@comment begin DIRS
3054@dirrm lib/${MOZILLA}/searchplugins 3054@dirrm lib/${MOZILLA}/searchplugins
3055@dirrm lib/${MOZILLA}/res/throbber 3055@dirrm lib/${MOZILLA}/res/throbber
3056@dirrm lib/${MOZILLA}/res/samples/sampleimages 3056@dirrm lib/${MOZILLA}/res/samples/sampleimages
3057@dirrm lib/${MOZILLA}/res/samples 3057@dirrm lib/${MOZILLA}/res/samples
3058@dirrm lib/${MOZILLA}/res/html 3058@dirrm lib/${MOZILLA}/res/html
3059@dirrm lib/${MOZILLA}/res/fonts 3059@dirrm lib/${MOZILLA}/res/fonts
3060@dirrm lib/${MOZILLA}/res/entityTables 3060@dirrm lib/${MOZILLA}/res/entityTables
cvs diff -r1.17 -r1.18 pkgsrc/www/seamonkey-gtk1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/www/seamonkey-gtk1/Attic/Makefile 2007/10/22 08:04:08 1.17
+++ pkgsrc/www/seamonkey-gtk1/Attic/Makefile 2009/03/18 00:08:40 1.18
@@ -1,8 +1,9 @@ @@ -1,8 +1,9 @@
1# $NetBSD: Makefile,v 1.17 2007/10/22 08:04:08 ghen Exp $ 1# $NetBSD: Makefile,v 1.18 2009/03/18 00:08:40 abs Exp $
2 2
3MOZILLA= seamonkey-gtk1 3MOZILLA= seamonkey-gtk1
 4PKGREVISION= 1
4 5
5COMMENT= Full featured gecko-based browser built with GTK1 6COMMENT= Full featured gecko-based browser built with GTK1
6 7
7.include "../../www/seamonkey/Makefile-seamonkey.common" 8.include "../../www/seamonkey/Makefile-seamonkey.common"
8.include "../../mk/bsd.pkg.mk" 9.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/www/seamonkey-gtk1/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/seamonkey-gtk1/Attic/buildlink3.mk 2006/07/08 23:11:13 1.6
+++ pkgsrc/www/seamonkey-gtk1/Attic/buildlink3.mk 2009/03/18 00:08:40 1.7
@@ -1,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: buildlink3.mk,v 1.6 2006/07/08 23:11:13 jlam Exp $ 1# $NetBSD: buildlink3.mk,v 1.7 2009/03/18 00:08:40 abs Exp $
2 2
3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ 3BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
4SEAMONKEY_GTK1_BUILDLINK3_MK:= ${SEAMONKEY_GTK1_BUILDLINK3_MK}+ 4SEAMONKEY_GTK1_BUILDLINK3_MK:= ${SEAMONKEY_GTK1_BUILDLINK3_MK}+
5 5
6.if !empty(BUILDLINK_DEPTH:M+) 6.if !empty(BUILDLINK_DEPTH:M+)
7BUILDLINK_DEPENDS+= seamonkey-gtk1 7BUILDLINK_DEPENDS+= seamonkey-gtk1
8.endif 8.endif
9 9
10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey-gtk1} 10BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nseamonkey-gtk1}
11BUILDLINK_PACKAGES+= seamonkey-gtk1 11BUILDLINK_PACKAGES+= seamonkey-gtk1
12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey-gtk1 12BUILDLINK_ORDER:= ${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}seamonkey-gtk1
13 13
14.if !empty(SEAMONKEY_GTK1_BUILDLINK3_MK:M+) 14.if !empty(SEAMONKEY_GTK1_BUILDLINK3_MK:M+)
15BUILDLINK_API_DEPENDS.seamonkey-gtk1+= seamonkey-gtk1>=1.0 15BUILDLINK_API_DEPENDS.seamonkey-gtk1+= seamonkey-gtk1>=1.0
16BUILDLINK_ABI_DEPENDS.seamonkey-gtk1?= seamonkey-gtk1>=1.0.1nb1 16BUILDLINK_ABI_DEPENDS.seamonkey-gtk1?= seamonkey-gtk1>=1.0.1nb1
17BUILDLINK_PKGSRCDIR.seamonkey-gtk1?= ../../www/seamonkey-gtk1 17BUILDLINK_PKGSRCDIR.seamonkey-gtk1?= ../../www/seamonkey-gtk1
18.endif # SEAMONKEY_GTK1_BUILDLINK3_MK 18.endif # SEAMONKEY_GTK1_BUILDLINK3_MK
19 19
20.include "../../graphics/freetype2/buildlink3.mk" 20.include "../../graphics/freetype2/buildlink3.mk"
21.include "../../graphics/gdk-pixbuf/buildlink3.mk" 21.include "../../graphics/gdk-pixbuf/buildlink3.mk"
22.include "../../graphics/jpeg/buildlink3.mk" 22.include "../../graphics/jpeg/buildlink3.mk"
23.include "../../graphics/png/buildlink3.mk" 23.include "../../graphics/png/buildlink3.mk"
24.include "../../net/ORBit/buildlink3.mk" 24.include "../../net/ORBit/buildlink3.mk"
25.include "../../x11/gtk/buildlink3.mk" 25.include "../../x11/gtk/buildlink3.mk"
cvs diff -r1.7 -r1.8 pkgsrc/www/seamonkey/files/moz-install (expand / switch to unified diff)

--- pkgsrc/www/seamonkey/files/moz-install 2008/12/17 19:37:40 1.7
+++ pkgsrc/www/seamonkey/files/moz-install 2009/03/18 00:08:40 1.8
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1#!/bin/sh 1#!/bin/sh
2# 2#
3# $NetBSD: moz-install,v 1.7 2008/12/17 19:37:40 tnn Exp $ 3# $NetBSD: moz-install,v 1.8 2009/03/18 00:08:40 abs Exp $
4 4
5${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin 5${BSD_INSTALL_PROGRAM_DIR} ${DESTDIR}${PREFIX}/bin
6${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA} 6${SED} -e "s,@PREFIX@,${PREFIX},g" -e "s,@MOZILLA@,${MOZILLA}," -e "s,@MOZILLA_BIN@,${MOZILLA_BIN}," ${FILESDIR}/mozilla-${OBJECT_FMT}.in > ${DESTDIR}${PREFIX}/bin/${MOZILLA}
7${CHOWN} ${BINOWN} ${DESTDIR}${PREFIX}/bin/${MOZILLA} 7${CHOWN} ${BINOWN} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
8${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${MOZILLA} 8${CHGRP} ${BINGRP} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
9${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${MOZILLA} 9${CHMOD} ${BINMODE} ${DESTDIR}${PREFIX}/bin/${MOZILLA}
10 10
11# 11#
12# Substitute variables 12# Substitute variables
13# 13#
14TMP_PLIST=${WRKDIR}/TMP_PLIST.$$ 14TMP_PLIST=${WRKDIR}/TMP_PLIST.$$
15trap "${RM} -f ${TMP_PLIST}" 1 2 15 15trap "${RM} -f ${TMP_PLIST}" 1 2 15
16 16
@@ -30,26 +30,27 @@ done @@ -30,26 +30,27 @@ done
30# install scripts 30# install scripts
31for i in `${SED} -n -e '/^@comment begin SCRIPTS$/,/^@comment end SCRIPTS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do 31for i in `${SED} -n -e '/^@comment begin SCRIPTS$/,/^@comment end SCRIPTS$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
32 src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`; 32 src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
33 ${BSD_INSTALL_SCRIPT} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i 33 ${BSD_INSTALL_SCRIPT} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
34done 34done
35 35
36# install DSO 36# install DSO
37for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do 37for i in `${SED} -n -e '/^@comment begin DSO$/,/^@comment end DSO$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
38 src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`; 38 src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
39 ${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i 39 ${MOZ_INSTALL_LIB} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
40done 40done
41 41
42# install PKGCONFIG 42# install PKGCONFIG
 43${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/lib/pkgconfig
43for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do 44for i in `${SED} -n -e '/^@comment begin PKGCONFIG$/,/^@comment end PKGCONFIG$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
44 src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`; 45 src=`echo $i | ${SED} -e "s@lib/pkgconfig@build/unix@"`;
45 ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i 46 ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
46done 47done
47 48
48# install DATA 49# install DATA
49for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do 50for i in `${SED} -n -e '/^@comment begin DATA$/,/^@comment end DATA$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do
50 src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`; 51 src=`echo $i | ${SED} -e "s@lib/${MOZILLA}@dist/bin@"`;
51 ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i 52 ${BSD_INSTALL_DATA} ${WRKSRC}/${src} ${DESTDIR}${PREFIX}/$i
52done 53done
53 54
54# install INCLUDE 55# install INCLUDE
55for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do 56for i in `${SED} -n -e '/^@comment begin INCLUDE$/,/^@comment end INCLUDE$/p' ${TMP_PLIST} | ${EGREP} -v ^@comment` ; do