Date: Thu, 16 May 2002 01:56:34 +0200 (CEST) From: Oliver Braun <obraun@informatik.unibw-muenchen.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/38127: Update port: lang/logo to 5.1 Message-ID: <20020515235634.71D355A547@nemesis.informatik.unibw-muenchen.de>
next in thread | raw e-mail | index | archive | help
>Number: 38127
>Category: ports
>Synopsis: Update port: lang/logo to 5.1
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Wed May 15 17:10:01 PDT 2002
>Closed-Date:
>Last-Modified:
>Originator: Oliver Braun
>Release: FreeBSD 4.6-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD nemesis.informatik.unibw-muenchen.de 4.6-PRERELEASE FreeBSD 4.6-PRERELEASE #0: Thu May 2 11:59:09 CEST 2002 root@nemesis.informatik.unibw-muenchen.de:/usr/obj/usr/src/sys/NEMESIS_OB i386
>Description:
Update lang/logo from 4.5 to 5.1
added: files/patch-emacs::makefile
removed: files/patch-ad
added to knobs to the port:
* EMACS_LOGO_MODE to build and install the emacs logo mode -> requires emacs to
build
* WITH_FULL_DOCS to build and install ps, pdf and html documentation ->
requires teTeX and ghostscript to build.
If WITH_FULL_DOCS is defined, NOPORTDOCS will be undefined!
Respect NOPORTDOCS otherwise, i.e. the plain text documentation will be
not installed, if NOPORTDOCS is set.
Regards,
Olli
>How-To-Repeat:
>Fix:
diff -ruN logo.old/Makefile logo/Makefile
--- logo.old/Makefile Mon Apr 22 22:34:36 2002
+++ logo/Makefile Thu May 16 01:53:13 2002
@@ -6,16 +6,53 @@
#
PORTNAME= ucblogo
-PORTVERSION= 4.6
+PORTVERSION= 5.1
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://anarres.cs.berkeley.edu/pub/ucblogo/
-MASTER_SITE_SUBDIR= ucblogo
+
+.if defined(EMACS_LOGO_MODE)
+BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs
+.endif
+.if defined(WITH_FULL_DOCS)
+.undef NOPORTDOCS
+BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \
+ ps2pdf:${PORTSDIR}/print/ghostscript-gnu
+.endif
MAINTAINER= ports@FreeBSD.org
USE_XLIB= yes
MAKEFILE= makefile
HAS_CONFIGURE= yes
+
+ALL_TARGET= all
+
+.if defined(WITH_FULL_DOCS)
+ALL_TARGET+= docs
+PLIST_SUB+= WITH_FULL_DOCS=""
+.else
+PLIST_SUB+= WITH_FULL_DOCS="@comment "
+.endif
+
+.if defined(EMACS_LOGO_MODE)
+ALL_TARGET+= logo-mode
+PLIST_SUB+= EMACS_LOGO_MODE=""
+.else
+PLIST_SUB+= EMACS_LOGO_MODE="@comment "
+.endif
+
+pre-fetch:
+.if !defined(EMACS_LOGO_MODE)
+ @${ECHO} ""
+ @${ECHO} " Define EMACS_LOGO_MODE to build the emacs logo mode"
+ @${ECHO} ""
+.endif
+.if !defined(WITH_FULL_DOCS)
+ @${ECHO} ""
+ @${ECHO} " Define WITH_FULL_DOCS to build ps, pdf and html docs"
+ @${ECHO} " This requires teTeX and ghostscript !"
+ @${ECHO} ""
+.endif
.include <bsd.port.mk>
diff -ruN logo.old/distinfo logo/distinfo
--- logo.old/distinfo Mon Jun 21 15:56:46 1999
+++ logo/distinfo Sun May 12 11:04:52 2002
@@ -1 +1 @@
-MD5 (ucblogo-4.6.tar.gz) = d327af6a037e1ec0b8d06064b728e3f5
+MD5 (ucblogo-5.1.tar.gz) = 374b78cc020530c9b8bb7d9190f69597
diff -ruN logo.old/files/patch-ac logo/files/patch-ac
--- logo.old/files/patch-ac Mon Jun 21 15:56:49 1999
+++ logo/files/patch-ac Thu May 16 00:56:30 2002
@@ -1,5 +1,5 @@
-*** makefile.in.orig Tue Jan 6 20:35:51 1998
---- makefile.in Mon Jun 21 15:43:33 1999
+*** makefile.in.orig Wed Jul 25 19:29:35 2001
+--- makefile.in Thu May 16 00:56:26 2002
***************
*** 2,10 ****
CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -O0
@@ -26,16 +26,37 @@
# LIBLOC = `pwd`
***************
-*** 56,62 ****
- rm makefile makehelp logo *.o libloc.c
+*** 18,24 ****
+
+ HDRS = globals.h logo.h xgraphics.h
+
+! all: logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
+
+ mem.o: mem.c
+ $(CC) $(CFLAGS) -O0 -c mem.c
+--- 22,28 ----
+
+ HDRS = globals.h logo.h xgraphics.h
+
+! all: logo logolib helpfiles helpfiles/HELPCONTENTS
+
+ mem.o: mem.c
+ $(CC) $(CFLAGS) -O0 -c mem.c
+***************
+*** 62,72 ****
+ cd emacs; gmake ship
install: all
! for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles; do [ -d $$d ] || mkdir -p $$d || exit 1; done
! cp logo $(BINDIR)/.
-! cp logolib/* $(LIBLOC)/logolib/.
-! cp helpfiles/* $(LIBLOC)/helpfiles/.
---- 60,70 ----
- rm makefile makehelp logo *.o libloc.c
+! cp -f logolib/* $(LIBLOC)/logolib/.
+! cp -f helpfiles/* $(LIBLOC)/helpfiles/.
+! export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake install
+
+ logo-mode:
+ @export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake
+--- 66,85 ----
+ cd emacs; gmake ship
install: all
! for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(XMPDIR)/csls $(DOCDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
@@ -46,3 +67,12 @@
! .ifndef NOPORTDOCS
! install -c -o bin -g bin -m 444 usermanual $(DOCDIR)/
! .endif
+! .ifdef WITH_FULL_DOCS
+! @export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake install-docs
+! .endif
+! .ifdef EMACS_LOGO_MODE
+! export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake install-emacs
+! .endif
+
+ logo-mode:
+ @export prefix=$(prefix); export LIBLOC=$(LIBLOC); export BINDIR=$(BINDIR); cd emacs; gmake
diff -ruN logo.old/files/patch-ad logo/files/patch-ad
--- logo.old/files/patch-ad Tue Aug 8 05:10:50 2000
+++ logo/files/patch-ad Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- init.c.orig Sun Aug 6 21:20:35 2000
-+++ init.c Sun Aug 6 21:20:50 2000
-@@ -363,7 +363,7 @@
- }
-
- void init(void) {
-- extern long time();
-+ extern time_t time();
- int i = 0;
- NODE *proc = NIL, *pname = NIL, *cnd = NIL;
-
diff -ruN logo.old/files/patch-emacs::makefile logo/files/patch-emacs::makefile
--- logo.old/files/patch-emacs::makefile Thu Jan 1 01:00:00 1970
+++ logo/files/patch-emacs::makefile Thu May 16 01:08:21 2002
@@ -0,0 +1,39 @@
+--- emacs/makefile.orig Wed Jul 25 00:54:03 2001
++++ emacs/makefile Thu May 16 01:08:12 2002
+@@ -1,7 +1,7 @@
+ BUILDIR = `pwd`
+-INFODIR = $(prefix)/info
++INFODIR = $(PREFIX)/info
+ EMACSDIR = $(LIBLOC)/emacs
+-DOCSDIR = $(LIBLOC)/docs
++DOCSDIR = $(PREFIX)/share/doc/logo
+ HTMLDIR = $(DOCSDIR)/html
+ LOADPATH = $(subst X,$(EMACSDIR),(setq load-path (cons "\"X\"" load-path)))
+ LOGOBIN = $(subst X,$(BINDIR),(setq logo-binary-name \"X/logo\"))
+@@ -63,9 +63,8 @@
+ -rm -f add.user install-logo-mode dot.emacs dot.loops *.elc
+ -rm -f docs/*.{aux,cp,cps,dvi,fn,ky,log,pg,toc,tp,vr}
+
+-install: all
+- for d in $(INFODIR) $(EMACSDIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
+- cp -f info/* $(INFODIR)/.
++install-emacs:
++ for d in $(EMACSDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
+ cp -f logo.* $(EMACSDIR)/.
+ cp -f letrec.* $(EMACSDIR)/.
+ cp -f comint*.* $(EMACSDIR)/.
+@@ -78,10 +77,13 @@
+ cp -p install-logo-mode $(BINDIR)/.
+ cp -f edfunc.el $(EMACSDIR)/.
+ cp -f check.lg $(EMACSDIR)/.
++
++install-docs:
++ for d in $(INFODIR) $(DOCSDIR) $(HTMLDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
++ cp -f info/* $(INFODIR)/.
+ -cp -f docs/*.info* $(INFODIR)/.
+ -cp -f docs/*.html $(HTMLDIR)/.
+ -cp -f docs/usermanual.ps $(DOCSDIR)/.
+ -cp -f docs/usermanual.pdf $(DOCSDIR)/.
+ -cp -f docs/usermanual.texi $(DOCSDIR)/.
+-
+
diff -ruN logo.old/pkg-plist logo/pkg-plist
--- logo.old/pkg-plist Mon Jun 21 15:56:51 1999
+++ logo/pkg-plist Thu May 16 01:22:24 2002
@@ -1,7 +1,9 @@
bin/logo
+%%EMACS_LOGO_MODE%%bin/install-logo-mode
lib/logo/logolib/#
lib/logo/logolib/`
-lib/logo/logolib/arraytolist
+lib/logo/logolib/?rest
+lib/logo/logolib/Messages
lib/logo/logolib/buryall
lib/logo/logolib/buryname
lib/logo/logolib/cascade
@@ -32,7 +34,6 @@
lib/logo/logolib/ignore
lib/logo/logolib/invoke
lib/logo/logolib/iseq
-lib/logo/logolib/listtoarray
lib/logo/logolib/localmake
lib/logo/logolib/macroexpand
lib/logo/logolib/map.se
@@ -69,9 +70,23 @@
lib/logo/logolib/while
lib/logo/logolib/xcor
lib/logo/logolib/ycor
+%%EMACS_LOGO_MODE%%lib/logo/emacs/.LOOPS
+%%EMACS_LOGO_MODE%%lib/logo/emacs/.logo
+%%EMACS_LOGO_MODE%%lib/logo/emacs/README
+%%EMACS_LOGO_MODE%%lib/logo/emacs/check.lg
+%%EMACS_LOGO_MODE%%lib/logo/emacs/comint-logo.el
+%%EMACS_LOGO_MODE%%lib/logo/emacs/comint-logo.elc
+%%EMACS_LOGO_MODE%%lib/logo/emacs/dot.emacs
+%%EMACS_LOGO_MODE%%lib/logo/emacs/dot.loops
+%%EMACS_LOGO_MODE%%lib/logo/emacs/edfunc.el
+%%EMACS_LOGO_MODE%%lib/logo/emacs/letrec.el
+%%EMACS_LOGO_MODE%%lib/logo/emacs/logo.el
+%%EMACS_LOGO_MODE%%lib/logo/emacs/tutor1.lg
+%%EMACS_LOGO_MODE%%lib/logo/emacs/tutorial.lg
lib/logo/helpfiles/HELPCONTENTS
lib/logo/helpfiles/`
lib/logo/helpfiles/allopen
+lib/logo/helpfiles/allowgetset
lib/logo/helpfiles/and
lib/logo/helpfiles/apply
lib/logo/helpfiles/arc
@@ -95,6 +110,7 @@
lib/logo/helpfiles/bk
lib/logo/helpfiles/bl
lib/logo/helpfiles/buried
+lib/logo/helpfiles/buriedp
lib/logo/helpfiles/bury
lib/logo/helpfiles/buryall
lib/logo/helpfiles/buryname
@@ -103,7 +119,6 @@
lib/logo/helpfiles/butlast
lib/logo/helpfiles/bye
lib/logo/helpfiles/cascade
-lib/logo/helpfiles/cascaded2
lib/logo/helpfiles/caseignoredp
lib/logo/helpfiles/catch
lib/logo/helpfiles/char
@@ -173,10 +188,12 @@
lib/logo/helpfiles/firsts
lib/logo/helpfiles/for
lib/logo/helpfiles/foreach
+lib/logo/helpfiles/forever
lib/logo/helpfiles/form
lib/logo/helpfiles/forward
lib/logo/helpfiles/fput
lib/logo/helpfiles/fs
+lib/logo/helpfiles/fullprintp
lib/logo/helpfiles/fullscreen
lib/logo/helpfiles/fulltext
lib/logo/helpfiles/gc
@@ -224,7 +241,6 @@
lib/logo/helpfiles/make
lib/logo/helpfiles/map
lib/logo/helpfiles/mapdse
-lib/logo/helpfiles/not
lib/logo/helpfiles/mdarray
lib/logo/helpfiles/mditem
lib/logo/helpfiles/mdsetitem
@@ -239,6 +255,7 @@
lib/logo/helpfiles/nodes
lib/logo/helpfiles/nodribble
lib/logo/helpfiles/norefresh
+lib/logo/helpfiles/not
lib/logo/helpfiles/numberp
lib/logo/helpfiles/op
lib/logo/helpfiles/openappend
@@ -266,6 +283,7 @@
lib/logo/helpfiles/penup
lib/logo/helpfiles/pick
lib/logo/helpfiles/plist
+lib/logo/helpfiles/plistp
lib/logo/helpfiles/plists
lib/logo/helpfiles/pllist
lib/logo/helpfiles/po
@@ -283,6 +301,7 @@
lib/logo/helpfiles/pprop
lib/logo/helpfiles/ppt
lib/logo/helpfiles/pr
+lib/logo/helpfiles/prefix
lib/logo/helpfiles/primitivep
lib/logo/helpfiles/print
lib/logo/helpfiles/printdepthlimit
@@ -308,6 +327,7 @@
lib/logo/helpfiles/reader
lib/logo/helpfiles/readlist
lib/logo/helpfiles/readpos
+lib/logo/helpfiles/readrawline
lib/logo/helpfiles/readword
lib/logo/helpfiles/redefp
lib/logo/helpfiles/reduce
@@ -346,9 +366,10 @@
lib/logo/helpfiles/setpc
lib/logo/helpfiles/setpen
lib/logo/helpfiles/setpencolor
-lib/logo/helpfiles/setpensize
lib/logo/helpfiles/setpenpattern
+lib/logo/helpfiles/setpensize
lib/logo/helpfiles/setpos
+lib/logo/helpfiles/setprefix
lib/logo/helpfiles/setread
lib/logo/helpfiles/setreadpos
lib/logo/helpfiles/setscrunch
@@ -371,6 +392,8 @@
lib/logo/helpfiles/standout
lib/logo/helpfiles/startup
lib/logo/helpfiles/step
+lib/logo/helpfiles/stepped
+lib/logo/helpfiles/steppedp
lib/logo/helpfiles/stop
lib/logo/helpfiles/substringp
lib/logo/helpfiles/sum
@@ -383,12 +406,15 @@
lib/logo/helpfiles/to
lib/logo/helpfiles/towards
lib/logo/helpfiles/trace
+lib/logo/helpfiles/traced
+lib/logo/helpfiles/tracedp
lib/logo/helpfiles/transfer
lib/logo/helpfiles/ts
lib/logo/helpfiles/type
lib/logo/helpfiles/unbury
lib/logo/helpfiles/unburyall
lib/logo/helpfiles/unburyname
+lib/logo/helpfiles/unburyonedit
lib/logo/helpfiles/unstep
lib/logo/helpfiles/until
lib/logo/helpfiles/untrace
@@ -403,7 +429,41 @@
lib/logo/helpfiles/writer
lib/logo/helpfiles/xcor
lib/logo/helpfiles/ycor
-share/doc/logo/usermanual
+%%PORTDOCS%%share/doc/logo/usermanual
+%%WITH_FULL_DOCS%%info/ucblogo.info
+%%WITH_FULL_DOCS%%info/ucblogo.info-1
+%%WITH_FULL_DOCS%%info/ucblogo.info-2
+%%WITH_FULL_DOCS%%info/ucblogo.info-3
+%%WITH_FULL_DOCS%%info/ucblogo.info-4
+%%WITH_FULL_DOCS%%info/loops.info.gz
+%%WITH_FULL_DOCS%%info/loops.info-1.gz
+%%WITH_FULL_DOCS%%info/loops.info-2.gz
+%%WITH_FULL_DOCS%%info/loops.info-3.gz
+%%WITH_FULL_DOCS%%info/loops.info-4.gz
+%%WITH_FULL_DOCS%%info/loops.info-5.gz
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_1.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_10.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_11.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_12.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_13.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_14.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_15.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_2.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_3.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_4.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_5.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_6.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_7.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_8.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_9.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_abt.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_fot.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_ovr.html
+%%WITH_FULL_DOCS%%share/doc/logo/html/usermanual_toc.html
+%%WITH_FULL_DOCS%%share/doc/logo/usermanual.pdf
+%%WITH_FULL_DOCS%%share/doc/logo/usermanual.ps
+%%WITH_FULL_DOCS%%share/doc/logo/usermanual.texi
share/examples/logo/csls/algs
share/examples/logo/csls/basic
share/examples/logo/csls/cards
@@ -427,7 +487,9 @@
share/examples/logo/csls/ttt
@dirrm lib/logo/helpfiles
@dirrm lib/logo/logolib
+%%EMACS_LOGO_MODE%%@dirrm lib/logo/emacs
@dirrm lib/logo
@dirrm share/examples/logo/csls
@dirrm share/examples/logo
-@dirrm share/doc/logo
+%%WITH_FULL_DOCS%%@dirrm share/doc/logo/html
+%%PORTDOCS%%@dirrm share/doc/logo
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20020515235634.71D355A547>