From 5ca5c0cc93f699bb49acdf9d2776642e3c107134 Mon Sep 17 00:00:00 2001 From: wxs Date: Sat, 11 Apr 2009 03:00:02 +0000 Subject: - Update to 1.5R1 PR: ports/131631 Submitted by: Andrew Bernard (maintainer) --- lang/twelf/Makefile | 22 +++- lang/twelf/distinfo | 6 +- lang/twelf/files/patch-FreeBSD.mk | 170 ++++++++++++++++++++++++++++ lang/twelf/files/patch-Makefile | 97 ++++------------ lang/twelf/files/patch-bin-mkexec | 13 +++ lang/twelf/files/patch-doc-guide-Makefile | 11 ++ lang/twelf/files/patch-doc-guide-twelf.texi | 14 +++ lang/twelf/files/patch-mlton-Makefile | 30 +++++ lang/twelf/files/patch-smlnj-Makefile | 26 +++++ lang/twelf/files/patch-twelf.info | 13 --- lang/twelf/pkg-descr | 2 +- lang/twelf/pkg-plist | 163 ++++++++++++++++++-------- 12 files changed, 421 insertions(+), 146 deletions(-) create mode 100644 lang/twelf/files/patch-FreeBSD.mk create mode 100644 lang/twelf/files/patch-bin-mkexec create mode 100644 lang/twelf/files/patch-doc-guide-Makefile create mode 100644 lang/twelf/files/patch-doc-guide-twelf.texi create mode 100644 lang/twelf/files/patch-mlton-Makefile create mode 100644 lang/twelf/files/patch-smlnj-Makefile delete mode 100644 lang/twelf/files/patch-twelf.info (limited to 'lang/twelf') diff --git a/lang/twelf/Makefile b/lang/twelf/Makefile index 97ec56aed0bc..d1999c52b042 100644 --- a/lang/twelf/Makefile +++ b/lang/twelf/Makefile @@ -6,21 +6,37 @@ # PORTNAME= twelf -PORTVERSION= 1.4 +PORTVERSION= 1.5R1 CATEGORIES= lang MASTER_SITES= http://www-2.cs.cmu.edu/~twelf/dist/ http://www.cs.cmu.edu/~twelf/dist/ -DISTNAME= twelf-1-4 +DISTNAME= twelf-1-5R1 MAINTAINER= andrewb@cs.cmu.edu COMMENT= A meta-logical framework for deductive systems +.if defined(WITH_MLTON) +RUN_DEPENDS= mlton:${PORTSDIR}/lang/mlton +BUILD_DEPENDS= mlton:${PORTSDIR}/lang/mlton +.elif defined(WITH_SML_NJ_DEVEL) +RUN_DEPENDS= sml:${PORTSDIR}/lang/sml-nj-devel +BUILD_DEPENDS= sml:${PORTSDIR}/lang/sml-nj-devel +.else RUN_DEPENDS= sml:${PORTSDIR}/lang/sml-nj BUILD_DEPENDS= sml:${PORTSDIR}/lang/sml-nj +.endif + +BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX + +.if defined(WITH_MLTON) +MAKEFILE= mlton/Makefile +.elif defined(WITH_SML_NJ_DEVEL) +MAKEFILE= smlnj/Makefile +.endif WRKSRC= ${WRKDIR}/twelf INFO= twelf -RESTRICTED= "License is currently indeterminate (expected to be GPL)" +RESTRICTED= License is currently indeterminate (expected to be GPL) post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile diff --git a/lang/twelf/distinfo b/lang/twelf/distinfo index cdd43f68d813..d0d0200a4045 100644 --- a/lang/twelf/distinfo +++ b/lang/twelf/distinfo @@ -1,3 +1,3 @@ -MD5 (twelf-1-4.tar.gz) = ba4d2a374242dae6e3c0dada30adeae2 -SHA256 (twelf-1-4.tar.gz) = 63d0a283f75201467b10d541d643eba82f0e52b0ee4ea88a391c574a314ad62a -SIZE (twelf-1-4.tar.gz) = 1463158 +MD5 (twelf-1-5R1.tar.gz) = 05b5c65f297c1f4ee07641682121ebbc +SHA256 (twelf-1-5R1.tar.gz) = d20473493cd39e111ce3585f8c32eefc79de4099ae4e97bfe2eb7695d6987564 +SIZE (twelf-1-5R1.tar.gz) = 1157430 diff --git a/lang/twelf/files/patch-FreeBSD.mk b/lang/twelf/files/patch-FreeBSD.mk new file mode 100644 index 000000000000..1522b132bed8 --- /dev/null +++ b/lang/twelf/files/patch-FreeBSD.mk @@ -0,0 +1,170 @@ +--- FreeBSD.mk.orig 2009-02-12 21:33:04.000000000 -0500 ++++ FreeBSD.mk 2009-02-12 21:48:54.000000000 -0500 +@@ -0,0 +1,82 @@ ++# --------------------------------------------------------------- ++# Executables ++# --------------------------------------------------------------- ++ ++arch != uname -p ++ ++.if ${arch} == "i386" ++smlarch = x86 ++.else ++smlarch = ${arch} ++.endif ++ ++prefix = ${PREFIX} ++bindir = ${prefix}/bin ++infodir = ${prefix}/info ++twelfexecdir = ${prefix}/libexec/twelf ++twelfsharedir = ${prefix}/share/twelf ++ ++runfile = bin/twelf-server ++heapfile = bin/.heap/twelf-server.${smlarch}-bsd ++ ++# --------------------------------------------------------------- ++# Documentation ++# --------------------------------------------------------------- ++ ++htmlnodes = toc abt 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 ++ ++dvifile = doc/dvi/twelf.dvi ++htmlfiles := doc/html/index.html ${htmlnodes:%=doc/html/twelf_%.html} ++infofile = doc/info/twelf.info ++pdffile = doc/pdf/twelf.pdf ++psfile = doc/ps/twelf.ps ++ ++docfiles = ${dvifile} ${htmlfiles} ${infofile} ${pdffile} ${psfile} ++ ++.for file in ${docfiles} ++${file}: ++ (cd doc/guide; make; make install) ++.endfor ++ ++all: ${runfile} ${heapfile} ${docfiles} ++ ++# --------------------------------------------------------------- ++# Installation ++# --------------------------------------------------------------- ++ ++sharefiles != (echo README HISTORY; \ ++ echo ${docfiles}; \ ++ find emacs -type f -not -path '*/CVS/*'; \ ++ find examples -type f -not -path '*/CVS/*'; \ ++ find examples-clp -type f -not -path '*/CVS/*'; \ ++ find exercises -type f -not -path '*/CVS/*'; \ ++ find tex -type f -not -path '*/CVS/*'; \ ++ find vim -type f -not -path '*/CVS/*' ) ++ ++installfiles := ${bindir}/twelf-server \ ++ ${twelfsharedir}/${runfile} \ ++ ${twelfexecdir}/${heapfile} \ ++ ${infodir}/twelf.info \ ++ ${sharefiles:%=$(twelfsharedir)/%} ++ ++${bindir}/twelf-server: ${twelfsharedir}/${runfile} ++ ln -s $? $@ ++ ++${twelfsharedir}/${runfile}: ${runfile} ++ @install -d -o root -g wheel -m 0755 ${@D} ++ install -o root -g wheel -m 0555 $? $@ ++ ++${twelfexecdir}/${heapfile}: ${heapfile} ++ @install -d -o root -g wheel -m 0755 ${@D} ++ install -o root -g wheel -m 0444 $? $@ ++ ++${infodir}/twelf.info: doc/info/twelf.info ++ install -o root -g wheel -m 0444 $? $@ ++ ++.for file in ${sharefiles} ++${twelfsharedir}/${file}: ${file} ++ @install -d -o root -g wheel -m 0755 ${@D} ++ install -o root -g wheel -m 0644 $? $@ ++.endfor ++ ++install: ${installfiles} +--- FreeBSD.mk.orig 2009-02-12 21:33:04.000000000 -0500 ++++ FreeBSD.mk 2009-02-12 21:48:54.000000000 -0500 +@@ -0,0 +1,82 @@ ++# --------------------------------------------------------------- ++# Executables ++# --------------------------------------------------------------- ++ ++arch != uname -p ++ ++.if ${arch} == "i386" ++smlarch = x86 ++.else ++smlarch = ${arch} ++.endif ++ ++prefix = ${PREFIX} ++bindir = ${prefix}/bin ++infodir = ${prefix}/info ++twelfexecdir = ${prefix}/libexec/twelf ++twelfsharedir = ${prefix}/share/twelf ++ ++runfile = bin/twelf-server ++heapfile = bin/.heap/twelf-server.${smlarch}-bsd ++ ++# --------------------------------------------------------------- ++# Documentation ++# --------------------------------------------------------------- ++ ++htmlnodes = toc abt 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 ++ ++dvifile = doc/dvi/twelf.dvi ++htmlfiles := doc/html/index.html ${htmlnodes:%=doc/html/twelf_%.html} ++infofile = doc/info/twelf.info ++pdffile = doc/pdf/twelf.pdf ++psfile = doc/ps/twelf.ps ++ ++docfiles = ${dvifile} ${htmlfiles} ${infofile} ${pdffile} ${psfile} ++ ++.for file in ${docfiles} ++${file}: ++ (cd doc/guide; make; make install) ++.endfor ++ ++all: ${runfile} ${heapfile} ${docfiles} ++ ++# --------------------------------------------------------------- ++# Installation ++# --------------------------------------------------------------- ++ ++sharefiles != (echo README HISTORY; \ ++ echo ${docfiles}; \ ++ find emacs -type f -not -path '*/CVS/*'; \ ++ find examples -type f -not -path '*/CVS/*'; \ ++ find examples-clp -type f -not -path '*/CVS/*'; \ ++ find exercises -type f -not -path '*/CVS/*'; \ ++ find tex -type f -not -path '*/CVS/*'; \ ++ find vim -type f -not -path '*/CVS/*' ) ++ ++installfiles := ${bindir}/twelf-server \ ++ ${twelfsharedir}/${runfile} \ ++ ${twelfexecdir}/${heapfile} \ ++ ${infodir}/twelf.info \ ++ ${sharefiles:%=$(twelfsharedir)/%} ++ ++${bindir}/twelf-server: ${twelfsharedir}/${runfile} ++ ln -s $? $@ ++ ++${twelfsharedir}/${runfile}: ${runfile} ++ @install -d -o root -g wheel -m 0755 ${@D} ++ install -o root -g wheel -m 0555 $? $@ ++ ++${twelfexecdir}/${heapfile}: ${heapfile} ++ @install -d -o root -g wheel -m 0755 ${@D} ++ install -o root -g wheel -m 0444 $? $@ ++ ++${infodir}/twelf.info: doc/info/twelf.info ++ install -o root -g wheel -m 0444 $? $@ ++ ++.for file in ${sharefiles} ++${twelfsharedir}/${file}: ${file} ++ @install -d -o root -g wheel -m 0755 ${@D} ++ install -o root -g wheel -m 0644 $? $@ ++.endfor ++ ++install: ${installfiles} diff --git a/lang/twelf/files/patch-Makefile b/lang/twelf/files/patch-Makefile index 09d18c15fcff..992543b181ec 100644 --- a/lang/twelf/files/patch-Makefile +++ b/lang/twelf/files/patch-Makefile @@ -1,85 +1,26 @@ ---- Makefile.orig Sun Dec 22 11:29:46 2002 -+++ Makefile Sat Jul 9 18:52:09 2005 -@@ -31,7 +31,7 @@ +--- Makefile.orig 2005-03-08 15:49:53.000000000 -0500 ++++ Makefile 2009-02-12 22:07:33.000000000 -0500 +@@ -32,16 +32,20 @@ + version = "1.5" + delphinversion = "0.1" ++.include "FreeBSD.mk" ++ default : twelf-server twelf-emacs -all : twelf-server twelf-sml twelf-emacs -+# all : twelf-server twelf-sml twelf-emacs ++#all : twelf-server twelf-sml twelf-emacs - twelf-server: ; +-twelf-server: ; ++${runfile}: ; @echo "*************************************************" -@@ -62,3 +62,73 @@ - - clean: ; - rm -rf $(twelfdir)/src/*/CM ; -+ -+# --------------------------------------------------------------- -+# Installation -+# --------------------------------------------------------------- -+ -+arch != uname -p -+ -+.if ${arch} == "i386" -+smlarch = x86 -+.else -+smlarch = ${arch} -+.endif -+ -+prefix = %%PREFIX%% -+bindir = ${prefix}/bin -+infodir = ${prefix}/info -+twelfexecdir = ${prefix}/libexec/twelf -+twelfsharedir = ${prefix}/share/twelf -+ -+runfile = bin/twelf-server -+heapfile = bin/.heap/twelf-server.${smlarch}-bsd -+ -+infofiles != (cd doc/info; find . -type f -not -name '*.orig') -+sharefiles != (find README -type f; \ -+ find doc -type f -not -name '*.orig'; \ -+ find emacs -type f; \ -+ find examples -type f; \ -+ find examples-clp -type f; \ -+ find tex -type f) -+ -+installfiles := ${bindir}/twelf-server \ -+ ${twelfsharedir}/${runfile} \ -+ ${twelfexecdir}/${heapfile} \ -+ ${infofiles:%=$(infodir)/%} \ -+ ${sharefiles:%=$(twelfsharedir)/%} -+ -+all: ${runfile} ${heapfile} -+ -+${runfile}: -+ echo "#!/bin/sh" >$@ -+ echo "exec ${sml} @SMLload=${twelfexecdir}/${heapfile} @SMLdebug=/dev/null" >>$@ -+ -+${heapfile}: -+ $(sml) < twelf-server.sml -+ -+${bindir}/twelf-server: ${twelfsharedir}/${runfile} -+ ln -s $? $@ -+ -+${twelfsharedir}/${runfile}: ${runfile} -+ @install -d -o root -g wheel -m 0755 ${@D} -+ install -o root -g wheel -m 0555 $? $@ -+ -+${twelfexecdir}/${heapfile}: ${heapfile} -+ @install -d -o root -g wheel -m 0755 ${@D} -+ install -o root -g wheel -m 0444 $? $@ -+ -+.for file in ${infofiles} -+${infodir}/${file}: doc/info/${file} -+ ln -s ${twelfsharedir}/$? $@ -+.endfor -+ -+.for file in ${sharefiles} -+${twelfsharedir}/${file}: ${file} -+ @install -d -o root -g wheel -m 0755 ${@D} -+ install -o root -g wheel -m 0644 $? $@ -+.endfor -+ -+install: ${installfiles} -+ install-info ${infodir}/twelf.info ${infodir}/dir + @echo "Twelf $(version): Server" + @echo "*************************************************" + $(sml) < twelf-server.sml ; +- bin/.mkexec "$(sml)" "$(twelfdir)" twelf-server "$(twelfserver)" ; ++ bin/.mkexec "$(sml)" "$(twelfdir)" twelf-server "$(twelfserver)" "$(twelfexecdir)" ; + ++${heapfile}: ${runfile} + + twelf-sml: ; + @echo "*************************************************" diff --git a/lang/twelf/files/patch-bin-mkexec b/lang/twelf/files/patch-bin-mkexec new file mode 100644 index 000000000000..216c90f8d557 --- /dev/null +++ b/lang/twelf/files/patch-bin-mkexec @@ -0,0 +1,13 @@ +--- bin/.mkexec.orig 2003-01-21 01:03:32.000000000 -0500 ++++ bin/.mkexec 2009-02-12 21:24:27.000000000 -0500 +@@ -7,8 +7,9 @@ + # $2 = Twelf root directory + # $3 = Type of executable (e.g. twelf-server, twelf-sml) + # $4 = Name of executable (e.g. twelf-server, twelf-sml) ++# $5 = Twelf installation directory (e.g. /usr/local/libexec/twelf) + cat > "$2/bin/$4" <