- move some things from -main to -devel package where they belong

- use make var MOB the same as firefox & thunderbird
This commit is contained in:
kurt 2007-01-12 20:35:15 +00:00
parent c9ffd0d780
commit efbd06c9e7
3 changed files with 30 additions and 28 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.1.1.1 2007/01/05 14:44:47 kurt Exp $
# $OpenBSD: Makefile,v 1.2 2007/01/12 20:35:15 kurt Exp $
ONLY_FOR_ARCHS= alpha amd64 i386 powerpc sparc sparc64
@ -7,9 +7,9 @@ COMMENT-devel= "devel files for Gecko"
VER= 1.8.0.4
DISTNAME= mozilla
PKGNAME= xulrunner-${VER}
PKGNAME-main= xulrunner-${VER}
PKGNAME-devel= xulrunner-devel-${VER}
PKGNAME= xulrunner-${VER}p0
PKGNAME-main= xulrunner-${VER}p0
PKGNAME-devel= xulrunner-devel-${VER}p0
SO_VERSION= 1.0
# NOTE: Must bump minor version if any shlib's are removed from the
# components dir to avoid pkg_add -r issues.
@ -46,14 +46,15 @@ MODULES= devel/gettext
BUILD_DEPENDS= :zip->=2.3:archivers/zip
LIB_DEPENDS= gdk-x11-2.0,gdk_pixbuf-2.0,gtk-x11-2.0::x11/gtk+2 \
nspr4.>=17,plc4.>=17,plds4.>=17:nspr->=4.6.4p1:devel/nspr
WANTLIB= c glib-2.0 m pthread
WANTLIB= c glib-2.0 m pthread stdc++
WANTLIB-main= ${WANTLIB} X11 Xext Xft Xinerama Xrender Xt atk-1.0 \
cairo fontconfig freetype glitz gmodule-2.0 gobject-2.0 \
jpeg pango-1.0 pangocairo-1.0 pangoft2-1.0 png stdc++ z
WANTLIB-main= ${WANTLIB} X11 Xext Xft Xinerama Xrender Xt atk-1.0 cairo \
fontconfig freetype glitz gmodule-2.0 gobject-2.0 jpeg \
pango-1.0 pangocairo-1.0 pangoft2-1.0 png z
RUN_DEPENDS-devel= :${PKGNAME-main}:devel/xulrunner,-main
LIB_DEPENDS-devel= ${MODGETTEXT_LIB_DEPENDS} IDL-2::devel/libIDL
LIB_DEPENDS-devel= ${MODGETTEXT_LIB_DEPENDS} IDL-2::devel/libIDL \
xulrunner/mozjs,xulrunner/nss3,xulrunner/smime3,xulrunner/ssl3,xulrunner/xpcom,xulrunner/xul:${PKGNAME-main}:devel/xulrunner,-main
WANTLIB-devel= ${WANTLIB} nspr4 plc4 plds4
VMEM_WARNING= Yes
@ -100,7 +101,7 @@ MAKE_ENV= MOZ_CO_PROJECT=xulrunner \
CONFIGURE_ENV= ${MAKE_ENV} \
PKG_CONFIG_PATH="${LOCALBASE}/lib/pkgconfig:${X11BASE}/lib/pkgconfig"
MOB= ${WRKSRC}/dist
MOB= ${WRKSRC}/dist/bin
MOZ= ${PREFIX}/xulrunner
post-extract:
@ -116,26 +117,26 @@ pre-configure:
do-install:
.for dir in include idl
${INSTALL_DATA_DIR} ${MOZ}/${dir}
@cd ${MOB} && ${TAR} -chf - ${dir} | \
@cd ${WRKSRC}/dist && ${TAR} -chf - ${dir} | \
${TAR} -xf - -C ${MOZ}
.endfor
@cd ${MOB}/public && ${TAR} -chf - nss | \
@cd ${WRKSRC}/dist/public && ${TAR} -chf - nss | \
${TAR} -xf - -C ${MOZ}/include
.for dir in chrome components defaults greprefs icons res
${INSTALL_DATA_DIR} ${MOZ}/${dir}
@cd ${MOB}/bin && ${TAR} -chf - ${dir} | \
@cd ${MOB} && ${TAR} -chf - ${dir} | \
${TAR} -xf - -C ${MOZ}
.endfor
@cd ${MOB}/bin && ${TAR} -chf - *.so.?.? | \
@cd ${MOB} && ${TAR} -chf - *.so.?.? | \
${TAR} -xf - -C ${MOZ}
@chmod 444 ${MOZ}/*.so.?.? ${MOZ}/components/*.so.?.? ${MOZ}/components/*.js
${INSTALL_DATA} ${WRKSRC}/LICENSE ${MOZ}
${INSTALL_DATA} ${WRKSRC}/xulrunner/app/mozicon16.xpm ${WRKSRC}/xulrunner/app/mozicon50.xpm ${MOZ}
${INSTALL_SCRIPT} ${MOB}/bin/xulrunner ${MOB}/bin/xulrunner-config ${PREFIX}/bin/
${INSTALL_SCRIPT} ${MOB}/bin/run-mozilla.sh ${MOZ}
${INSTALL_PROGRAM} ${MOB}/bin/regxpcom ${MOB}/bin/xulrunner-bin ${MOB}/bin/mozilla-xremote-client ${MOB}/bin/TestGtkEmbed \
${MOB}/bin/mangle ${MOB}/bin/nsinstall ${MOB}/bin/shlibsign ${MOB}/bin/xpcshell ${MOB}/bin/xpicleanup ${MOB}/bin/xpidl \
${MOB}/bin/xpt_dump ${MOB}/bin/xpt_link ${MOB}/bin/xulrunner-stub ${MOZ}
${INSTALL_SCRIPT} ${MOB}/xulrunner ${MOB}/xulrunner-config ${PREFIX}/bin/
${INSTALL_SCRIPT} ${MOB}/run-mozilla.sh ${MOZ}
${INSTALL_PROGRAM} ${MOB}/regxpcom ${MOB}/xulrunner-bin ${MOB}/mozilla-xremote-client ${MOB}/TestGtkEmbed \
${MOB}/mangle ${MOB}/nsinstall ${MOB}/shlibsign ${MOB}/xpcshell ${MOB}/xpicleanup ${MOB}/xpidl \
${MOB}/xpt_dump ${MOB}/xpt_link ${MOB}/xulrunner-stub ${MOZ}
${INSTALL_DATA_DIR} ${PREFIX}/lib/pkgconfig
${INSTALL_DATA} ${WRKBUILD}/build/unix/*.pc ${PREFIX}/lib/pkgconfig

View File

@ -1,4 +1,5 @@
@comment $OpenBSD: PLIST-devel,v 1.1.1.1 2007/01/05 14:44:50 kurt Exp $
@comment $OpenBSD: PLIST-devel,v 1.2 2007/01/12 20:35:15 kurt Exp $
@conflict xulrunner-<1.8.0.4p0
bin/xulrunner-config
lib/pkgconfig/
lib/pkgconfig/xulrunner-gtkmozembed.pc
@ -2941,4 +2942,10 @@ xulrunner/include/xultmpl/
xulrunner/include/xultmpl/nsIXULBuilderListener.h
xulrunner/include/xultmpl/nsIXULSortService.h
xulrunner/include/xultmpl/nsIXULTemplateBuilder.h
xulrunner/mangle
xulrunner/shlibsign
xulrunner/xpcshell
xulrunner/xpicleanup
xulrunner/xpidl
xulrunner/xpt_dump
xulrunner/xpt_link

View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/01/05 14:44:48 kurt Exp $
@comment $OpenBSD: PLIST-main,v 1.2 2007/01/12 20:35:15 kurt Exp $
%%SHARED%%
bin/xulrunner
xulrunner/
@ -184,7 +184,6 @@ xulrunner/icons/
xulrunner/icons/document.png
xulrunner/icons/mozicon16.xpm
xulrunner/icons/mozicon50.xpm
xulrunner/mangle
xulrunner/mozicon16.xpm
xulrunner/mozicon50.xpm
xulrunner/mozilla-xremote-client
@ -353,11 +352,6 @@ xulrunner/res/unixcharset.properties
xulrunner/res/viewer.properties
xulrunner/res/viewsource.css
xulrunner/run-mozilla.sh
xulrunner/shlibsign
xulrunner/xpcshell
xulrunner/xpicleanup
xulrunner/xpt_dump
xulrunner/xpt_link
xulrunner/xulrunner-bin
xulrunner/xulrunner-stub
@exec xulrunner --register-global