summaryrefslogtreecommitdiff
path: root/lang/kaffe
diff options
context:
space:
mode:
authorskrll <skrll@pkgsrc.org>2001-04-24 12:40:07 +0000
committerskrll <skrll@pkgsrc.org>2001-04-24 12:40:07 +0000
commite877c6b3dd52465a1fd76e5c6e1c896706104449 (patch)
tree1e93b954f519450211f288fc2da0f4b9ce19ae45 /lang/kaffe
parentb18da305138813a3f5316c46ccdc44f7298d2fb8 (diff)
downloadpkgsrc-e877c6b3dd52465a1fd76e5c6e1c896706104449.tar.gz
Use LTCONFIG_OVERRIDE instead of post-configure stuff.
Don't look for moddi3 in libgcc - its not there. The configure script still found it there though. Add a test target. Remove the preempt test as the test target will get stuck. Some tests fail.
Diffstat (limited to 'lang/kaffe')
-rw-r--r--lang/kaffe/Makefile26
-rw-r--r--lang/kaffe/distinfo4
-rw-r--r--lang/kaffe/patches/patch-aa13
-rw-r--r--lang/kaffe/pkg/PLIST14
4 files changed, 28 insertions, 29 deletions
diff --git a/lang/kaffe/Makefile b/lang/kaffe/Makefile
index 7ff6445b4e8..c7c7ddedbc0 100644
--- a/lang/kaffe/Makefile
+++ b/lang/kaffe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2001/03/19 17:07:16 wennmach Exp $
+# $NetBSD: Makefile,v 1.32 2001/04/24 12:40:07 skrll Exp $
#
DISTNAME= kaffe-1.0.6
@@ -16,6 +16,7 @@ DEPENDS+= gmp>=3.0.0:../../devel/gmp
USE_X11= yes
USE_LIBTOOL= yes
+LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
ONLY_FOR_PLATFORM= *-*-arm32 *-*-i386 *-*-m68k *-*-mips* *-*-sparc
@@ -26,28 +27,11 @@ CONFIGURE_ENV+= CPPFLAGS="${CPPFLAGS}"
CPPFLAGS+= -Dunix -I${LOCALBASE}/include -I${X11BASE}/include
-post-configure:
- ${RM} ${WRKDIR}/${PKGNAME}/libtool
- ${LN} -s ${LOCALBASE}/bin/libtool ${WRKDIR}/${PKGNAME}/libtool
- ${RM} ${WRKDIR}/${PKGNAME}/libltdl/libtool
- ${LN} -s ${LOCALBASE}/bin/libtool ${WRKDIR}/${PKGNAME}/libltdl/libtool
-
post-install:
${INSTALL_DATA} ${WRKSRC}/license.terms \
${PREFIX}/kaffe/share
- if [ -f ${PREFIX}/kaffe/lib/libkaffevm.so ]; then \
- ${MV} ${PREFIX}/kaffe/lib/libkaffevm.so \
- ${PREFIX}/kaffe/lib/libkaffevm.so.0.0; \
- ${MV} ${PREFIX}/kaffe/lib/kaffe/libio.so \
- ${PREFIX}/kaffe/lib/kaffe/libio.so.0.0; \
- ${MV} ${PREFIX}/kaffe/lib/kaffe/libmanagement.so \
- ${PREFIX}/kaffe/lib/kaffe/libmanagement.so.0.0; \
- ${MV} ${PREFIX}/kaffe/lib/kaffe/libmicrosoft.so \
- ${PREFIX}/kaffe/lib/kaffe/libmicrosoft.so.0.0; \
- ${MV} ${PREFIX}/kaffe/lib/kaffe/libnet.so \
- ${PREFIX}/kaffe/lib/kaffe/libnet.so.0.0; \
- ${MV} ${PREFIX}/kaffe/lib/kaffe/libsecurity.so \
- ${PREFIX}/kaffe/lib/kaffe/libsecurity.so.0.0; \
- fi
+
+test:
+ @cd ${WRKSRC}/test && ${MAKE} check
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/distinfo b/lang/kaffe/distinfo
index 197e1eb4435..47788c7dfa6 100644
--- a/lang/kaffe/distinfo
+++ b/lang/kaffe/distinfo
@@ -1,4 +1,6 @@
-$NetBSD: distinfo,v 1.2 2001/04/19 15:00:53 agc Exp $
+$NetBSD: distinfo,v 1.3 2001/04/24 12:40:07 skrll Exp $
SHA1 (kaffe-1.0.6.tar.gz) = aa9028f1108a664b624ab9f1f4022801aea7e5bd
Size (kaffe-1.0.6.tar.gz) = 3586207 bytes
+SHA1 (patch-aa) = 16cdd6a8e555397c9ffc8b4f58cb9667b8da6509
+SHA1 (patch-ab) = 5012e6e54662cc4a061a80def732dc030fe86961
diff --git a/lang/kaffe/patches/patch-aa b/lang/kaffe/patches/patch-aa
new file mode 100644
index 00000000000..0c554a0ad6f
--- /dev/null
+++ b/lang/kaffe/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.9 2001/04/24 12:40:08 skrll Exp $
+
+--- configure.orig Mon Jul 24 20:47:29 2000
++++ configure
+@@ -3608,7 +3608,7 @@
+
+
+ case "$Khost_os" in
+-freebsd2|netbsd1|oskit)
++freebsd2|oskit)
+ KSAVE_LIBS="$LIBS"
+ LIBS="$VM_LIBS $KSAVE_LIBS"
+ echo $ac_n "checking for __moddi3 in -lgcc""... $ac_c" 1>&6
diff --git a/lang/kaffe/pkg/PLIST b/lang/kaffe/pkg/PLIST
index d816d356155..07a438f7af7 100644
--- a/lang/kaffe/pkg/PLIST
+++ b/lang/kaffe/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2001/03/19 17:07:16 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.17 2001/04/24 12:40:09 skrll Exp $
kaffe/bin/appletviewer
kaffe/bin/install-jar
kaffe/bin/jar
@@ -36,11 +36,11 @@ kaffe/lib/kaffe/libawt.so
kaffe/lib/kaffe/libio-1.0.6.so
kaffe/lib/kaffe/libio.a
kaffe/lib/kaffe/libio.la
-kaffe/lib/kaffe/libio.so.0.0
+kaffe/lib/kaffe/libio.so
kaffe/lib/kaffe/libmanagement-1.0.6.so
kaffe/lib/kaffe/libmanagement.a
kaffe/lib/kaffe/libmanagement.la
-kaffe/lib/kaffe/libmanagement.so.0.0
+kaffe/lib/kaffe/libmanagement.so
kaffe/lib/kaffe/libmath-1.0.6.so
kaffe/lib/kaffe/libmath.a
kaffe/lib/kaffe/libmath.la
@@ -48,7 +48,7 @@ kaffe/lib/kaffe/libmath.so
kaffe/lib/kaffe/libmicrosoft-1.0.6.so
kaffe/lib/kaffe/libmicrosoft.a
kaffe/lib/kaffe/libmicrosoft.la
-kaffe/lib/kaffe/libmicrosoft.so.0.0
+kaffe/lib/kaffe/libmicrosoft.so
kaffe/lib/kaffe/libnative-1.0.6.so
kaffe/lib/kaffe/libnative.a
kaffe/lib/kaffe/libnative.la
@@ -56,11 +56,11 @@ kaffe/lib/kaffe/libnative.so
kaffe/lib/kaffe/libnet-1.0.6.so
kaffe/lib/kaffe/libnet.a
kaffe/lib/kaffe/libnet.la
-kaffe/lib/kaffe/libnet.so.0.0
+kaffe/lib/kaffe/libnet.so
kaffe/lib/kaffe/libsecurity-1.0.6.so
kaffe/lib/kaffe/libsecurity.a
kaffe/lib/kaffe/libsecurity.la
-kaffe/lib/kaffe/libsecurity.so.0.0
+kaffe/lib/kaffe/libsecurity.so
kaffe/lib/kaffe/libzip-1.0.6.so
kaffe/lib/kaffe/libzip.a
kaffe/lib/kaffe/libzip.la
@@ -69,7 +69,7 @@ kaffe/lib/kaffe/security/java.security
kaffe/lib/libkaffevm-1.0.6.so
kaffe/lib/libkaffevm.a
kaffe/lib/libkaffevm.la
-kaffe/lib/libkaffevm.so.0.0
+kaffe/lib/libkaffevm.so
kaffe/lib/libkaffexprof-1.0.6.so
kaffe/lib/libkaffexprof.a
kaffe/lib/libkaffexprof.la