Bug 77624 - Update orphaned port lang/clisp to latest release
Summary: Update orphaned port lang/clisp to latest release
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2005-02-17 02:40 UTC by Jakub Rehor
Modified: 2005-03-06 21:22 UTC (History)
0 users

See Also:


Attachments
clisp-shar (6.77 KB, text/plain)
2005-02-17 02:40 UTC, Jakub Rehor
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Jakub Rehor 2005-02-17 02:40:20 UTC
	Update lang/clisp from 2.30 to 2.33.2 (orphaned port)
Comment 1 Sergey Matveychuk freebsd_committer freebsd_triage 2005-02-17 07:09:52 UTC
Please, please, please use diff -u for updates, not shar.
http://www.freebsd.org/doc/en_US.ISO8859-1/books/porters-handbook/port-upgrading.html

-- 
Sem.
Comment 2 Volker Stolz freebsd_committer freebsd_triage 2005-02-17 12:20:25 UTC
State Changed
From-To: open->feedback

Waiting for update in correct format
Comment 3 Jakub Rehor 2005-02-18 02:08:59 UTC
SEND-PR: -*- send-pr -*-
SEND-PR: Lines starting with `SEND-PR' will be removed automatically, as
SEND-PR: will all comments (text enclosed in `<' and `>').
SEND-PR:
SEND-PR: Please consult the following URL if you are not sure how to
SEND-PR: fill out a problem report:
SEND-PR: http://www.freebsd.org/doc/en/articles/problem-reports/
SEND-PR:
SEND-PR: Note that the Synopsis field is mandatory.
SEND-PR:
SEND-PR: Please note that (unless you state otherwise) if your report 
SEND-PR: includes a patch then it will be taken under the same license as 
SEND-PR: the one on the file(s) you want to change.
SEND-PR:
SEND-PR: BE ADVISED THAT FREEBSD PROBLEM REPORTS ARE PUBLIC INFORMATION AND
SEND-PR: WILL BE PUBLISHED AS-IS ON THE PROJECT'S MAILING LISTS AND WEB SITES.
SEND-PR: DO NOT SUBMIT ANY INFORMATION YOU DO NOT WANT MADE PUBLIC.
SEND-PR:
SEND-PR: If you wish to submit a problem report confidentially, then contact
SEND-PR: the FreeBSD bugmaster (bugmaster@FreeBSD.org) to arrange for a
SEND-PR: relevant developer to be contacted.
SEND-PR:
SEND-PR: For sensitive security issues, consider contacting the FreeBSD
SEND-PR: security officer team (security-officer@freebsd.org) directly.
SEND-PR:
SEND-PR: Choose from the following categories:
SEND-PR:
SEND-PR: advocacy  alpha     amd64     bin       conf      docs      
SEND-PR: gnu       i386      ia64      java      kern      misc      
SEND-PR: ports     powerpc   sparc64   standards threads   www       
SEND-PR: 
SEND-PR:

>Submitter-Id:	current-users
>Originator:	Jakub Rehor
>Organization:	
>Confidential:	no
>Synopsis:	[patch] update of lang/clisp to latest release
>Severity:	non-critical
>Priority:	low
>Category:	ports
>Class:		update
>Release:	FreeBSD 5.3-STABLE i386
>Environment:
System: FreeBSD libervitae 5.3-STABLE FreeBSD 5.3-STABLE #1: Wed Dec 8 21:37:23 UTC 2004 root@libervitae:/usr/obj/usr/src/sys/LIBERVITAE-5.3 i386


>Description:
Update lang/clisp from 2.30 to 2.33.2 (orphaned port)
>How-To-Repeat:
	
>Fix:

--- clisp-diff begins here ---
diff -ruN ./Makefile /usr/ports/lang/clisp/Makefile
--- ./Makefile	Wed Feb 16 21:19:12 2005
+++ /usr/ports/lang/clisp/Makefile	Mon Feb  7 10:54:10 2005
@@ -6,30 +6,61 @@
 #
 
 PORTNAME=	clisp
