Date: Thu, 18 Sep 2008 03:21:30 +0800 (CST) From: Yi-Jheng Lin <yzlin@cs.nctu.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Cc: lev@FreeBSD.org Subject: ports/127449: [PATCH] lang/hope: unbreak, rename patch files, tuning pkg-plist Message-ID: <200809171921.m8HJLU17037193@stucgi.cs.nctu.edu.tw> Resent-Message-ID: <200809171930.m8HJU22W008019@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 127449
>Category: ports
>Synopsis: [PATCH] lang/hope: unbreak, rename patch files, tuning pkg-plist
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Wed Sep 17 19:30:01 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Yi-Jheng Lin
>Release: FreeBSD 7.0-RELEASE-p4 amd64
>Organization:
NCTU CS
>Environment:
System: FreeBSD stucgi 7.0-RELEASE-p4 FreeBSD 7.0-RELEASE-p4 #0: Fri Sep 5 14:56:26 CST
>Description:
- Fix applying patch error. (remove an unnecessary patch)
- Rename patch files. (portlint warning)
- Tuning pkg-plist & taking advantage from DOCSDIR & DATADIR macros.
Added file(s):
- files/patch-doc_Makefile.in
- files/patch-src_memory.c
Removed file(s):
- files/patch-doc:Makefile.in
- files/patch-sh_makedepend
- files/patch-src-memory.c
Port maintainer (lev@FreeBSD.org) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- hope-1.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/lang/hope/Makefile /amd/account/gcs/96/9655630/dev/ports/lang/hope/Makefile
--- /usr/ports/lang/hope/Makefile 2008-06-20 03:03:43.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/lang/hope/Makefile 2008-09-18 03:11:45.000000000 +0800
@@ -14,13 +14,10 @@
MAINTAINER= lev@FreeBSD.org
COMMENT= Hope is lazy interpriter for HOPE applicative language
-BROKEN= Patch fails
-DEPRECATED= Has been broken for more than 6 months
-EXPIRATION_DATE=2008-09-19
-
.if defined(WITH_DOCS)
BUILD_DEPENDS+= latex:${PORTSDIR}/print/teTeX \
latex2html:${PORTSDIR}/textproc/latex2html
+
MAKE_ARGS+= WITH_DOCS=yes
.else
NOPORTDOCS= yes
diff -ruN --exclude=CVS /usr/ports/lang/hope/files/patch-doc:Makefile.in /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-doc:Makefile.in
--- /usr/ports/lang/hope/files/patch-doc:Makefile.in 2001-10-18 02:21:24.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-doc:Makefile.in 1970-01-01 08:00:00.000000000 +0800
@@ -1,19 +0,0 @@
---- doc/Makefile.in.orig Sat Apr 17 04:14:06 1999
-+++ doc/Makefile.in Tue Sep 25 00:12:51 2001
-@@ -58,7 +58,7 @@
- sed -n 's/^#define[ ][ ]*\(M[IA][NX]PREC\)[ ][ ]*\([0-9]*\).*/\\newcommand{\\\1}{\2}/p' ../src/op.h >$@
-
- ../src/op.h:
-- cd ../src; make op.h
-+ cd ../src; $(MAKE) op.h
-
- # can't use echo here as BSD and SYSV versions treat backslashes differently.
- Standard.tex: ../lib/Standard.hop h2l.awk
-@@ -83,6 +83,7 @@
- for file in $(docs); do gzip <$$file >$(docdir)/$$file.gz; done
- $(INSTALL) -d $(htmldir)
- for dir in $(dirs); do rm -rf $(htmldir)/$$dir; done
-+ for dir in $(dirs); do rm -rf $$dir/*.pl $$dir/WARNINGS; done
- cp -r $(dirs) $(htmldir)
- # cp $(src_srcs) $(srcdir)
-
diff -ruN --exclude=CVS /usr/ports/lang/hope/files/patch-doc_Makefile.in /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-doc_Makefile.in
--- /usr/ports/lang/hope/files/patch-doc_Makefile.in 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-doc_Makefile.in 2008-09-18 02:23:28.000000000 +0800
@@ -0,0 +1,19 @@
+--- doc/Makefile.in.orig Sat Apr 17 04:14:06 1999
++++ doc/Makefile.in Tue Sep 25 00:12:51 2001
+@@ -58,7 +58,7 @@
+ sed -n 's/^#define[ ][ ]*\(M[IA][NX]PREC\)[ ][ ]*\([0-9]*\).*/\\newcommand{\\\1}{\2}/p' ../src/op.h >$@
+
+ ../src/op.h:
+- cd ../src; make op.h
++ cd ../src; $(MAKE) op.h
+
+ # can't use echo here as BSD and SYSV versions treat backslashes differently.
+ Standard.tex: ../lib/Standard.hop h2l.awk
+@@ -83,6 +83,7 @@
+ for file in $(docs); do gzip <$$file >$(docdir)/$$file.gz; done
+ $(INSTALL) -d $(htmldir)
+ for dir in $(dirs); do rm -rf $(htmldir)/$$dir; done
++ for dir in $(dirs); do rm -rf $$dir/*.pl $$dir/WARNINGS; done
+ cp -r $(dirs) $(htmldir)
+ # cp $(src_srcs) $(srcdir)
+
diff -ruN --exclude=CVS /usr/ports/lang/hope/files/patch-sh_makedepend /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-sh_makedepend
--- /usr/ports/lang/hope/files/patch-sh_makedepend 2002-12-19 07:38:24.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-sh_makedepend 1970-01-01 08:00:00.000000000 +0800
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/lang/hope/files/patch-sh_makedepend,v 1.1 2002/12/18 23:38:24 naddy Exp $
-
---- sh/makedepend.orig Thu Dec 19 00:29:14 2002
-+++ sh/makedepend Thu Dec 19 00:29:26 2002
-@@ -66,7 +66,7 @@
- for file in $files
- do objname="$objprefix"`expr "$file" : '\(.*\)\.[^.]*$'`"$objsuffix"
- gcc $cppflags -E $file |
-- grep '^# 1 "[^/][^"]*"' |
-+ grep '^# 1 "[^/<][^"]*"' |
- sed ' s/[^"]*"\([^"]*\)".*/\1/
- s|///*|/|g
- : dotloop
diff -ruN --exclude=CVS /usr/ports/lang/hope/files/patch-src-memory.c /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-src-memory.c
--- /usr/ports/lang/hope/files/patch-src-memory.c 2003-12-08 18:53:27.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-src-memory.c 1970-01-01 08:00:00.000000000 +0800
@@ -1,11 +0,0 @@
---- src/memory.c.orig Sun Dec 7 18:01:46 2003
-+++ src/memory.c Sun Dec 7 18:01:50 2003
-@@ -22,6 +22,7 @@
- {
- if ((base_memory = (char *)malloc((size_t)MEMSIZE)) == NULL)
- error(FATALERR, "can't allocate memory");
-+ memset(base_memory, NULL, (size_t)MEMSIZE);
- top_memory = base_memory + RoundDown(MEMSIZE);
-
- lim_temp = top_string = base_memory;
-
diff -ruN --exclude=CVS /usr/ports/lang/hope/files/patch-src_memory.c /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-src_memory.c
--- /usr/ports/lang/hope/files/patch-src_memory.c 1970-01-01 08:00:00.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/lang/hope/files/patch-src_memory.c 2008-09-18 02:23:28.000000000 +0800
@@ -0,0 +1,11 @@
+--- src/memory.c.orig Sun Dec 7 18:01:46 2003
++++ src/memory.c Sun Dec 7 18:01:50 2003
+@@ -22,6 +22,7 @@
+ {
+ if ((base_memory = (char *)malloc((size_t)MEMSIZE)) == NULL)
+ error(FATALERR, "can't allocate memory");
++ memset(base_memory, NULL, (size_t)MEMSIZE);
+ top_memory = base_memory + RoundDown(MEMSIZE);
+
+ lim_temp = top_string = base_memory;
+
diff -ruN --exclude=CVS /usr/ports/lang/hope/pkg-plist /amd/account/gcs/96/9655630/dev/ports/lang/hope/pkg-plist
--- /usr/ports/lang/hope/pkg-plist 2004-04-11 00:07:06.000000000 +0800
+++ /amd/account/gcs/96/9655630/dev/ports/lang/hope/pkg-plist 2008-09-18 03:06:11.000000000 +0800
@@ -1,91 +1,91 @@
bin/hope
-share/hope/lib.new/Standard.hop
-share/hope/lib/Standard.hop
-share/hope/lib/arith.hop
-share/hope/lib/case.hop
-share/hope/lib/ctype.hop
-share/hope/lib/diag.hop
-share/hope/lib/fold.hop
-share/hope/lib/functions.hop
-share/hope/lib/lines.hop
-share/hope/lib/list.hop
-share/hope/lib/lists.hop
-share/hope/lib/maybe.hop
-share/hope/lib/products.hop
-share/hope/lib/range.hop
-share/hope/lib/seq.hop
-share/hope/lib/set.hop
-share/hope/lib/sort.hop
-share/hope/lib/sums.hop
-share/hope/lib/tree.hop
-share/hope/lib/void.hop
-share/hope/lib/words.hop
-share/hope/lib/y.hop
-%%PORTDOCS%%share/doc/hope/ref_man.dvi.gz
-%%PORTDOCS%%share/doc/hope/ref_man.ps.gz
-%%PORTDOCS%%share/doc/hope/ref_man/index.html
-%%PORTDOCS%%share/doc/hope/ref_man/node1.html
-%%PORTDOCS%%share/doc/hope/ref_man/node10.html
-%%PORTDOCS%%share/doc/hope/ref_man/node11.html
-%%PORTDOCS%%share/doc/hope/ref_man/node12.html
-%%PORTDOCS%%share/doc/hope/ref_man/node13.html
-%%PORTDOCS%%share/doc/hope/ref_man/node14.html
-%%PORTDOCS%%share/doc/hope/ref_man/node15.html
-%%PORTDOCS%%share/doc/hope/ref_man/node16.html
-%%PORTDOCS%%share/doc/hope/ref_man/node17.html
-%%PORTDOCS%%share/doc/hope/ref_man/node2.html
-%%PORTDOCS%%share/doc/hope/ref_man/node3.html
-%%PORTDOCS%%share/doc/hope/ref_man/node4.html
-%%PORTDOCS%%share/doc/hope/ref_man/node5.html
-%%PORTDOCS%%share/doc/hope/ref_man/node6.html
-%%PORTDOCS%%share/doc/hope/ref_man/node7.html
-%%PORTDOCS%%share/doc/hope/ref_man/node8.html
-%%PORTDOCS%%share/doc/hope/ref_man/node9.html
-%%PORTDOCS%%share/doc/hope/ref_man/ref_man.css
-%%PORTDOCS%%share/doc/hope/ref_man/ref_man.html
-%%PORTDOCS%%share/doc/hope/examples.dvi.gz
-%%PORTDOCS%%share/doc/hope/examples.ps.gz
-%%PORTDOCS%%share/doc/hope/examples/examples.css
-%%PORTDOCS%%share/doc/hope/examples/examples.html
-%%PORTDOCS%%share/doc/hope/examples/index.html
-%%PORTDOCS%%share/doc/hope/examples/node1.html
-%%PORTDOCS%%share/doc/hope/examples/node2.html
-%%PORTDOCS%%share/doc/hope/examples/node3.html
-%%PORTDOCS%%share/doc/hope/examples/node4.html
-%%PORTDOCS%%share/doc/hope/hope_tut.dvi.gz
-%%PORTDOCS%%share/doc/hope/hope_tut.ps.gz
-%%PORTDOCS%%share/doc/hope/hope_tut/hope_tut.css
-%%PORTDOCS%%share/doc/hope/hope_tut/hope_tut.html
-%%PORTDOCS%%share/doc/hope/hope_tut/index.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node1.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node10.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node11.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node12.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node13.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node14.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node15.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node16.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node17.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node18.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node19.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node2.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node20.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node21.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node22.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node23.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node24.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node25.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node3.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node4.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node5.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node6.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node7.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node8.html
-%%PORTDOCS%%share/doc/hope/hope_tut/node9.html
-%%PORTDOCS%%@dirrm share/doc/hope/ref_man
-%%PORTDOCS%%@dirrm share/doc/hope/examples
-%%PORTDOCS%%@dirrm share/doc/hope/hope_tut
-%%PORTDOCS%%@dirrm share/doc/hope
-@dirrm share/hope/lib.new
-@dirrm share/hope/lib
-@dirrm share/hope
+%%DATADIR%%/lib.new/Standard.hop
+%%DATADIR%%/lib/Standard.hop
+%%DATADIR%%/lib/arith.hop
+%%DATADIR%%/lib/case.hop
+%%DATADIR%%/lib/ctype.hop
+%%DATADIR%%/lib/diag.hop
+%%DATADIR%%/lib/fold.hop
+%%DATADIR%%/lib/functions.hop
+%%DATADIR%%/lib/lines.hop
+%%DATADIR%%/lib/list.hop
+%%DATADIR%%/lib/lists.hop
+%%DATADIR%%/lib/maybe.hop
+%%DATADIR%%/lib/products.hop
+%%DATADIR%%/lib/range.hop
+%%DATADIR%%/lib/seq.hop
+%%DATADIR%%/lib/set.hop
+%%DATADIR%%/lib/sort.hop
+%%DATADIR%%/lib/sums.hop
+%%DATADIR%%/lib/tree.hop
+%%DATADIR%%/lib/void.hop
+%%DATADIR%%/lib/words.hop
+%%DATADIR%%/lib/y.hop
+@dirrm %%DATADIR%%/lib.new
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%
+%%PORTDOCS%%%%DOCSDIR%%/ref_man.dvi.gz
+%%PORTDOCS%%%%DOCSDIR%%/ref_man.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/index.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node11.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node12.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node13.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node14.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node15.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node16.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node17.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node5.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node7.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node8.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/node9.html
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/ref_man.css
+%%PORTDOCS%%%%DOCSDIR%%/ref_man/ref_man.html
+%%PORTDOCS%%%%DOCSDIR%%/examples.dvi.gz
+%%PORTDOCS%%%%DOCSDIR%%/examples.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/examples/examples.css
+%%PORTDOCS%%%%DOCSDIR%%/examples/examples.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/index.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/examples/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut.dvi.gz
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/hope_tut.css
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/hope_tut.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/index.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node1.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node10.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node11.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node12.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node13.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node14.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node15.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node16.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node17.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node18.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node19.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node2.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node20.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node21.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node22.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node23.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node24.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node25.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node3.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node4.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node5.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node6.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node7.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node8.html
+%%PORTDOCS%%%%DOCSDIR%%/hope_tut/node9.html
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/ref_man
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/examples
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/hope_tut
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- hope-1.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809171921.m8HJLU17037193>