cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Assorted cleanups to xulrunner 1.9 port :

Browse Source 
- rename libxul{,-embedding}.pc files to libxul19{,-embedding}.pc to
  cope with an eventual xulrunner built from latest mozilla
- move some WANTLIB-devel from Makefile.inc to 1.9/Makefile
- use BASE_PKGPATH instead of devel/xulrunner/${MOZILLA_VERSION:R:R}, as
  there might be a devel/xulrunner/last someday
- sanitize the subst regexps done on the .pc files, half of them were
  useless
- bump REVISIONs.

Tested in a full bulk build with all xulrunner users..
This commit is contained in:
landry 2012-04-07 13:10:50 +00:00
parent 49912c40f5
commit 1782b6d9d9
3 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
devel/xulrunner/1.9/Makefile
View File

@ -1,10 +1,12 @@
# $OpenBSD: Makefile,v 1.60 2012/03/16 21:45:08 landry Exp $
# $OpenBSD: Makefile,v 1.61 2012/04/07 13:10:50 landry Exp $
MOZILLA_VERSION = 1.9.2.28
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = xulrunner1.9
MOZILLA_DIST = firefox
MOZILLA_DIST_VERSION = 3.6.28
REVISION-devel = 0
REVISION-main = 0
SO_VERSION = 3.2
# NOTE: Must bump minor version if any shlib's are removed from the
@ -34,6 +36,9 @@ PCFILES = libxul.pc libxul-embedding.pc mozilla-js.pc \
mozilla-plugin.pc mozilla-gtkmozembed.pc \
mozilla-gtkmozembed-embedding.pc
WANTLIB-devel = ${MOZILLA_PROJECT}/mozjs ${MOZILLA_PROJECT}/xpcom \
${MOZILLA_PROJECT}/xul
post-build:
cd ${WRKSRC}/xulrunner/installer && env -i ${MAKE_ENV} \
${MAKE_PROGRAM} ${MAKE_FLAGS} ${PCFILES}
@ -59,11 +64,13 @@ post-install:
${INSTALL_DATA} ${WRKBUILD}/xulrunner/installer/${pcfile} \
${PREFIX}/lib/pkgconfig/${pcfile:S/mozilla/xulrunner/}
.endfor
perl -pi -e 's|libxul-embedding-unstable|libxul-embedding|g; ' \
-e 's|libxul-unstable|libxul|g; s|unstable|stable|g; ' \
perl -pi -e 's|libxul|libxul19|g; s|/lib||g; ' \
-e 's|^(Libs:.*)|\1 -Wl,-rpath,${LOCALBASE}/xulrunner1.9|g; ' \
-e 's|-lxpcomglue |-lxpcomglue_pic |g; s|-lxpcomglue_s |-lxpcomglue_s_pic |; ' \
-e 's|/lib||g; s|/stable||g; s|/\$${includetype}||g; ' \
${PREFIX}/lib/pkgconfig/*.pc
# avoid conflicts with newer xulrunners
mv ${PREFIX}/lib/pkgconfig/libxul{,19}.pc
mv ${PREFIX}/lib/pkgconfig/libxul{,19}-embedding.pc
.include <bsd.port.mk>

6
devel/xulrunner/1.9/pkg/PLIST-devel
View File

@ -1,10 +1,10 @@
@comment $OpenBSD: PLIST-devel,v 1.14 2011/03/11 16:31:36 landry Exp $
@comment $OpenBSD: PLIST-devel,v 1.15 2012/04/07 13:10:50 landry Exp $
@option no-default-conflict
@conflict xulrunner-devel->=1.9
%%jit%%
%%amd64%%
lib/pkgconfig/libxul-embedding.pc
lib/pkgconfig/libxul.pc
lib/pkgconfig/libxul19-embedding.pc
lib/pkgconfig/libxul19.pc
lib/pkgconfig/xulrunner-gtkmozembed-embedding.pc
lib/pkgconfig/xulrunner-gtkmozembed.pc
lib/pkgconfig/xulrunner-js.pc

10
devel/xulrunner/Makefile.inc
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile.inc,v 1.22 2011/12/08 00:19:07 nigel Exp $
# $OpenBSD: Makefile.inc,v 1.23 2012/04/07 13:10:50 landry Exp $
COMMENT-main = standalone XUL/XPCOM runtime environment
COMMENT-devel = devel files for Gecko
@ -28,15 +28,13 @@ WANTLIB-main = ${WANTLIB}
LIB_DEPENDS-devel = ${MODGETTEXT_LIB_DEPENDS} \
devel/libIDL \
${PKGNAME-main}:devel/xulrunner/${MOZILLA_VERSION:R:R},-main
${PKGNAME-main}:${BASE_PKGPATH},-main
WANTLIB-devel += ${MODGETTEXT_WANTLIB} \
c glib-2.0 gobject-2.0 gthread-2.0 m pthread stdc++ \
IDL-2 nspr4 plc4 plds4 \
${MOZILLA_PROJECT}/mozjs ${MOZILLA_PROJECT}/xpcom \
${MOZILLA_PROJECT}/xul
IDL-2 nspr4 plc4 plds4
MODGNU_CONFIG_GUESS_DIRS += ${WRKSRC}/build/autoconf
CONFIGURE_STYLE = autoconf no-autoheader
CONFIGURE_ARGS = --disable-javaxpcom \
CONFIGURE_ARGS += --disable-javaxpcom \
--enable-extensions=default,cookie,permissions