Cope with libxul.pc -> libxul19.pc renaming.

This commit is contained in:
landry 2012-04-07 13:11:27 +00:00
parent 1782b6d9d9
commit 94207a163e
2 changed files with 6 additions and 6 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2011/10/07 13:54:30 kurt Exp $
# $OpenBSD: Makefile,v 1.68 2012/04/07 13:11:27 landry Exp $
SHARED_ONLY= Yes
ONLY_FOR_ARCHS= amd64 i386
@ -18,7 +18,7 @@ REVISION-swt= 4
PKGNAME-gnome= swt-gnome-${ECLIPSE_VER}
REVISION-gnome= 4
PKGNAME-browser= swt-browser-${ECLIPSE_VER}
REVISION-browser= 6
REVISION-browser= 7
SHARED_LIBS= swt-atk-gtk-3236 4.0 \
swt-awt-gtk-3236 4.0 \
swt-gtk-3236 4.0 \

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh,v 1.6 2010/10/24 13:12:16 landry Exp $
$OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh,v 1.7 2012/04/07 13:11:27 landry Exp $
--- plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh.orig Thu Sep 21 10:57:18 2006
+++ plugins/org.eclipse.swt/Eclipse SWT PI/gtk/library/build.sh Wed Dec 13 22:33:39 2006
@@ -27,6 +27,10 @@ if [ "${OS}" = "" ]; then
@ -47,9 +47,9 @@ $OpenBSD: patch-plugins_org_eclipse_swt_Eclipse_SWT_PI_gtk_library_build_sh,v 1.
- if [ x`pkg-config --exists mozilla-xpcom && echo YES` = "xYES" ]; then
- GECKO_INCLUDES=`pkg-config --cflags mozilla-xpcom`
- GECKO_LIBS=`pkg-config --libs mozilla-xpcom`
+ if [ x`pkg-config --exists libxul && echo YES` = "xYES" ]; then
+ GECKO_INCLUDES="`pkg-config --cflags libxul`"
+ GECKO_LIBS="`pkg-config --libs libxul` "
+ if [ x`pkg-config --exists libxul19 && echo YES` = "xYES" ]; then
+ GECKO_INCLUDES="`pkg-config --cflags libxul19`"
+ GECKO_LIBS="`pkg-config --libs libxul19` "
export GECKO_INCLUDES
export GECKO_LIBS
MAKE_MOZILLA=make_mozilla