Fri Jul 2 20:41:39 2010 UTC ()
Try harder to actually find -ljawt.


(joerg)
diff -r1.5 -r1.6 pkgsrc/devel/swt/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/devel/swt/files/make_pkgsrc.mak
cvs diff -r1.5 -r1.6 pkgsrc/devel/swt/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/swt/Attic/Makefile 2010/06/13 22:44:10 1.5
+++ pkgsrc/devel/swt/Attic/Makefile 2010/07/02 20:41:39 1.6
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $ 1# $NetBSD: Makefile,v 1.6 2010/07/02 20:41:39 joerg Exp $
2# 2#
3 3
4SWTREL= 3.5.1 4SWTREL= 3.5.1
5SWTVER= 3555 5SWTVER= 3555
6SWTDATE= 200909170800 6SWTDATE= 200909170800
7 7
8PKGNAME= swt-${SWTREL}.${SWTVER} 8PKGNAME= swt-${SWTREL}.${SWTVER}
9DISTNAME= swt-${SWTREL}-gtk-linux-x86 9DISTNAME= swt-${SWTREL}-gtk-linux-x86
10PKGREVISION= 1 10PKGREVISION= 1
11CATEGORIES= devel 11CATEGORIES= devel
12MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops/R-${SWTREL}-${SWTDATE}/ 12MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops/R-${SWTREL}-${SWTDATE}/
13EXTRACT_SUFX= .zip 13EXTRACT_SUFX= .zip
14 14
@@ -25,35 +25,43 @@ USE_LANGUAGES= c c++ @@ -25,35 +25,43 @@ USE_LANGUAGES= c c++
25USE_JAVA2= yes 25USE_JAVA2= yes
26 26
27BUILD_DEPENDS+= apache-ant>=1.7.1:../../devel/apache-ant 27BUILD_DEPENDS+= apache-ant>=1.7.1:../../devel/apache-ant
28 28
29BUILD_TARGETS= all make_awt make_cairo make_xulrunner 29BUILD_TARGETS= all make_awt make_cairo make_xulrunner
30BUILD_LIBS= swt-atk-gtk swt-awt-gtk swt-cairo-gtk swt-glx-gtk \ 30BUILD_LIBS= swt-atk-gtk swt-awt-gtk swt-cairo-gtk swt-glx-gtk \
31 swt-gnome-gtk swt-gtk swt-pi-gtk swt-xulrunner-gtk 31 swt-gnome-gtk swt-gtk swt-pi-gtk swt-xulrunner-gtk
32 32
33PLIST_SUBST+= SWTVER=${SWTVER} 33PLIST_SUBST+= SWTVER=${SWTVER}
34 34
35INSTALLATION_DIRS+= share/java 35INSTALLATION_DIRS+= share/java
36INSTALLATION_DIRS+= lib/jni 36INSTALLATION_DIRS+= lib/jni
37 37
 38.include "../../mk/bsd.prefs.mk"
 39
 40.if ${OPSYS} == "NetBSD" && ${LOWER_ARCH} == "x86_64"
 41MY_LOWER_ARCH= amd64
 42.endif
 43MY_LOWER_ARCH?= ${LOWER_ARCH}
 44
38post-extract: 45post-extract:
39 cd ${WRKSRC} && jar -xf ${WRKSRC}/src.zip 46 cd ${WRKSRC} && jar -xf ${WRKSRC}/src.zip
40 cp ${FILESDIR}/make_pkgsrc.mak ${WRKSRC} 47 cp ${FILESDIR}/make_pkgsrc.mak ${WRKSRC}
41 48
42do-build: 49do-build:
43.for target in ${BUILD_TARGETS} 50.for target in ${BUILD_TARGETS}
44 cd ${WRKSRC} && ${GMAKE} \ 51 cd ${WRKSRC} && ${GMAKE} \
45 JAVA_HOME=${PKG_JAVA_HOME} \ 52 JAVA_HOME=${PKG_JAVA_HOME} \
46 LOWER_OPSYS=${LOWER_OPSYS} \ 53 LOWER_OPSYS=${LOWER_OPSYS} \
 54 LOWER_ARCH=${MY_LOWER_ARCH} \
