From 370b954c7981eafdf29f2c8c0f44969121ede8c4 Mon Sep 17 00:00:00 2001 From: wiz Date: Mon, 3 May 2004 15:57:06 +0000 Subject: Remove PREFIX-setting hack, which makes this package bl3 compatible. --- lang/guile14/Makefile | 9 +- lang/guile14/PLIST | 299 +++++++++++++++++++++++---------------------- lang/guile14/buildlink3.mk | 28 +++++ 3 files changed, 185 insertions(+), 151 deletions(-) create mode 100644 lang/guile14/buildlink3.mk (limited to 'lang') diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile index ba997f773c1..279e5c987b2 100644 --- a/lang/guile14/Makefile +++ b/lang/guile14/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/05/02 03:19:50 snj Exp $ +# $NetBSD: Makefile,v 1.18 2004/05/03 15:57:06 wiz Exp $ DISTNAME= guile-1.4.1 PKGNAME= guile14-1.4.1 @@ -12,14 +12,15 @@ COMMENT= GNU's Ubiquitous Intelligent Language for Extension USE_BUILDLINK3= YES GNU_CONFIGURE= YES +GNU_CONFIGURE_PREFIX= ${LOCALBASE}/guile/1.4 USE_GNU_TOOLS+= make -NO_MTREE= YES USE_LIBTOOL= YES USE_GNU_READLINE= YES +INFO_DIR= guile/1.4/info INFO_FILES= guile.info -BUILDLINK_PASSTHRU_DIRS=${PREFIX}/guile/1.4/lib +BUILDLINK_PASSTHRU_DIRS= ${LOCALBASE}/guile/1.4 # Link the native thread so that Guile processes won't die when libpthread.so # is dl_open(3)'ed. @@ -30,5 +31,3 @@ CFLAGS+= ${PTHREAD_CFLAGS} .include "../../devel/readline/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" - -PREFIX= ${LOCALBASE}/guile/1.4 diff --git a/lang/guile14/PLIST b/lang/guile14/PLIST index 7f30442debe..75db00d7994 100644 --- a/lang/guile14/PLIST +++ b/lang/guile14/PLIST @@ -1,146 +1,153 @@ -@comment $NetBSD: PLIST,v 1.3 2004/03/02 11:50:53 seb Exp $ -bin/guile -bin/guile-config -bin/guile-snarf -include/guile-readline/readline.h -include/guile/gh.h -include/libguile.h -include/libguile/__scm.h -include/libguile/alist.h -include/libguile/arbiters.h -include/libguile/async.h -include/libguile/backtrace.h -include/libguile/boolean.h -include/libguile/chars.h -include/libguile/continuations.h -include/libguile/coop-defs.h -include/libguile/debug-malloc.h -include/libguile/debug.h -include/libguile/dynl.h -include/libguile/dynwind.h -include/libguile/eq.h -include/libguile/error.h -include/libguile/eval.h -include/libguile/evalext.h -include/libguile/feature.h -include/libguile/filesys.h -include/libguile/fluids.h -include/libguile/fports.h -include/libguile/gc.h -include/libguile/gdb_interface.h -include/libguile/gdbint.h -include/libguile/gsubr.h -include/libguile/guardians.h -include/libguile/hash.h -include/libguile/hashtab.h -include/libguile/hooks.h -include/libguile/init.h -include/libguile/ioext.h -include/libguile/iselect.h -include/libguile/keywords.h -include/libguile/lang.h -include/libguile/list.h -include/libguile/load.h -include/libguile/macros.h -include/libguile/mallocs.h -include/libguile/modules.h -include/libguile/net_db.h -include/libguile/numbers.h -include/libguile/objects.h -include/libguile/objprop.h -include/libguile/options.h -include/libguile/pairs.h -include/libguile/ports.h -include/libguile/posix.h -include/libguile/print.h -include/libguile/procprop.h -include/libguile/procs.h -include/libguile/ramap.h -include/libguile/random.h -include/libguile/read.h -include/libguile/regex-posix.h -include/libguile/root.h -include/libguile/scmconfig.h -include/libguile/scmsigs.h -include/libguile/script.h -include/libguile/simpos.h -include/libguile/smob.h -include/libguile/snarf.h -include/libguile/socket.h -include/libguile/sort.h -include/libguile/srcprop.h -include/libguile/stackchk.h -include/libguile/stacks.h -include/libguile/stime.h -include/libguile/strings.h -include/libguile/strop.h -include/libguile/strorder.h -include/libguile/strports.h -include/libguile/struct.h -include/libguile/symbols.h -include/libguile/tag.h -include/libguile/tags.h -include/libguile/threads.h -include/libguile/throw.h -include/libguile/unif.h -include/libguile/validate.h -include/libguile/variable.h -include/libguile/vectors.h -include/libguile/version.h -include/libguile/vports.h -include/libguile/weaks.h -lib/libguile.a -lib/libguile.la -lib/libguile.so -lib/libguile.so.10 -lib/libguile.so.10.0 -lib/libguilereadline.a -lib/libguilereadline.la -lib/libguilereadline.so -lib/libguilereadline.so.0 -lib/libguilereadline.so.0.1 -share/aclocal/guile.m4 -share/guile/${PKGVERSION}/ice-9/and-let*.scm -share/guile/${PKGVERSION}/ice-9/and-let-star.scm -share/guile/${PKGVERSION}/ice-9/arrays.scm -share/guile/${PKGVERSION}/ice-9/boot-9.scm -share/guile/${PKGVERSION}/ice-9/calling.scm -share/guile/${PKGVERSION}/ice-9/common-list.scm -share/guile/${PKGVERSION}/ice-9/debug.scm -share/guile/${PKGVERSION}/ice-9/debugger.scm -share/guile/${PKGVERSION}/ice-9/documentation.scm -share/guile/${PKGVERSION}/ice-9/emacs.scm -share/guile/${PKGVERSION}/ice-9/expect.scm -share/guile/${PKGVERSION}/ice-9/format.scm -share/guile/${PKGVERSION}/ice-9/getopt-long.scm -share/guile/${PKGVERSION}/ice-9/hcons.scm -share/guile/${PKGVERSION}/ice-9/lineio.scm -share/guile/${PKGVERSION}/ice-9/ls.scm -share/guile/${PKGVERSION}/ice-9/mapping.scm -share/guile/${PKGVERSION}/ice-9/networking.scm -share/guile/${PKGVERSION}/ice-9/optargs.scm -share/guile/${PKGVERSION}/ice-9/poe.scm -share/guile/${PKGVERSION}/ice-9/popen.scm -share/guile/${PKGVERSION}/ice-9/posix.scm -share/guile/${PKGVERSION}/ice-9/psyntax.pp -share/guile/${PKGVERSION}/ice-9/psyntax.ss -share/guile/${PKGVERSION}/ice-9/q.scm -share/guile/${PKGVERSION}/ice-9/r4rs.scm -share/guile/${PKGVERSION}/ice-9/readline.scm -share/guile/${PKGVERSION}/ice-9/regex.scm -share/guile/${PKGVERSION}/ice-9/runq.scm -share/guile/${PKGVERSION}/ice-9/session.scm -share/guile/${PKGVERSION}/ice-9/slib.scm -share/guile/${PKGVERSION}/ice-9/streams.scm -share/guile/${PKGVERSION}/ice-9/string-fun.scm -share/guile/${PKGVERSION}/ice-9/syncase.scm -share/guile/${PKGVERSION}/ice-9/tags.scm -share/guile/${PKGVERSION}/ice-9/threads.scm -share/guile/guile-procedures.txt -@dirrm share/guile/${PKGVERSION}/ice-9 -@dirrm share/guile/${PKGVERSION} -@dirrm share/guile -@dirrm include/libguile -@dirrm include/guile-readline -@dirrm include/guile -@unexec ${RMDIR} %D/share/aclocal 2>/dev/null || ${TRUE} +@comment $NetBSD: PLIST,v 1.4 2004/05/03 15:57:06 wiz Exp $ +guile/1.4/bin/guile +guile/1.4/bin/guile-config +guile/1.4/bin/guile-snarf +guile/1.4/include/guile-readline/readline.h +guile/1.4/include/guile/gh.h +guile/1.4/include/libguile.h +guile/1.4/include/libguile/__scm.h +guile/1.4/include/libguile/alist.h +guile/1.4/include/libguile/arbiters.h +guile/1.4/include/libguile/async.h +guile/1.4/include/libguile/backtrace.h +guile/1.4/include/libguile/boolean.h +guile/1.4/include/libguile/chars.h +guile/1.4/include/libguile/continuations.h +guile/1.4/include/libguile/coop-defs.h +guile/1.4/include/libguile/debug-malloc.h +guile/1.4/include/libguile/debug.h +guile/1.4/include/libguile/dynl.h +guile/1.4/include/libguile/dynwind.h +guile/1.4/include/libguile/eq.h +guile/1.4/include/libguile/error.h +guile/1.4/include/libguile/eval.h +guile/1.4/include/libguile/evalext.h +guile/1.4/include/libguile/feature.h +guile/1.4/include/libguile/filesys.h +guile/1.4/include/libguile/fluids.h +guile/1.4/include/libguile/fports.h +guile/1.4/include/libguile/gc.h +guile/1.4/include/libguile/gdb_interface.h +guile/1.4/include/libguile/gdbint.h +guile/1.4/include/libguile/gsubr.h +guile/1.4/include/libguile/guardians.h +guile/1.4/include/libguile/hash.h +guile/1.4/include/libguile/hashtab.h +guile/1.4/include/libguile/hooks.h +guile/1.4/include/libguile/init.h +guile/1.4/include/libguile/ioext.h +guile/1.4/include/libguile/iselect.h +guile/1.4/include/libguile/keywords.h +guile/1.4/include/libguile/lang.h +guile/1.4/include/libguile/list.h +guile/1.4/include/libguile/load.h +guile/1.4/include/libguile/macros.h +guile/1.4/include/libguile/mallocs.h +guile/1.4/include/libguile/modules.h +guile/1.4/include/libguile/net_db.h +guile/1.4/include/libguile/numbers.h +guile/1.4/include/libguile/objects.h +guile/1.4/include/libguile/objprop.h +guile/1.4/include/libguile/options.h +guile/1.4/include/libguile/pairs.h +guile/1.4/include/libguile/ports.h +guile/1.4/include/libguile/posix.h +guile/1.4/include/libguile/print.h +guile/1.4/include/libguile/procprop.h +guile/1.4/include/libguile/procs.h +guile/1.4/include/libguile/ramap.h +guile/1.4/include/libguile/random.h +guile/1.4/include/libguile/read.h +guile/1.4/include/libguile/regex-posix.h +guile/1.4/include/libguile/root.h +guile/1.4/include/libguile/scmconfig.h +guile/1.4/include/libguile/scmsigs.h +guile/1.4/include/libguile/script.h +guile/1.4/include/libguile/simpos.h +guile/1.4/include/libguile/smob.h +guile/1.4/include/libguile/snarf.h +guile/1.4/include/libguile/socket.h +guile/1.4/include/libguile/sort.h +guile/1.4/include/libguile/srcprop.h +guile/1.4/include/libguile/stackchk.h +guile/1.4/include/libguile/stacks.h +guile/1.4/include/libguile/stime.h +guile/1.4/include/libguile/strings.h +guile/1.4/include/libguile/strop.h +guile/1.4/include/libguile/strorder.h +guile/1.4/include/libguile/strports.h +guile/1.4/include/libguile/struct.h +guile/1.4/include/libguile/symbols.h +guile/1.4/include/libguile/tag.h +guile/1.4/include/libguile/tags.h +guile/1.4/include/libguile/threads.h +guile/1.4/include/libguile/throw.h +guile/1.4/include/libguile/unif.h +guile/1.4/include/libguile/validate.h +guile/1.4/include/libguile/variable.h +guile/1.4/include/libguile/vectors.h +guile/1.4/include/libguile/version.h +guile/1.4/include/libguile/vports.h +guile/1.4/include/libguile/weaks.h +guile/1.4/lib/libguile.a +guile/1.4/lib/libguile.la +guile/1.4/lib/libguile.so +guile/1.4/lib/libguile.so.10 +guile/1.4/lib/libguile.so.10.0 +guile/1.4/lib/libguilereadline.a +guile/1.4/lib/libguilereadline.la +guile/1.4/lib/libguilereadline.so +guile/1.4/lib/libguilereadline.so.0 +guile/1.4/lib/libguilereadline.so.0.1 +guile/1.4/share/aclocal/guile.m4 +guile/1.4/share/guile/${PKGVERSION}/ice-9/and-let*.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/and-let-star.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/arrays.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/boot-9.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/calling.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/common-list.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/debug.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/debugger.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/documentation.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/emacs.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/expect.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/format.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/getopt-long.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/hcons.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/lineio.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/ls.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/mapping.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/networking.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/optargs.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/poe.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/popen.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/posix.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/psyntax.pp +guile/1.4/share/guile/${PKGVERSION}/ice-9/psyntax.ss +guile/1.4/share/guile/${PKGVERSION}/ice-9/q.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/r4rs.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/readline.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/regex.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/runq.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/session.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/slib.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/streams.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/string-fun.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/syncase.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/tags.scm +guile/1.4/share/guile/${PKGVERSION}/ice-9/threads.scm +guile/1.4/share/guile/guile-procedures.txt +@dirrm guile/1.4/share/guile/${PKGVERSION}/ice-9 +@dirrm guile/1.4/share/guile/${PKGVERSION} +@dirrm guile/1.4/share/guile +@dirrm guile/1.4/share/aclocal +@dirrm guile/1.4/share +@dirrm guile/1.4/lib +@dirrm guile/1.4/info +@dirrm guile/1.4/include/libguile +@dirrm guile/1.4/include/guile-readline +@dirrm guile/1.4/include/guile +@dirrm guile/1.4/include +@dirrm guile/1.4/bin +@dirrm guile/1.4 +@dirrm guile diff --git a/lang/guile14/buildlink3.mk b/lang/guile14/buildlink3.mk new file mode 100644 index 00000000000..9397267e955 --- /dev/null +++ b/lang/guile14/buildlink3.mk @@ -0,0 +1,28 @@ +# $NetBSD: buildlink3.mk,v 1.1 2004/05/03 15:57:06 wiz Exp $ + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ +GUILE14_BUILDLINK3_MK:= ${GUILE14_BUILDLINK3_MK}+ + +.if !empty(BUILDLINK_DEPTH:M+) +BUILDLINK_DEPENDS+= guile14 +.endif + +BUILDLINK_PACKAGES:= ${BUILDLINK_PACKAGES:Nguile14} +BUILDLINK_PACKAGES+= guile14 + +.if !empty(GUILE14_BUILDLINK3_MK:M+) +BUILDLINK_DEPENDS.guile14+= guile14>=1.4.1nb4 +BUILDLINK_PKGSRCDIR.guile14?= ../../lang/guile14 + +BUILDLINK_PASSTHRU_DIRS= ${LOCALBASE}/guile/1.4 +BUILDLINK_FILES.guile14+= guile/1.4/bin/* +BUILDLINK_TRANSFORM.guile14+= -e s,/guile/1.4/bin/,/bin/, + +GUILE14_SUBDIR= guile/1.4 +.endif # GUILE14_BUILDLINK3_MK + +.include "../../devel/libtool/buildlink3.mk" +.include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" + +BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH:S/+$//} -- cgit v1.2.3