-PORTVERSION=	2.33.2
-CATEGORIES=	lang lisp
-MASTER_SITES=	${MASTER_SITE_GNU}
-MASTER_SITE_SUBDIR=${PORTNAME}/release/${PORTVERSION}
+PORTVERSION=	2.30
+PORTREVISION=	2
+CATEGORIES=	lang
+MASTER_SITES=	ftp://cvs2.cons.org/pub/lisp/clisp/source/${PORTVERSION}/ \
+		${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	jakub@rehor.net
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An ANSI Common Lisp
 
 USE_BZIP2=	yes
 USE_ICONV=	yes
 GNU_CONFIGURE=	yes
+USE_GCC=	2.95
 USE_GETTEXT=	yes
 
+# In clisp-2.28, the build dies in the "regexp" module: the build target
+# invokes a configure script, which encounters a different CC variable than
+# the one the top-level configure cached.  We'll explicitly set CC to avoid
+# this.
+MAKE_ENV+= CC="${CC}" LANG=C
+CONFIGURE_ENV+= CC="${CC}"
+
+# The build uses INSTALL_* to copy files around, but since the Ports
+# INSTALL_* try to set file permissions, using them breaks non-root builds.
+# Instead, we'll just fix up permissions in the post-install target, after we
+# install the files.
+CONFIGURE_ENV+=	INSTALL=${CP} INSTALL_DATA=${CP} INSTALL_PROGRAM=${CP} \
+	INSTALL_SCRIPT=${CP} INSTALL_MAN=${CP}
+
 # Build subdirectory
 BUILD_DIRNAME=${CONFIGURE_TARGET}
 
-# Check ./configure --help in the distribution to see all modules
+# These came from clisp-2.28's "configure" on my 4.4-R system,
+# with "--with-module=regexp --with-export-syscalls" added in.
 MAKEMAKE_ARGS=--prefix=${PREFIX} --with-readline --with-gettext \
 	--with-dynamic-ffi --with-module=regexp --with-export-syscalls
 
+# The post-install target uses these to fix permissions.
+DATA_PATHS=${PREFIX}/lib/clisp ${PREFIX}/share/doc/clisp \
+	${PREFIX}/share/locale/de/LC_MESSAGES/clisp.mo \
+	${PREFIX}/share/locale/de/LC_MESSAGES/clisplow.mo \
+	${PREFIX}/share/locale/en/LC_MESSAGES/clisp.mo \
+	${PREFIX}/share/locale/en/LC_MESSAGES/clisplow.mo \
+	${PREFIX}/share/locale/es/LC_MESSAGES/clisp.mo \
+	${PREFIX}/share/locale/es/LC_MESSAGES/clisplow.mo \
+	${PREFIX}/share/locale/fr/LC_MESSAGES/clisp.mo \
+	${PREFIX}/share/locale/fr/LC_MESSAGES/clisplow.mo \
+	${PREFIX}/share/locale/nl/LC_MESSAGES/clisp.mo \
+	${PREFIX}/share/locale/nl/LC_MESSAGES/clisplow.mo
+PROG_PATHS=${PREFIX}/bin/clisp
+MAN_PATHS=${PREFIX}/man/man1/clisp.1
+
 .include <bsd.port.pre.mk>
 
-# If you have an Alpha machine, you may want to test this port and let
-# me know if you succeed.
 .if ${ARCH} == "alpha"
 BROKEN=		"Does not compile on alpha"
 .endif
@@ -37,13 +68,21 @@
 # The source doesn't include a top-level Makefile, so we'll fake one.
 post-extract:
 	@cd ${WRKSRC} && \
-	${PRINTF} "all install:\n\t@cd ${WRKSRC}/${BUILD_DIRNAME} && \$${MAKE} \$${MAKEFLAGS} \$$@\n" > ${WRKSRC}/Makefile
+	printf "all install:\n\t@cd ${WRKSRC}/${BUILD_DIRNAME} && \$${MAKE} \$${MAKEFLAGS} \$$@\n" > ${WRKSRC}/Makefile
 
 # The 'configure' script stops short of doing this for us.
 post-configure:
 	cd ${WRKSRC}/${BUILD_DIRNAME} && \
 	./makemake ${MAKEMAKE_ARGS} > Makefile && \
 	make config.lisp
+
+post-install:
+	${CHOWN} -R ${BINOWN}:${BINGRP} ${PROG_PATHS}
+	${CHMOD} -R ugo+rX,ugo-w ${PROG_PATHS}
+	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATA_PATHS}
+	${CHMOD} -R ugo+rX,ugo-w ${DATA_PATHS}
+	${CHOWN} -R ${MANOWN}:${MANGRP} ${MAN_PATHS}
+	${CHMOD} -R ugo+rX,ugo-w ${MAN_PATHS}
 
 MAN1=	clisp.1
 
