diff options
| author | beat <beat@FreeBSD.org> | 2010-08-08 16:58:16 +0800 |
|---|---|---|
| committer | beat <beat@FreeBSD.org> | 2010-08-08 16:58:16 +0800 |
| commit | 79a935d5ddd4a46037d9fb8897bfeec779158970 (patch) | |
| tree | cc306176da5617706995572db9ee37cebf71d399 | |
| parent | 03ec7c0f8b776fe02d07654276bc4932bea38874 (diff) | |
| download | freebsd-ports-gnome-79a935d5ddd4a46037d9fb8897bfeec779158970.tar.gz freebsd-ports-gnome-79a935d5ddd4a46037d9fb8897bfeec779158970.tar.zst freebsd-ports-gnome-79a935d5ddd4a46037d9fb8897bfeec779158970.zip | |
- Fix build with libxul 1.9.2
- Bump PORTREVISION after libxul update
PR: ports/149044
Submitted by: decke@
Expr-run by: pav@
Approved by: portmgr (pav)
| -rw-r--r-- | multimedia/moonlight/Makefile | 6 | ||||
| -rw-r--r-- | multimedia/moonlight/pkg-plist | 4 | ||||
| -rw-r--r-- | net/libproxy-mozjs/Makefile | 4 | ||||
| -rw-r--r-- | x11-toolkits/py-gnome-extras/Makefile | 12 |
4 files changed, 15 insertions, 11 deletions
diff --git a/multimedia/moonlight/Makefile b/multimedia/moonlight/Makefile index 865ff5230afc..019b126a2104 100644 --- a/multimedia/moonlight/Makefile +++ b/multimedia/moonlight/Makefile @@ -7,7 +7,7 @@ PORTNAME= moonlight PORTVERSION= 2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= multimedia www MASTER_SITES= http://ftp.novell.com/pub/mono/sources/moon/${PORTVERSION}/ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \ @@ -32,8 +32,8 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ CONFIGURE_ARGS= --with-cairo=system \ --with-debug=yes \ --with-ff2=no \ - --with-ff3=yes \ - --with-ff36=no \ + --with-ff3=no \ + --with-ff36=yes \ --with-mcspath=${MONODIR}/mcs/ \ --with-mono-basic-path=${MONOBASICDIR}/ diff --git a/multimedia/moonlight/pkg-plist b/multimedia/moonlight/pkg-plist index b89af47cff31..59195dda2cff 100644 --- a/multimedia/moonlight/pkg-plist +++ b/multimedia/moonlight/pkg-plist @@ -94,8 +94,8 @@ lib/moonlight/plugin/System.dll lib/moonlight/plugin/System.dll.mdb lib/moonlight/plugin/libmoonloader.la lib/moonlight/plugin/libmoonloader.so -lib/moonlight/plugin/libmoonplugin-ff3bridge.la -lib/moonlight/plugin/libmoonplugin-ff3bridge.so +lib/moonlight/plugin/libmoonplugin-ff36bridge.la +lib/moonlight/plugin/libmoonplugin-ff36bridge.so lib/moonlight/plugin/libmoonplugin.la lib/moonlight/plugin/libmoonplugin.so lib/moonlight/plugin/mscorlib.dll diff --git a/net/libproxy-mozjs/Makefile b/net/libproxy-mozjs/Makefile index 513bbb6225c0..461c13ca24e1 100644 --- a/net/libproxy-mozjs/Makefile +++ b/net/libproxy-mozjs/Makefile @@ -5,7 +5,7 @@ # $FreeBSD$ # -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= net devel PKGNAMESUFFIX= -mozjs @@ -27,7 +27,7 @@ CONFIGURE_ARGS=--without-gnome --without-kde --without-webkit \ LIBPROXY_SLAVE= yes post-patch: - @${REINPLACE_CMD} -e 's|mozilla-js|mozilla-js libxul-unstable|g' \ + @${REINPLACE_CMD} -e 's|mozilla-js|mozilla-js libxul|g' \ ${WRKSRC}/configure .include "${MASTERDIR}/Makefile" diff --git a/x11-toolkits/py-gnome-extras/Makefile b/x11-toolkits/py-gnome-extras/Makefile index 4eadfeda2c62..26f258cc261e 100644 --- a/x11-toolkits/py-gnome-extras/Makefile +++ b/x11-toolkits/py-gnome-extras/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-extras PORTVERSION= 2.25.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= x11-toolkits python gnome MASTER_SITES= GNOME MASTER_SITE_SUBDIR= sources/gnome-python-extras/${PORTVERSION:C/..$//} @@ -44,13 +44,17 @@ DOCSDIR= ${WRKSRC}/share/doc/py-gnome-extras .include <bsd.port.pre.mk> -.if defined(GECKO) && ${GECKO:Mlibxul}!="" -CONFIGURE_ARGS+= --with-gtkmozembed=mozilla -.else +.if defined(GECKO) CONFIGURE_ARGS+= --with-gtkmozembed=${GECKO} .endif post-patch: +.if ${GECKO}=="libxul" + @${REINPLACE_CMD} -e 's|xulrunner|libxul|' \ + ${WRKSRC}/configure +.endif + @${REINPLACE_CMD} -e 's|$mozpackage-gtkmozembed|$mozpackage|' \ + ${WRKSRC}/configure @${FIND} ${WRKSRC}/docs -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ -e 's|^HTML_DIR =.*|HTML_DIR = ${DOCSDIR}|g' |