Wed Nov 4 09:48:10 2009 UTC ()
back out local change


(tnn)
diff -r1.27 -r1.28 pkgsrc/devel/xulrunner/Makefile
cvs diff -r1.27 -r1.28 pkgsrc/devel/xulrunner/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/xulrunner/Attic/Makefile 2009/11/04 09:13:05 1.27
+++ pkgsrc/devel/xulrunner/Attic/Makefile 2009/11/04 09:48:10 1.28
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.27 2009/11/04 09:13:05 tnn Exp $ 1# $NetBSD: Makefile,v 1.28 2009/11/04 09:48:10 tnn Exp $
2# 2#
3 3
4DISTNAME= firefox-${FIREFOX_VER}.source 4DISTNAME= firefox-${FIREFOX_VER}.source
5PKGNAME= ${DISTNAME:S/firefox/xulrunner/:S/3.5/1.9.1/:S/.source//} 5PKGNAME= ${DISTNAME:S/firefox/xulrunner/:S/3.5/1.9.1/:S/.source//}
6PKGREVISION= 1 6PKGREVISION= 1
7FIREFOX_VER= 3.5.4 7FIREFOX_VER= 3.5.4
8CATEGORIES= devel www 8CATEGORIES= devel www
9MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/} 9MASTER_SITES= ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
10EXTRACT_SUFX= .tar.bz2 10EXTRACT_SUFX= .tar.bz2
11 11
12MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
13HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner 13HOMEPAGE= http://developer.mozilla.org/en/docs/XULRunner
14COMMENT= XML User Interface Language runtime environment 14COMMENT= XML User Interface Language runtime environment
@@ -40,30 +40,26 @@ pre-configure: @@ -40,30 +40,26 @@ pre-configure:
40 cd ${WRKSRC}/js/src && autoconf 40 cd ${WRKSRC}/js/src && autoconf
41 cd ${WRKSRC}/nsprpub && autoconf 41 cd ${WRKSRC}/nsprpub && autoconf
42 42
43INCLUDE_SUBDIRS=\ 43INCLUDE_SUBDIRS=\
44 caps chardet commandhandler content cookie docshell dom \ 44 caps chardet commandhandler content cookie docshell dom \
45 downloads embedcomponents exthandler fastfind find gfx \ 45 downloads embedcomponents exthandler fastfind find gfx \
46 gtkembedmoz htmlparser imglib2 intl java js layout libreg \ 46 gtkembedmoz htmlparser imglib2 intl java js layout libreg \
47 locale loginmgr mimetype necko nkcache nspr oji pipboot pipnss \ 47 locale loginmgr mimetype necko nkcache nspr oji pipboot pipnss \
48 places pref profdirserviceprovider rdf shistory spellchecker \ 48 places pref profdirserviceprovider rdf shistory spellchecker \
49 string thebes toolkitcomps uconv uriloader webbrowserpersist \ 49 string thebes toolkitcomps uconv uriloader webbrowserpersist \
50 webbrwsr webshell widget windowwatcher xpcom xpconnect xulapp \ 50 webbrwsr webshell widget windowwatcher xpcom xpconnect xulapp \
51 plugin liveconnect 51 plugin liveconnect
52 52
53# xxxtnn seamonkey stuff. Don't commit 
54# txmgr appcomps appshell alerts rdfutil \ 
55# unicharutil lwbrk editor zipwriter mork 
56 
57post-install: 53post-install:
58 # XXX fix the pkg-config files instead 54 # XXX fix the pkg-config files instead
59 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 55 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
60 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \ 56 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue.a \
61 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a 57 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue.a
62 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a 58 rm -f ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
63 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a \ 59 ln -s ${PREFIX}/lib/xulrunner-sdk/sdk/lib/libxpcomglue_s.a \
64 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a 60 ${DESTDIR}${PREFIX}/lib/xulrunner/libxpcomglue_s.a
65 ${INSTALL_LIB} ${WRKSRC}/dist/lib/libunicharutil_external_s.a \ 61 ${INSTALL_LIB} ${WRKSRC}/dist/lib/libunicharutil_external_s.a \
66 ${DESTDIR}${PREFIX}/lib/xulrunner 62 ${DESTDIR}${PREFIX}/lib/xulrunner
67.for dir in ${INCLUDE_SUBDIRS} 63.for dir in ${INCLUDE_SUBDIRS}
68 cd ${WRKSRC}/dist/include && \ 64 cd ${WRKSRC}/dist/include && \
69 ${INSTALL_DATA} `find ${dir} -name "*.h" -print` \ 65 ${INSTALL_DATA} `find ${dir} -name "*.h" -print` \