ports/132357: [patch] lang/twelf update to new version
Klaus T Aehlig
aehlig at linta.de
Fri Mar 6 11:10:02 UTC 2009
>Number: 132357
>Category: ports
>Synopsis: [patch] lang/twelf update to new version
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Fri Mar 06 11:10:01 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Klaus T Aehlig
>Release: FreeBSD 7.1-RELEASE-p1 i386
>Organization:
>Environment:
System: FreeBSD schoenfinkel.linta.de 7.1-RELEASE-p1 FreeBSD 7.1-RELEASE-p1 #7: Fri Jan 9 18:25:05 GMT 2009 aehlig at schoenfinkel.linta.de:/usr/obj/usr/src/sys/SCHOENFINKEL i386
>Description:
The port is bades on Twelf Version 1.4, the latest Version is 1.5R1
>How-To-Repeat:
Compare the port with the upstream web page
>Fix:
Apply the following patch.
Note that patch-twelf.info had to be renamed to the-patch-twelf.info
and that patch-guide-Makefile is a new file
--- patch-twelf-upgrade begins here ---
diff -uNr twelf/Makefile twelf15/Makefile
--- twelf/Makefile 2009-03-06 10:53:08.000000000 +0100
+++ twelf15/Makefile 2009-03-06 10:54:25.000000000 +0100
@@ -2,27 +2,30 @@
# Date created: 7/8/5
# Whom: andrewb at cs.cmu.edu
#
-# $FreeBSD: ports/lang/twelf/Makefile,v 1.2 2006-05-09 20:52:24 edwin Exp $
+# $FreeBSD: ports/lang/twelf/Makefile,v 1.2 2006/05/09 20:52:24 edwin Exp $
#
PORTNAME= twelf
-PORTVERSION= 1.4
+PORTVERSION= 1.5
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 at cs.cmu.edu
COMMENT= A meta-logical framework for deductive systems
RUN_DEPENDS= sml:${PORTSDIR}/lang/sml-nj
-BUILD_DEPENDS= sml:${PORTSDIR}/lang/sml-nj
+BUILD_DEPENDS= sml:${PORTSDIR}/lang/sml-nj tex:${PORTSDIR}/print/teTeX-base dvips:${PORTSDIR}/print/dvipsk-tetex
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
+ ${CP} ${FILESDIR}/the-patch-twelf.info ${WRKSRC}
+ -${FIND} ${WRKSRC} -name CVS -exec ${RM} -rf \{} \;
+ -${FIND} ${WRKSRC} -name .cvsignore -exec ${RM} -f \{} \;
.include <bsd.port.mk>
diff -uNr twelf/distinfo twelf15/distinfo
--- twelf/distinfo 2009-03-06 10:53:08.000000000 +0100
+++ twelf15/distinfo 2009-03-06 10:54:25.000000000 +0100
@@ -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 -uNr twelf/files/patch-Makefile twelf15/files/patch-Makefile
--- twelf/files/patch-Makefile 2009-03-06 10:53:08.000000000 +0100
+++ twelf15/files/patch-Makefile 2009-03-06 10:54:25.000000000 +0100
@@ -1,6 +1,6 @@
---- 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 20:49:53.000000000 +0000
++++ Makefile 2008-07-18 00:38:25.000000000 +0100
+@@ -34,7 +34,7 @@
default : twelf-server twelf-emacs
@@ -9,10 +9,11 @@
twelf-server: ;
@echo "*************************************************"
-@@ -62,3 +62,73 @@
+@@ -72,4 +72,77 @@
clean: ;
rm -rf $(twelfdir)/src/*/CM ;
+- rm -rf $(twelfdir)/src/*/.cm ;
+
+# ---------------------------------------------------------------
+# Installation
@@ -26,7 +27,7 @@
+smlarch = ${arch}
+.endif
+
-+prefix = %%PREFIX%%
++prefix = /usr/local
+bindir = ${prefix}/bin
+infodir = ${prefix}/info
+twelfexecdir = ${prefix}/libexec/twelf
@@ -35,10 +36,11 @@
+runfile = bin/twelf-server
+heapfile = bin/.heap/twelf-server.${smlarch}-bsd
+
-+infofiles != (cd doc/info; find . -type f -not -name '*.orig')
++infofiles = twelf.info
+sharefiles != (find README -type f; \
-+ find doc -type f -not -name '*.orig'; \
+ find emacs -type f; \
++ find doc -type f -not -path 'doc/guide/*' \
++ -not -path 'doc/info/*'; \
+ find examples -type f; \
+ find examples-clp -type f; \
+ find tex -type f)
@@ -49,7 +51,7 @@
+ ${infofiles:%=$(infodir)/%} \
+ ${sharefiles:%=$(twelfsharedir)/%}
+
-+all: ${runfile} ${heapfile}
++all: ${runfile} ${heapfile} twelf-doc
+
+${runfile}:
+ echo "#!/bin/sh" >$@
@@ -61,6 +63,10 @@
+${bindir}/twelf-server: ${twelfsharedir}/${runfile}
+ ln -s $? $@
+
++twelf-doc:
++ (cd doc/guide; $(MAKE); $(MAKE) install)
++ patch < the-patch-twelf.info
++
+${twelfsharedir}/${runfile}: ${runfile}
+ @install -d -o root -g wheel -m 0755 ${@D}
+ install -o root -g wheel -m 0555 $? $@
@@ -71,7 +77,8 @@
+
+.for file in ${infofiles}
+${infodir}/${file}: doc/info/${file}
-+ ln -s ${twelfsharedir}/$? $@
++ @install -d -o root -g wheel -m 0755 ${@D}
++ install -o root -g wheel -m 0644 $? $@
+.endfor
+
+.for file in ${sharefiles}
@@ -81,5 +88,3 @@
+.endfor
+
+install: ${installfiles}
-+ install-info ${infodir}/twelf.info ${infodir}/dir
-+
diff -uNr twelf/files/patch-guide-Makefile twelf15/files/patch-guide-Makefile
--- twelf/files/patch-guide-Makefile 1970-01-01 01:00:00.000000000 +0100
+++ twelf15/files/patch-guide-Makefile 2009-03-06 10:54:25.000000000 +0100
@@ -0,0 +1,11 @@
+--- doc/guide/Makefile.orig 2008-07-17 23:05:56.000000000 +0100
++++ doc/guide/Makefile 2008-07-17 23:05:28.000000000 +0100
+@@ -39,7 +39,7 @@
+ twelf_toc.html : twelf.texi;
+ @echo "---------- Creating HTML: twelf_*.html"
+ $(texi2html) -menu -number -split_chapter twelf.texi;
+- $(texi2html) -check *.html;
++# $(texi2html) -check *.html;
+
+ twelf.pdf : twelf.texi;
+ @echo "---------- Creating unindexed PDF: twelf.pdf"
diff -uNr twelf/files/patch-twelf.info twelf15/files/patch-twelf.info
--- twelf/files/patch-twelf.info 2009-03-06 10:53:08.000000000 +0100
+++ twelf15/files/patch-twelf.info 1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
---- doc/info/twelf.info.orig Sat Jul 9 16:05:36 2005
-+++ doc/info/twelf.info Sat Jul 9 15:52:24 2005
-@@ -1,5 +1,10 @@
- This is twelf.info, produced by makeinfo version 4.2 from twelf.texi.
-
-+INFO-DIR-SECTION Programming
-+START-INFO-DIR-ENTRY
-+* Twelf User Guide: (twelf). The Twelf User's Guide.
-+END-INFO-DIR-ENTRY
-+
-
- Indirect:
- twelf.info-1: 71
diff -uNr twelf/files/the-patch-twelf.info twelf15/files/the-patch-twelf.info
--- twelf/files/the-patch-twelf.info 1970-01-01 01:00:00.000000000 +0100
+++ twelf15/files/the-patch-twelf.info 2009-03-06 10:54:25.000000000 +0100
@@ -0,0 +1,13 @@
+--- doc/info/twelf.info.orig Sat Jul 9 16:05:36 2005
++++ doc/info/twelf.info Sat Jul 9 15:52:24 2005
+@@ -1,5 +1,10 @@
+ This is twelf.info, produced by makeinfo version 4.2 from twelf.texi.
+
++INFO-DIR-SECTION Programming
++START-INFO-DIR-ENTRY
++* Twelf User Guide: (twelf). The Twelf User's Guide.
++END-INFO-DIR-ENTRY
++
+
+ Indirect:
+ twelf.info-1: 71
diff -uNr twelf/pkg-plist twelf15/pkg-plist
--- twelf/pkg-plist 2009-03-06 10:53:08.000000000 +0100
+++ twelf15/pkg-plist 2009-03-06 10:54:25.000000000 +0100
@@ -3,16 +3,9 @@
share/twelf/README
share/twelf/bin/twelf-server
share/twelf/doc/dvi/twelf.dvi
+share/twelf/doc/UPDATE
share/twelf/doc/html/index.html
share/twelf/doc/html/twelf_1.html
-share/twelf/doc/html/twelf_10.html
-share/twelf/doc/html/twelf_11.html
-share/twelf/doc/html/twelf_12.html
-share/twelf/doc/html/twelf_13.html
-share/twelf/doc/html/twelf_14.html
-share/twelf/doc/html/twelf_15.html
-share/twelf/doc/html/twelf_16.html
-share/twelf/doc/html/twelf_17.html
share/twelf/doc/html/twelf_2.html
share/twelf/doc/html/twelf_3.html
share/twelf/doc/html/twelf_4.html
@@ -21,13 +14,19 @@
share/twelf/doc/html/twelf_7.html
share/twelf/doc/html/twelf_8.html
share/twelf/doc/html/twelf_9.html
+share/twelf/doc/html/twelf_10.html
+share/twelf/doc/html/twelf_11.html
+share/twelf/doc/html/twelf_12.html
+share/twelf/doc/html/twelf_13.html
+share/twelf/doc/html/twelf_14.html
+share/twelf/doc/html/twelf_15.html
+share/twelf/doc/html/twelf_16.html
+share/twelf/doc/html/twelf_17.html
+share/twelf/doc/html/twelf_18.html
+share/twelf/doc/html/twelf_19.html
+share/twelf/doc/html/twelf_20.html
+share/twelf/doc/html/twelf_abt.html
share/twelf/doc/html/twelf_toc.html
-share/twelf/doc/info/twelf.info
-share/twelf/doc/info/twelf.info-1
-share/twelf/doc/info/twelf.info-2
-share/twelf/doc/info/twelf.info-3
-share/twelf/doc/info/twelf.info-4
-share/twelf/doc/info/twelf.info-5
share/twelf/doc/pdf/twelf.pdf
share/twelf/doc/ps/twelf.ps
share/twelf/emacs/README
@@ -36,6 +35,47 @@
share/twelf/emacs/twelf-hilit.el
share/twelf/emacs/twelf-init.el
share/twelf/emacs/twelf.el
+share/twelf/examples-clp/arith/eval.elf
+share/twelf/examples-clp/arith/examples.quy
+share/twelf/examples-clp/arith/parse.elf
+share/twelf/examples-clp/arith/sources.cfg
+share/twelf/examples-clp/arith/test.cfg
+share/twelf/examples-clp/base/base.elf
+share/twelf/examples-clp/base/examples.quy
+share/twelf/examples-clp/base/sources.cfg
+share/twelf/examples-clp/base/test.cfg
+share/twelf/examples-clp/crypt/crypt.elf
+share/twelf/examples-clp/crypt/examples.quy
+share/twelf/examples-clp/crypt/sources.cfg
+share/twelf/examples-clp/crypt/test.cfg
+share/twelf/examples-clp/integers/base.elf
+share/twelf/examples-clp/integers/cfract.elf
+share/twelf/examples-clp/integers/examples.quy
+share/twelf/examples-clp/integers/integers.elf
+share/twelf/examples-clp/integers/meta.elf
+share/twelf/examples-clp/integers/sources.cfg
+share/twelf/examples-clp/integers/test.cfg
+share/twelf/examples-clp/laplace/examples.quy
+share/twelf/examples-clp/laplace/laplace.elf
+share/twelf/examples-clp/laplace/sources.cfg
+share/twelf/examples-clp/laplace/test.cfg
+share/twelf/examples-clp/lists/examples.quy
+share/twelf/examples-clp/lists/lists.elf
+share/twelf/examples-clp/lists/sources.cfg
+share/twelf/examples-clp/lists/test.cfg
+share/twelf/examples-clp/mortgage/examples.quy
+share/twelf/examples-clp/mortgage/mortgage.elf
+share/twelf/examples-clp/mortgage/sources.cfg
+share/twelf/examples-clp/mortgage/test.cfg
+share/twelf/examples-clp/pelletier/examples.quy
+share/twelf/examples-clp/pelletier/pelletier.elf
+share/twelf/examples-clp/pelletier/sources.cfg
+share/twelf/examples-clp/pelletier/test.cfg
+share/twelf/examples-clp/sieve/examples.quy
+share/twelf/examples-clp/sieve/sieve.elf
+share/twelf/examples-clp/sieve/sieve2.elf
+share/twelf/examples-clp/sieve/sources.cfg
+share/twelf/examples-clp/sieve/test.cfg
share/twelf/examples/README
share/twelf/examples/arith/README
share/twelf/examples/arith/arith.elf
@@ -164,7 +204,6 @@
share/twelf/examples/cpsocc/lemma17.elf
share/twelf/examples/cpsocc/lemma7.elf
share/twelf/examples/cpsocc/lemma9.elf
-share/twelf/examples/cpsocc/th2.elf
share/twelf/examples/cpsocc/load.sml
share/twelf/examples/cpsocc/sources.cfg
share/twelf/examples/cpsocc/test.cfg
@@ -173,6 +212,7 @@
share/twelf/examples/cpsocc/th10.elf
share/twelf/examples/cpsocc/th15.elf
share/twelf/examples/cpsocc/th18.elf
+share/twelf/examples/cpsocc/th2.elf
share/twelf/examples/cpsocc/th4.elf
share/twelf/examples/cpsocc/th8.elf
share/twelf/examples/cut-elim/README
@@ -297,9 +337,16 @@
share/twelf/examples/prop-calc/equiv.elf
share/twelf/examples/prop-calc/equiv.thm
share/twelf/examples/prop-calc/examples.quy
+share/twelf/examples/prop-calc/nd.elf
+share/twelf/examples/prop-calc/nd.tex
+share/twelf/examples/prop-calc/ndclass.elf
+share/twelf/examples/prop-calc/prop-calc-solution.elf
share/twelf/examples/prop-calc/prop-calc.elf
share/twelf/examples/prop-calc/sources.cfg
share/twelf/examples/prop-calc/test.cfg
+share/twelf/examples/prop-calc/thm1.elf
+share/twelf/examples/prop-calc/thm2.elf
+share/twelf/examples/prop-calc/thm3.elf
share/twelf/examples/tabled/README
share/twelf/examples/tabled/all.sml
share/twelf/examples/tabled/ccc/README
@@ -336,6 +383,19 @@
share/twelf/examples/tabled/refine/refex.elf
share/twelf/examples/tabled/refine/refex.quy
share/twelf/examples/tabled/refine/tab.cfg
+share/twelf/examples/tabled/seqCalc/foc.cfg
+share/twelf/examples/tabled/seqCalc/focus.elf
+share/twelf/examples/tabled/seqCalc/fol-int-at.elf
+share/twelf/examples/tabled/seqCalc/formulas.elf
+share/twelf/examples/tabled/seqCalc/int-atom.elf
+share/twelf/examples/tabled/seqCalc/int.elf
+share/twelf/examples/tabled/seqCalc/sources.cfg
+share/twelf/examples/tabled/seqCalc/tab-at.cfg
+share/twelf/examples/tabled/seqCalc/tab-ex-all.quy
+share/twelf/examples/tabled/seqCalc/tab-ex-np.quy
+share/twelf/examples/tabled/seqCalc/tab-foc-all.quy
+share/twelf/examples/tabled/seqCalc/tab-fol.cfg
+share/twelf/examples/tabled/seqCalc/tab.cfg
share/twelf/examples/tabled/subtype/mini-ml.elf
share/twelf/examples/tabled/subtype/subtype.elf
share/twelf/examples/tabled/subtype/tab-examples.quy
@@ -352,47 +412,6 @@
share/twelf/examples/tabled/tests/test5.elf
share/twelf/examples/tabled/tests/test6.elf
share/twelf/examples/tabled/tests/test7.elf
-share/twelf/examples-clp/arith/eval.elf
-share/twelf/examples-clp/arith/examples.quy
-share/twelf/examples-clp/arith/parse.elf
-share/twelf/examples-clp/arith/sources.cfg
-share/twelf/examples-clp/arith/test.cfg
-share/twelf/examples-clp/base/base.elf
-share/twelf/examples-clp/base/examples.quy
-share/twelf/examples-clp/base/sources.cfg
-share/twelf/examples-clp/base/test.cfg
-share/twelf/examples-clp/crypt/crypt.elf
-share/twelf/examples-clp/crypt/examples.quy
-share/twelf/examples-clp/crypt/sources.cfg
-share/twelf/examples-clp/crypt/test.cfg
-share/twelf/examples-clp/integers/base.elf
-share/twelf/examples-clp/integers/cfract.elf
-share/twelf/examples-clp/integers/examples.quy
-share/twelf/examples-clp/integers/integers.elf
-share/twelf/examples-clp/integers/meta.elf
-share/twelf/examples-clp/integers/sources.cfg
-share/twelf/examples-clp/integers/test.cfg
-share/twelf/examples-clp/laplace/examples.quy
-share/twelf/examples-clp/laplace/laplace.elf
-share/twelf/examples-clp/laplace/sources.cfg
-share/twelf/examples-clp/laplace/test.cfg
-share/twelf/examples-clp/lists/examples.quy
-share/twelf/examples-clp/lists/lists.elf
-share/twelf/examples-clp/lists/sources.cfg
-share/twelf/examples-clp/lists/test.cfg
-share/twelf/examples-clp/mortgage/examples.quy
-share/twelf/examples-clp/mortgage/mortgage.elf
-share/twelf/examples-clp/mortgage/sources.cfg
-share/twelf/examples-clp/mortgage/test.cfg
-share/twelf/examples-clp/pelletier/examples.quy
-share/twelf/examples-clp/pelletier/pelletier.elf
-share/twelf/examples-clp/pelletier/sources.cfg
-share/twelf/examples-clp/pelletier/test.cfg
-share/twelf/examples-clp/sieve/examples.quy
-share/twelf/examples-clp/sieve/sieve.elf
-share/twelf/examples-clp/sieve/sieve2.elf
-share/twelf/examples-clp/sieve/sources.cfg
-share/twelf/examples-clp/sieve/test.cfg
share/twelf/tex/code.sty
share/twelf/tex/example.tex
share/twelf/tex/twelf.sty
@@ -400,13 +419,22 @@
@dirrm libexec/twelf/bin
@dirrm libexec/twelf
@dirrm share/twelf/bin
+ at dirrm share/twelf/doc/ps
+ at dirrm share/twelf/doc/pdf
@dirrm share/twelf/doc/dvi
@dirrm share/twelf/doc/html
- at dirrm share/twelf/doc/info
- at dirrm share/twelf/doc/pdf
- at dirrm share/twelf/doc/ps
@dirrm share/twelf/doc
@dirrm share/twelf/emacs
+ at dirrm share/twelf/examples-clp/arith
+ at dirrm share/twelf/examples-clp/base
+ at dirrm share/twelf/examples-clp/crypt
+ at dirrm share/twelf/examples-clp/integers
+ at dirrm share/twelf/examples-clp/laplace
+ at dirrm share/twelf/examples-clp/lists
+ at dirrm share/twelf/examples-clp/mortgage
+ at dirrm share/twelf/examples-clp/pelletier
+ at dirrm share/twelf/examples-clp/sieve
+ at dirrm share/twelf/examples-clp
@dirrm share/twelf/examples/arith
@dirrm share/twelf/examples/ccc
@dirrm share/twelf/examples/church-rosser
@@ -424,8 +452,8 @@
@dirrm share/twelf/examples/handbook
@dirrm share/twelf/examples/incll
@dirrm share/twelf/examples/kolm
- at dirrm share/twelf/examples/lp-horn
@dirrm share/twelf/examples/lp
+ at dirrm share/twelf/examples/lp-horn
@dirrm share/twelf/examples/mini-ml
@dirrm share/twelf/examples/polylam
@dirrm share/twelf/examples/prop-calc
@@ -438,17 +466,8 @@
@dirrm share/twelf/examples/tabled/subtype
@dirrm share/twelf/examples/tabled/subtype1
@dirrm share/twelf/examples/tabled/tests
+ at dirrm share/twelf/examples/tabled/seqCalc
@dirrm share/twelf/examples/tabled
@dirrm share/twelf/examples
- at dirrm share/twelf/examples-clp/arith
- at dirrm share/twelf/examples-clp/base
- at dirrm share/twelf/examples-clp/crypt
- at dirrm share/twelf/examples-clp/integers
- at dirrm share/twelf/examples-clp/laplace
- at dirrm share/twelf/examples-clp/lists
- at dirrm share/twelf/examples-clp/mortgage
- at dirrm share/twelf/examples-clp/pelletier
- at dirrm share/twelf/examples-clp/sieve
- at dirrm share/twelf/examples-clp
@dirrm share/twelf/tex
@dirrm share/twelf
--- patch-twelf-upgrade ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list