diff -ruN ./README.html /usr/ports/lang/clisp/README.html
--- ./README.html	Wed Dec 31 19:00:00 1969
+++ /usr/ports/lang/clisp/README.html	Sun Oct 24 22:05:16 2004
@@ -0,0 +1,43 @@
+<!DOCTYPE html PUBLIC "-//IETF//DTD HTML 2.0//EN">
+
+<html>
+  <head>
+    <title>The FreeBSD Ports Collection (lang/clisp)</title>
+  </head>
+
+  <body>
+    <h1>The FreeBSD Ports Collection (lang/clisp)</h1>
+    <hr>
+
+    <p>You are now in the directory for the port "lang/clisp".</p>
+
+    <p>The package name of this port is "clisp-2.30_2".</p>
+
+    <p>This is the one-line description for this port:</p>
+    <hr>
+
+    <p>
+An ANSI Common Lisp
+    </p>
+    <hr>
+
+    <p>Please read the "<a href="pkg-descr">description file</a>" for a
+    longer description and/or visit the <a href="http://clisp.cons.org/">web site</a> for futher informations.</p>
+
+    <p>If needed, you may contact the <a href=
+    "mailto:henrik.motakef@web.de">maintainer</a> of this port or the port <a href=
+    "mailto:ports@FreeBSD.org">mailing-list</a>.</p>
+
+    <p>This port requires package(s) "" to build.</p>
+
+    <p>This port requires package(s) "" to run.</p>
+
+    <p>Go to the <a href="../../README.html">top of the ports tree</a> for
+    a summary on how to use the ports collection.</p>
+    <hr>
+
+    <p><a href="../README.html">Go up one level</a> | <a href=
+    "../../README.html">Go to top of ports tree</a></p>
+  </body>
+</html>
+
diff -ruN ./distinfo /usr/ports/lang/clisp/distinfo
--- ./distinfo	Thu Feb 10 20:45:14 2005
+++ /usr/ports/lang/clisp/distinfo	Tue Mar 30 22:09:06 2004
@@ -1,2 +1,2 @@
-MD5 (clisp-2.33.2.tar.bz2) = ee4ea316db1e843dcb16094bf500012f
-SIZE (clisp-2.33.2.tar.bz2) = 6091273
+MD5 (clisp-2.30.tar.bz2) = 29e80e430c6098c78dbd2e56334aaa90
+SIZE (clisp-2.30.tar.bz2) = 5652698
diff -ruN ./files/patch-aa /usr/ports/lang/clisp/files/patch-aa
--- ./files/patch-aa	Wed Dec 31 19:00:00 1969
+++ /usr/ports/lang/clisp/files/patch-aa	Wed Jan  8 05:32:41 2003
@@ -0,0 +1,18 @@
+--- src/makemake.in.orig	Sun Jan  5 22:37:32 2003
++++ src/makemake.in	Sun Jan  5 22:39:09 2003
+@@ -1658,7 +1658,15 @@
+ echol "htmldir = \$(prefix)${NEXT_}share${NEXT_}html"
+ echol "dvidir  = \$(prefix)${NEXT_}share${NEXT_}dvi"
+ echol "docdir  = \$(prefix)${NEXT_}share${NEXT_}doc"
++fsstnd=freebsd
+ case "$fsstnd" in
++  freebsd)
++    echol "mandir  = \$(exec_prefix)${NEXT_}man"
++    echol "docdir = \$(exec_prefix)${NEXT_}share${NEXT_}doc"
++    echol "lispdocdir = \$(docdir)${NEXT_}clisp"
++    echol "htmldir = \$(lispdocdir)"
++    echol "dvidir = \$(lispdocdir)"
++    ;;
+   suse)
+     echol "lispdocdir = \$(docdir)${NEXT_}packages${NEXT_}clisp"
+     ;;
diff -ruN ./files/patch-clisp-link.in /usr/ports/lang/clisp/files/patch-clisp-link.in
--- ./files/patch-clisp-link.in	Wed Dec 31 19:00:00 1969
+++ /usr/ports/lang/clisp/files/patch-clisp-link.in	Wed Jan  8 05:32:41 2003
@@ -0,0 +1,20 @@
+--- src/clisp-link.in.orig	Sun Jan  5 18:38:36 2003
++++ src/clisp-link.in	Sun Jan  5 18:39:24 2003
+@@ -282,7 +282,7 @@
+     verbose "$destinationdir"/${LISPRUN} -B "$installbasedir" -M "$lispinitdir"/lispinit.mem -norc -q -i $to_load -x "(saveinitmem \"$destinationdir/lispinit.mem\")"
+     # Generate new makevars
+     LIBS=`echo $LIBS | sed s/','/'\\,'/g`
+-    sed -e "s,^LIBS=.*\$,LIBS='${LIBS}'," -e "s,^FILES=.*\$,FILES='${FILES}'," < "$sourcedir"/makevars > "$destinationdir"/makevars
++    sed -e "s;^LIBS=.*\$;LIBS='${LIBS}';" -e "s;^FILES=.*\$;FILES='${FILES}';" < "$sourcedir"/makevars > "$destinationdir"/makevars
+     # Done.
+     trap '' 1 2 15
+     ;;
+@@ -421,7 +421,7 @@
+       fi
+       # Generate new makevars
+       LIBS=`echo $LIBS | sed s/','/'\\,'/g`
+-      sed -e "s,^LIBS=.*\$,LIBS='${LIBS}'," -e "s,^FILES=.*\$,FILES='${FILES}'," < "$sourcedir"/makevars > "$destinationdir"/makevars
++      sed -e "s;^LIBS=.*\$;LIBS='${LIBS}';" -e "s;^FILES=.*\$;FILES='${FILES}';" < "$sourcedir"/makevars > "$destinationdir"/makevars
+     fi
+     # Done.
+     trap '' 1 2 15
diff -ruN ./files/patch-makemake.in /usr/ports/lang/clisp/files/patch-makemake.in
--- ./files/patch-makemake.in	Tue Feb 15 21:54:22 2005
+++ /usr/ports/lang/clisp/files/patch-makemake.in	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- src/makemake.in.orig	Thu May 27 10:43:39 2004
-+++ src/makemake.in	Tue Feb 15 21:23:34 2005
-@@ -1550,7 +1550,7 @@
- echol "exec_prefix = ${EXEC_PREFIX}"
- echol "bindir  = \$(exec_prefix)${NEXT_}bin"
- echol "shared  = \$(prefix)${NEXT_}share"
--echol "mandir  = \$(shared)${NEXT_}man"
-+echol "mandir  = \$(prefix)${NEXT_}man"
- echol "docdir  = \$(shared)${NEXT_}doc"
- case "$fsstnd" in
-   suse)
diff -ruN ./pkg-descr /usr/ports/lang/clisp/pkg-descr
--- ./pkg-descr	Wed Feb 16 21:18:01 2005
+++ /usr/ports/lang/clisp/pkg-descr	Sat Feb 12 21:18:18 2000
@@ -15,9 +15,6 @@
 see file COPYRIGHT in the CLISP distribution.
 
 The user interface comes in German, English, French and Spanish, and 