47 -f make_pkgsrc.mak ${target} 55 -f make_pkgsrc.mak ${target}
48.endfor 56.endfor
49 ${TEST} -d ${WRKSRC}/bin || mkdir ${WRKSRC}/bin 57 ${TEST} -d ${WRKSRC}/bin || mkdir ${WRKSRC}/bin
50 cd ${WRKSRC} && find org/eclipse/swt -type f -name \*.java | \ 58 cd ${WRKSRC} && find org/eclipse/swt -type f -name \*.java | \
51 xargs ${JAVA_BINPREFIX}-javac -source 1.4 -target 1.4 -d bin 59 xargs ${JAVA_BINPREFIX}-javac -source 1.4 -target 1.4 -d bin
52 cd ${WRKSRC}/bin && ${JAVA_BINPREFIX}-jar -cf ${WRKSRC}/swt.jar . 60 cd ${WRKSRC}/bin && ${JAVA_BINPREFIX}-jar -cf ${WRKSRC}/swt.jar .
53 61
54do-install: 62do-install:
55 ${INSTALL_DATA} ${WRKSRC}/swt.jar \ 63 ${INSTALL_DATA} ${WRKSRC}/swt.jar \
56 ${DESTDIR}${PREFIX}/share/java/swt.jar 64 ${DESTDIR}${PREFIX}/share/java/swt.jar
57.for libname in ${BUILD_LIBS} 65.for libname in ${BUILD_LIBS}
58 ${INSTALL_LIB} ${WRKSRC}/lib${libname}-${SWTVER}.so \ 66 ${INSTALL_LIB} ${WRKSRC}/lib${libname}-${SWTVER}.so \
59 ${DESTDIR}${PREFIX}/lib/jni/lib${libname}-${SWTVER}.so 67 ${DESTDIR}${PREFIX}/lib/jni/lib${libname}-${SWTVER}.so
cvs diff -r1.1.1.1 -r1.2 pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak (expand / switch to unified diff)

--- pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak 2010/02/03 13:51:29 1.1.1.1
+++ pkgsrc/devel/swt/files/Attic/make_pkgsrc.mak 2010/07/02 20:41:39 1.2
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: make_pkgsrc.mak,v 1.1.1.1 2010/02/03 13:51:29 jmcneill Exp $ 1# $NetBSD: make_pkgsrc.mak,v 1.2 2010/07/02 20:41:39 joerg Exp $
2#******************************************************************************* 2#*******************************************************************************
3# Copyright (c) 2000, 2009 IBM Corporation and others. 3# Copyright (c) 2000, 2009 IBM Corporation and others.
4# All rights reserved. This program and the accompanying materials 4# All rights reserved. This program and the accompanying materials
5# are made available under the terms of the Eclipse Public License v1.0 5# are made available under the terms of the Eclipse Public License v1.0
6# which accompanies this distribution, and is available at 6# which accompanies this distribution, and is available at
7# http://www.eclipse.org/legal/epl-v10.html 7# http://www.eclipse.org/legal/epl-v10.html
8# 8#
9# Contributors: 9# Contributors:
10# IBM Corporation - initial API and implementation 10# IBM Corporation - initial API and implementation
11#******************************************************************************* 11#*******************************************************************************
12 12
13# Makefile for creating SWT libraries for Linux GTK 13# Makefile for creating SWT libraries for Linux GTK
14 14
@@ -41,27 +41,27 @@ MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_ @@ -41,27 +41,27 @@ MOZILLA_LIB = lib$(MOZILLA_PREFIX)-$(WS_
41XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 41XULRUNNER_LIB = lib$(XULRUNNER_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
42XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 42XPCOMINIT_LIB = lib$(XPCOMINIT_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
43GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so 43GLX_LIB = lib$(GLX_PREFIX)-$(WS_PREFIX)-$(SWT_VERSION).so
44 44
45CAIROCFLAGS = `pkg-config --cflags cairo` 45CAIROCFLAGS = `pkg-config --cflags cairo`
46CAIROLIBS = `pkg-config --libs-only-L cairo` `pkg-config --libs-only-other cairo` -lcairo 46CAIROLIBS = `pkg-config --libs-only-L cairo` `pkg-config --libs-only-other cairo` -lcairo
47 47
48# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0) 48# Do not use pkg-config to get libs because it includes unnecessary dependencies (i.e. pangoxft-1.0)
49GTKCFLAGS = `pkg-config --cflags gtk+-2.0` 49GTKCFLAGS = `pkg-config --cflags gtk+-2.0`
50GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-only-other gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -lXtst 50GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-only-other gtk+-2.0 gthread-2.0` -lgtk-x11-2.0 -lgthread-2.0 -lXtst
51 51
52CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc 52CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc
53 53
54AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared 54AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -R$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -ljawt -shared
55 55
56ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` 56ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0`
57ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0 57ATKLIBS = `pkg-config --libs-only-L atk gtk+-2.0` `pkg-config --libs-only-other atk gtk+-2.0` -latk-1.0 -lgtk-x11-2.0
58 58
59GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` 59GNOMECFLAGS = `pkg-config --cflags gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0`
60GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` `pkg-config --libs-only-other gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2 60GNOMELIBS = `pkg-config --libs-only-L gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` `pkg-config --libs-only-other gnome-vfs-module-2.0 libgnome-2.0 libgnomeui-2.0` -lgnomevfs-2 -lgnome-2 -lgnomeui-2
61 61
62GLXCFLAGS = `pkg-config --cflags gl` 62GLXCFLAGS = `pkg-config --cflags gl`
63GLXLIBS = -shared -fPIC `pkg-config --libs gl x11` -lGLU -lm 63GLXLIBS = -shared -fPIC `pkg-config --libs gl x11` -lGLU -lm
64 64
65# Uncomment for Native Stats tool 65# Uncomment for Native Stats tool
66#NATIVE_STATS = -DNATIVE_STATS 66#NATIVE_STATS = -DNATIVE_STATS
67 67