diff options
| author | agc <agc@pkgsrc.org> | 2010-07-04 07:06:23 +0000 |
|---|---|---|
| committer | agc <agc@pkgsrc.org> | 2010-07-04 07:06:23 +0000 |
| commit | c1785f908b64dc90b72c58306ff1e35f3bf44169 (patch) | |
| tree | 388af7db675f4eefbd61575c786172c35b8ef703 /devel/swt | |
| parent | d9dae677017c4ed34ca890920c4670d1688aa3ba (diff) | |
| download | pkgsrc-c1785f908b64dc90b72c58306ff1e35f3bf44169.tar.gz | |
Pullup previous changes on HEAD to pkgsrc-2010Q2 branch to fix branching
error, and to sync with reality.
Diffstat (limited to 'devel/swt')
| -rw-r--r-- | devel/swt/Makefile | 10 | ||||
| -rw-r--r-- | devel/swt/files/make_pkgsrc.mak | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/devel/swt/Makefile b/devel/swt/Makefile index cf7d21735ce..c63d55dec07 100644 --- a/devel/swt/Makefile +++ b/devel/swt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/06/13 22:44:10 wiz Exp $ +# $NetBSD: Makefile,v 1.5.2.1 2010/07/04 07:10:51 agc Exp $ # SWTREL= 3.5.1 @@ -35,6 +35,13 @@ PLIST_SUBST+= SWTVER=${SWTVER} INSTALLATION_DIRS+= share/java INSTALLATION_DIRS+= lib/jni +.include "../../mk/bsd.prefs.mk" + +.if ${OPSYS} == "NetBSD" && ${LOWER_ARCH} == "x86_64" +MY_LOWER_ARCH= amd64 +.endif +MY_LOWER_ARCH?= ${LOWER_ARCH} + post-extract: cd ${WRKSRC} && jar -xf ${WRKSRC}/src.zip cp ${FILESDIR}/make_pkgsrc.mak ${WRKSRC} @@ -44,6 +51,7 @@ do-build: cd ${WRKSRC} && ${GMAKE} \ JAVA_HOME=${PKG_JAVA_HOME} \ LOWER_OPSYS=${LOWER_OPSYS} \ + LOWER_ARCH=${MY_LOWER_ARCH} \ -f make_pkgsrc.mak ${target} .endfor ${TEST} -d ${WRKSRC}/bin || mkdir ${WRKSRC}/bin diff --git a/devel/swt/files/make_pkgsrc.mak b/devel/swt/files/make_pkgsrc.mak index 3334660b226..6eefc9733ec 100644 --- a/devel/swt/files/make_pkgsrc.mak +++ b/devel/swt/files/make_pkgsrc.mak @@ -1,4 +1,4 @@ -# $NetBSD: make_pkgsrc.mak,v 1.1.1.1 2010/02/03 13:51:29 jmcneill Exp $ +# $NetBSD: make_pkgsrc.mak,v 1.1.1.1.4.1 2010/07/04 07:10:51 agc Exp $ #******************************************************************************* # Copyright (c) 2000, 2009 IBM Corporation and others. # All rights reserved. This program and the accompanying materials @@ -51,7 +51,7 @@ GTKLIBS = `pkg-config --libs-only-L gtk+-2.0 gthread-2.0` `pkg-config --libs-onl CDE_LIBS = -L$(CDE_HOME)/lib -R$(CDE_HOME)/lib -lXt -lX11 -lDtSvc -AWT_LIBS = -L$(AWT_LIB_PATH) -ljawt -shared +AWT_LIBS = -L$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -R$(JAVA_HOME)/jre/lib/$(LOWER_ARCH) -ljawt -shared ATKCFLAGS = `pkg-config --cflags atk gtk+-2.0` ATKLIBS = `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 |