-can be changed at run time.   
+can be change at run time.   
 
-WWW: http://clisp.sourceforge.net/
-
-- Jakub Rehor
-jakub@rehor.net
+WWW: http://clisp.cons.org/
diff -ruN ./pkg-plist /usr/ports/lang/clisp/pkg-plist
--- ./pkg-plist	Mon Feb 14 21:48:40 2005
+++ /usr/ports/lang/clisp/pkg-plist	Sat Dec 25 21:50:50 2004
@@ -10,47 +10,43 @@
 lib/clisp/base/modules.h
 lib/clisp/base/modules.o
 lib/clisp/clisp-link
-lib/clisp/data/UnicodeDataFull.txt
+lib/clisp/data/UnicodeData.txt
 lib/clisp/data/clhs.txt
 lib/clisp/full/libavcall.a
 lib/clisp/full/libcallback.a
-lib/clisp/full/libcharset.a
 lib/clisp/full/libnoreadline.a
+lib/clisp/full/libcharset.a
 lib/clisp/full/lisp.a
 lib/clisp/full/lisp.run
 lib/clisp/full/lispinit.mem
 lib/clisp/full/makevars
 lib/clisp/full/modules.h
 lib/clisp/full/modules.o
+lib/clisp/full/regex.o
 lib/clisp/full/regexi.o
 lib/clisp/full/regexp.dvi
