diff options
author | wiz <wiz> | 2000-08-14 22:16:48 +0000 |
---|---|---|
committer | wiz <wiz> | 2000-08-14 22:16:48 +0000 |
commit | ec5fdb12b6987028fe179833dc2289205f7dd476 (patch) | |
tree | 445e2aad58280bfddeee07f948e45c763f990c6d /lang | |
parent | 97b144cd3c4ae801f9bf131bc29f50499f50ea6f (diff) | |
download | pkgsrc-ec5fdb12b6987028fe179833dc2289205f7dd476.tar.gz |
USE_PKGLIBTOOL -> USE_LIBTOOL. Untested for lack of Solaris.
XXX: This package needs NetBSD porting!
Diffstat (limited to 'lang')
-rw-r--r-- | lang/japhar/Makefile | 22 | ||||
-rw-r--r-- | lang/japhar/files/patch-sum | 4 | ||||
-rw-r--r-- | lang/japhar/patches/patch-aa | 45 | ||||
-rw-r--r-- | lang/japhar/patches/patch-ab | 22 |
4 files changed, 12 insertions, 81 deletions
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile index ce2bde077c8..d69638a7ecd 100644 --- a/lang/japhar/Makefile +++ b/lang/japhar/Makefile @@ -1,19 +1,19 @@ -# $NetBSD: Makefile,v 1.2 2000/06/01 11:23:33 rh Exp $ +# $NetBSD: Makefile,v 1.3 2000/08/14 22:16:48 wiz Exp $ # -DISTNAME= japhar-0.08 -CATEGORIES= lang -MASTER_SITES= ftp://ftp.japhar.org/pub/hungry/japhar/source/ +DISTNAME= japhar-0.08 +CATEGORIES= lang +MASTER_SITES= ftp://ftp.japhar.org/pub/hungry/japhar/source/ -MAINTAINER= packages@netbsd.org -HOMEPAGE= http://www.japhar.org/ +MAINTAINER= packages@netbsd.org +HOMEPAGE= http://www.japhar.org/ -ONLY_FOR_PLATFORM= SunOS-*-* # untested on NetBSD +#ONLY_FOR_PLATFORM= SunOS-*-* # untested on NetBSD -GNU_CONFIGURE= yes -USE_PKGLIBTOOL= yes -LIBTOOL_FLAGS= --install-la -USE_GMAKE= yes +GNU_CONFIGURE= yes +USE_LIBTOOL= yes +USE_GMAKE= yes +LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig .include "../../mk/bsd.prefs.mk" diff --git a/lang/japhar/files/patch-sum b/lang/japhar/files/patch-sum index e52cdafb844..31ebd37af1a 100644 --- a/lang/japhar/files/patch-sum +++ b/lang/japhar/files/patch-sum @@ -1,7 +1,5 @@ -$NetBSD: patch-sum,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ +$NetBSD: patch-sum,v 1.2 2000/08/14 22:16:49 wiz Exp $ -MD5 (patch-aa) = 862edbfa1de1b24795f1d63dffb572ae -MD5 (patch-ab) = ef6025258adca0b459a50581e7bbc3ef MD5 (patch-ac) = 1353e8c332a30817cb93c43da089a32f MD5 (patch-ad) = eacea1ce02ce32856ee9e46b4bc823d5 MD5 (patch-ae) = 458dfa6d37e753c0d6a43f635b859102 diff --git a/lang/japhar/patches/patch-aa b/lang/japhar/patches/patch-aa deleted file mode 100644 index fe35c05fa51..00000000000 --- a/lang/japhar/patches/patch-aa +++ /dev/null @@ -1,45 +0,0 @@ -$NetBSD: patch-aa,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ - -Use NetBSD pkglibtool - ---- configure 1999/10/19 10:58:12 1.1 -+++ configure 1999/10/19 10:59:12 -@@ -1557,6 +1557,7 @@ - ac_tool_prefix= - fi - -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -1789,6 +1790,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. -@@ -5973,8 +5975,8 @@ - cat >conftestl.c <<\EOF && - void japhar_test() {} - EOF -- ../libtool --mode=compile ${CC-cc} -c $CFLAGS $CPPFLAGS conftestl.c 1>&5 && -- ../libtool --mode=link ${CC-cc} -shared -export-dynamic -no-undefined -rpath `pwd`/inst -version-info 1:0:0 $CFLAGS $CPPFLAGS $LDFLAGS conftestl.lo -o libconftest.la 1>&5 && -+ ${LIBTOOL} --mode=compile ${CC-cc} -c $CFLAGS $CPPFLAGS conftestl.c 1>&5 && -+ ${LIBTOOL} --mode=link ${CC-cc} -shared -export-dynamic -no-undefined -rpath `pwd`/inst -version-info 1:0:0 $CFLAGS $CPPFLAGS $LDFLAGS conftestl.lo -o libconftest.la 1>&5 && - cat >conftest.c <<\EOF && - #include <stdio.h> - /* We are here in a subdirectory, and need to use .. to find the file */ -@@ -6004,9 +6006,9 @@ - } - EOF - ${CC-cc} -c $CFLAGS $CPPFLAGS conftest.c 1>&5 && -- ../libtool --mode=link ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5 && -+ ${LIBTOOL} --mode=link ${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.o $LIBS 1>&5 && - mkdir inst && -- ../libtool --mode=install cp libconftest.la `pwd`/inst/libconftest.la 1>&5 -+ ${LIBTOOL} --mode=install cp libconftest.la `pwd`/inst/libconftest.la 1>&5 - ) && - libname=`. conftest.dir/inst/libconftest.la && echo $dlname` && - test x"$libname"x != x""x && diff --git a/lang/japhar/patches/patch-ab b/lang/japhar/patches/patch-ab deleted file mode 100644 index cac2fefc0ad..00000000000 --- a/lang/japhar/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.1.1.1 1999/10/28 09:51:43 agc Exp $ - -Use NetBSD's pkglibtool - ---- lib/libffi/configure 1999/10/19 11:00:32 1.1 -+++ lib/libffi/configure 1999/10/19 11:00:58 -@@ -1520,6 +1520,7 @@ - ac_tool_prefix= - fi - -+if false; then - # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' - -@@ -1752,6 +1753,7 @@ - ${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ - $libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \ - || { echo "configure: error: libtool configure failed" 1>&2; exit 1; } -+fi - - # Redirect the config.log output again, so that the ltconfig log is not - # clobbered by the next message. |