+lib/clisp/full/regexp.o
 lib/clisp/linkkit/clisp.h
-lib/clisp/linkkit/exporting.lisp
-lib/clisp/linkkit/modprep.lisp
 lib/clisp/linkkit/modules.c
 lib/clisp/linkkit/modules.d
-%%PORTDOCS%%%%DOCSDIR%%/ANNOUNCE
-%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
-%%PORTDOCS%%%%DOCSDIR%%/GNU-GPL
-%%PORTDOCS%%%%DOCSDIR%%/MAGIC.add
-%%PORTDOCS%%%%DOCSDIR%%/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.de
-%%PORTDOCS%%%%DOCSDIR%%/README.es
-%%PORTDOCS%%%%DOCSDIR%%/SUMMARY
-%%PORTDOCS%%%%DOCSDIR%%/clisp.dvi
-%%PORTDOCS%%%%DOCSDIR%%/clisp.html
-%%PORTDOCS%%%%DOCSDIR%%/clisp.ps
-%%PORTDOCS%%%%DOCSDIR%%/doc/CLOS-guide.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/LISP-tutorial.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/clisp.1
-%%PORTDOCS%%%%DOCSDIR%%/doc/clisp.dvi
-%%PORTDOCS%%%%DOCSDIR%%/doc/clisp.html
-%%PORTDOCS%%%%DOCSDIR%%/doc/clisp.png
-%%PORTDOCS%%%%DOCSDIR%%/doc/clisp.ps
-%%PORTDOCS%%%%DOCSDIR%%/doc/editors.txt
-%%PORTDOCS%%%%DOCSDIR%%/doc/impnotes.css
-%%PORTDOCS%%%%DOCSDIR%%/doc/impnotes.html
+share/doc/clisp/ANNOUNCE
+share/doc/clisp/COPYRIGHT
+share/doc/clisp/GNU-GPL
+share/doc/clisp/MAGIC.add
+share/doc/clisp/NEWS
+share/doc/clisp/README
+share/doc/clisp/README.de
+share/doc/clisp/README.es
+share/doc/clisp/SUMMARY
+share/doc/clisp/CLOS-guide.txt
+share/doc/clisp/LISP-tutorial.txt
+share/doc/clisp/clisp.1
+share/doc/clisp/clisp.dvi
+share/doc/clisp/clisp.html
+share/doc/clisp/clisp.png
+share/doc/clisp/editors.txt
+share/doc/clisp/impnotes.css
+share/doc/clisp/impnotes.html
 share/locale/de/LC_MESSAGES/clisp.mo
 share/locale/de/LC_MESSAGES/clisplow.mo
 share/locale/en/LC_MESSAGES/clisp.mo
@@ -63,25 +59,18 @@
 share/locale/nl/LC_MESSAGES/clisplow.mo
 share/locale/ru/LC_MESSAGES/clisp.mo
 share/locale/ru/LC_MESSAGES/clisplow.mo
-share/nls/POSIX
-share/nls/en_US.US-ASCII
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/clisp/linkkit
-@dirrm lib/clisp/full
-@dirrm lib/clisp/data
+@dirrm share/doc/clisp
 @dirrm lib/clisp/base
+@dirrm lib/clisp/data
+@dirrm lib/clisp/full
+@dirrm lib/clisp/linkkit
 @dirrm lib/clisp
 @unexec rmdir %D/share/locale/de/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/de 2>/dev/null || true
-@unexec rmdir %D/share/locale/en/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/en 2>/dev/null || true
 @unexec rmdir %D/share/locale/es/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/es 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/fr 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl/LC_MESSAGES 2>/dev/null || true
 @unexec rmdir %D/share/locale/nl 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru/LC_MESSAGES 2>/dev/null || true
-@unexec rmdir %D/share/locale/ru 2>/dev/null || true
 @unexec rmdir %D/share/locale 2>/dev/null || true
--- clisp-diff ends here ---
Comment 4 Sergey Matveychuk freebsd_committer freebsd_triage 2005-03-06 21:22:17 UTC
State Changed
From-To: feedback->closed

Committed, thanks!