Date: Sat, 26 Feb 2005 23:16:48 +1100 (EST) From: Sam Lawrance <boris@brooknet.com.au> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/78113: [PATCH] lang/ucblogo: update to 5.4 (fix unfetchable) Message-ID: <20050226121648.8935716E1@localhost> Resent-Message-ID: <200502261220.j1QCKHaH020698@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 78113
>Category: ports
>Synopsis: [PATCH] lang/ucblogo: update to 5.4 (fix unfetchable)
>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: Sat Feb 26 12:20:16 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Sam Lawrance
>Release: FreeBSD 5.3-STABLE i386
>Organization:
>Environment:
System: FreeBSD dirk.no.domain 5.3-STABLE FreeBSD 5.3-STABLE #3: Wed Feb 9 00:12:24 EST
>Description:
- Update to 5.4
Other changes:
- Prebuilt docs come with distfile, don't build them anymore ...
- ... except for the .info file. The prebuilt versions are numbered.
- Obey NOPORTDOCS, with the exception of runtime help docs which are always
installed. Use PORTDOCS.
- Use DOCSDIR, EXAMPLESDIR
- ALL and INSTALL targets are used to choose what is built/installed
>How-To-Repeat:
>Fix:
--- ucblogo-5.4.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/lang/logo/Makefile,v
retrieving revision 1.31
diff -u -u -r1.31 Makefile
--- Makefile 10 Apr 2004 17:26:42 -0000 1.31
+++ Makefile 26 Feb 2005 11:14:13 -0000
@@ -6,84 +6,47 @@
#
PORTNAME= ucblogo
-PORTVERSION= 5.2
+PORTVERSION= 5.4
CATEGORIES= lang
-MASTER_SITES= ${MASTER_SITE_GNU} \
- ftp://ftp.cs.berkeley.edu/pub/ucblogo/
-MASTER_SITE_SUBDIR=non-gnu/ucblogo
+MASTER_SITES= ftp://ftp.cs.berkeley.edu/pub/ucblogo/
MAINTAINER= ports@FreeBSD.org
COMMENT= Brian Harvey's logo language interpreter
-.if defined(EMACS_LOGO_MODE)
-BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs19
-.endif
-.if defined(WITH_FULL_DOCS)
-.undef NOPORTDOCS
-
-BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \
- ps2pdf:${PORTSDIR}/${GHOSTSCRIPT_PORT}
-.endif
-
USE_XLIB= yes
MAKEFILE= makefile
HAS_CONFIGURE= yes
-
ALL_TARGET= all
-
-.if defined(WITH_FULL_DOCS) || defined(EMACS_LOGO_MODE)
+INSTALL_TARGET= install
USE_GMAKE= yes
-MAKE_ENV+= LIBLOC="${PREFIX}/lib/logo" BINDIR="${PREFIX}/bin"
-.endif
+MAKE_ENV= DOCSDIR=${DOCSDIR} \
+ INFODIR=${PREFIX}/${INFO_PATH} \
+ EXAMPLESDIR=${EXAMPLESDIR}
-.if defined(WITH_FULL_DOCS)
-ALL_TARGET+= docs
-PLIST_SUB+= WITH_FULL_DOCS=""
-.else
-PLIST_SUB+= WITH_FULL_DOCS="@comment "
+pre-everything::
+.if !defined(EMACS_LOGO_MODE)
+ @${ECHO_MSG} ""
+ @${ECHO_MSG} " Define EMACS_LOGO_MODE to build the emacs logo mode"
+ @${ECHO_MSG} ""
.endif
.if defined(EMACS_LOGO_MODE)
+EMACS_PORT_NAME?=emacs21
ALL_TARGET+= logo-mode
+INSTALL_TARGET+=logo-mode-install
PLIST_SUB+= EMACS_LOGO_MODE=""
.else
PLIST_SUB+= EMACS_LOGO_MODE="@comment "
.endif
-pre-everything::
-.if !defined(EMACS_LOGO_MODE)
- @${ECHO_MSG} ""
- @${ECHO_MSG} " Define EMACS_LOGO_MODE to build the emacs logo mode"
- @${ECHO_MSG} ""
-.endif
-.if !defined(WITH_FULL_DOCS)
- @${ECHO_MSG} ""
- @${ECHO_MSG} " Define WITH_FULL_DOCS to build ps, pdf and html docs"
- @${ECHO_MSG} " This requires teTeX and ghostscript !"
-.if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
- @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use"
- @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one"
-.endif
- @${ECHO_MSG} ""
-.endif
-
-do-install:
-.for d in lib/logo lib/logo/logolib \
- lib/logo/helpfiles share/examples/logo/csls
- ${MKDIR} ${PREFIX}/$d
-.endfor
- ${INSTALL_PROGRAM} ${WRKSRC}/logo ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/logolib/* ${PREFIX}/lib/logo/logolib/
- ${INSTALL_DATA} ${WRKSRC}/helpfiles/* ${PREFIX}/lib/logo/helpfiles/
- ${INSTALL_DATA} ${WRKSRC}/csls/* ${PREFIX}/share/examples/logo/csls/
.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_DATA} ${WRKSRC}/usermanual ${DOCSDIR}
-.endif
-.if defined(WITH_FULL_DOCS)
- cd ${WRKSRC}/emacs/ ;${SETENV} ${MAKE_ENV} ${GMAKE} install-docs
-.endif
-.ifdef defined(EMACS_LOGO_MODE)
- cd ${WRKSRC}/emacs; ${SETENV} ${MAKE_ENV} ${GMAKE} install-emacs
+ALL_TARGET+= make-docs
+INSTALL_TARGET+=docs-install
+INFO= ucblogo
+PORTDOCS= *
.endif
+
+post-patch:
+ @${RM} ${WRKSRC}/docs/*.info*
+
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/lang/logo/distinfo,v
retrieving revision 1.8
diff -u -u -r1.8 distinfo
--- distinfo 29 Jan 2004 07:24:45 -0000 1.8
+++ distinfo 25 Feb 2005 15:19:05 -0000
@@ -1,2 +1,2 @@
-MD5 (ucblogo-5.2.tar.gz) = 53af869602ede043aaf4af31c2035d87
-SIZE (ucblogo-5.2.tar.gz) = 1180105
+MD5 (ucblogo-5.4.tar.gz) = d0617473e165ad19d3157d9e867e2f8d
+SIZE (ucblogo-5.4.tar.gz) = 1262512
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/lang/logo/pkg-plist,v
retrieving revision 1.6
diff -u -u -r1.6 pkg-plist
--- pkg-plist 3 Jul 2003 14:19:01 -0000 1.6
+++ pkg-plist 26 Feb 2005 12:04:49 -0000
@@ -89,427 +89,31 @@
%%EMACS_LOGO_MODE%%lib/logo/emacs/logo.elc
%%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
-lib/logo/helpfiles/arctan
-lib/logo/helpfiles/arity
-lib/logo/helpfiles/array
-lib/logo/helpfiles/arrayp
-lib/logo/helpfiles/arraytolist
-lib/logo/helpfiles/ascii
-lib/logo/helpfiles/ashift
-lib/logo/helpfiles/back
-lib/logo/helpfiles/background
-lib/logo/helpfiles/backslashedp
-lib/logo/helpfiles/beforep
-lib/logo/helpfiles/bf
-lib/logo/helpfiles/bfs
-lib/logo/helpfiles/bg
-lib/logo/helpfiles/bitand
-lib/logo/helpfiles/bitnot
-lib/logo/helpfiles/bitor
-lib/logo/helpfiles/bitxor
-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
-lib/logo/helpfiles/butfirst
-lib/logo/helpfiles/butfirsts
-lib/logo/helpfiles/butlast
-lib/logo/helpfiles/bye
-lib/logo/helpfiles/cascade
-lib/logo/helpfiles/case
-lib/logo/helpfiles/caseignoredp
-lib/logo/helpfiles/catch
-lib/logo/helpfiles/char
-lib/logo/helpfiles/clean
-lib/logo/helpfiles/clearscreen
-lib/logo/helpfiles/cleartext
-lib/logo/helpfiles/close
-lib/logo/helpfiles/closeall
-lib/logo/helpfiles/co
-lib/logo/helpfiles/combine
-lib/logo/helpfiles/cond
-lib/logo/helpfiles/contents
-lib/logo/helpfiles/continue
-lib/logo/helpfiles/copydef
-lib/logo/helpfiles/cos
-lib/logo/helpfiles/count
-lib/logo/helpfiles/crossmap
-lib/logo/helpfiles/cs
-lib/logo/helpfiles/ct
-lib/logo/helpfiles/cursor
-lib/logo/helpfiles/ddefmacro
-lib/logo/helpfiles/define
-lib/logo/helpfiles/definedp
-lib/logo/helpfiles/deq
-lib/logo/helpfiles/dequeue
-lib/logo/helpfiles/difference
-lib/logo/helpfiles/dmacro
-lib/logo/helpfiles/dmaybeoutput
-lib/logo/helpfiles/doduntil
-lib/logo/helpfiles/dodwhile
-lib/logo/helpfiles/dribble
-lib/logo/helpfiles/dsetbf
-lib/logo/helpfiles/dsetfirst
-lib/logo/helpfiles/dsetitem
-lib/logo/helpfiles/dsetsegmentsize
-lib/logo/helpfiles/ed
-lib/logo/helpfiles/edall
-lib/logo/helpfiles/edit
-lib/logo/helpfiles/editfile
-lib/logo/helpfiles/edn
-lib/logo/helpfiles/edns
-lib/logo/helpfiles/edpl
-lib/logo/helpfiles/edpls
-lib/logo/helpfiles/edps
-lib/logo/helpfiles/emptyp
-lib/logo/helpfiles/eofp
-lib/logo/helpfiles/epspict
-lib/logo/helpfiles/equalp
-lib/logo/helpfiles/er
-lib/logo/helpfiles/erall
-lib/logo/helpfiles/erase
-lib/logo/helpfiles/erasefile
-lib/logo/helpfiles/erf
-lib/logo/helpfiles/ern
-lib/logo/helpfiles/erns
-lib/logo/helpfiles/erpl
-lib/logo/helpfiles/erpls
-lib/logo/helpfiles/erps
-lib/logo/helpfiles/erract
-lib/logo/helpfiles/error
-lib/logo/helpfiles/exp
-lib/logo/helpfiles/fd
-lib/logo/helpfiles/fence
-lib/logo/helpfiles/filep
-lib/logo/helpfiles/fill
-lib/logo/helpfiles/filter
-lib/logo/helpfiles/find
-lib/logo/helpfiles/first
-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
-lib/logo/helpfiles/gensym
-lib/logo/helpfiles/global
-lib/logo/helpfiles/goto
-lib/logo/helpfiles/gprop
-lib/logo/helpfiles/greaterp
-lib/logo/helpfiles/heading
-lib/logo/helpfiles/help
-lib/logo/helpfiles/hideturtle
-lib/logo/helpfiles/home
-lib/logo/helpfiles/ht
-lib/logo/helpfiles/if
-lib/logo/helpfiles/ifelse
-lib/logo/helpfiles/iff
-lib/logo/helpfiles/iffalse
-lib/logo/helpfiles/ift
-lib/logo/helpfiles/iftrue
-lib/logo/helpfiles/ignore
-lib/logo/helpfiles/int
-lib/logo/helpfiles/invoke
-lib/logo/helpfiles/iseq
-lib/logo/helpfiles/item
-lib/logo/helpfiles/keyp
-lib/logo/helpfiles/label
-lib/logo/helpfiles/last
-lib/logo/helpfiles/left
-lib/logo/helpfiles/lessp
-lib/logo/helpfiles/list
-lib/logo/helpfiles/listp
-lib/logo/helpfiles/listtoarray
-lib/logo/helpfiles/ln
-lib/logo/helpfiles/load
-lib/logo/helpfiles/loadnoisily
-lib/logo/helpfiles/loadpict
-lib/logo/helpfiles/local
-lib/logo/helpfiles/localmake
-lib/logo/helpfiles/log10
-lib/logo/helpfiles/lowercase
-lib/logo/helpfiles/lput
-lib/logo/helpfiles/lshift
-lib/logo/helpfiles/lt
-lib/logo/helpfiles/macroexpand
-lib/logo/helpfiles/macrop
-lib/logo/helpfiles/make
-lib/logo/helpfiles/map
-lib/logo/helpfiles/mapdse
-lib/logo/helpfiles/mdarray
-lib/logo/helpfiles/mditem
-lib/logo/helpfiles/mdsetitem
-lib/logo/helpfiles/member
-lib/logo/helpfiles/memberp
-lib/logo/helpfiles/minus
-lib/logo/helpfiles/modulo
-lib/logo/helpfiles/name
-lib/logo/helpfiles/namelist
-lib/logo/helpfiles/namep
-lib/logo/helpfiles/names
-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
-lib/logo/helpfiles/openread
-lib/logo/helpfiles/openupdate
-lib/logo/helpfiles/openwrite
-lib/logo/helpfiles/or
-lib/logo/helpfiles/output
-lib/logo/helpfiles/palette
-lib/logo/helpfiles/parse
-lib/logo/helpfiles/pause
-lib/logo/helpfiles/pc
-lib/logo/helpfiles/pd
-lib/logo/helpfiles/pe
-lib/logo/helpfiles/pen
-lib/logo/helpfiles/pencolor
-lib/logo/helpfiles/pendown
-lib/logo/helpfiles/pendownp
-lib/logo/helpfiles/penerase
-lib/logo/helpfiles/penmode
-lib/logo/helpfiles/penpaint
-lib/logo/helpfiles/penpattern
-lib/logo/helpfiles/penreverse
-lib/logo/helpfiles/pensize
-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
-lib/logo/helpfiles/poall
-lib/logo/helpfiles/pon
-lib/logo/helpfiles/pons
-lib/logo/helpfiles/pop
-lib/logo/helpfiles/popl
-lib/logo/helpfiles/popls
-lib/logo/helpfiles/pops
-lib/logo/helpfiles/pos
-lib/logo/helpfiles/pot
-lib/logo/helpfiles/pots
-lib/logo/helpfiles/power
-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
-lib/logo/helpfiles/printwidthlimit
-lib/logo/helpfiles/procedurep
-lib/logo/helpfiles/procedures
-lib/logo/helpfiles/product
-lib/logo/helpfiles/pu
-lib/logo/helpfiles/push
-lib/logo/helpfiles/px
-lib/logo/helpfiles/queue
-lib/logo/helpfiles/quoted
-lib/logo/helpfiles/quotient
-lib/logo/helpfiles/radarctan
-lib/logo/helpfiles/radcos
-lib/logo/helpfiles/radsin
-lib/logo/helpfiles/random
-lib/logo/helpfiles/rawascii
-lib/logo/helpfiles/rc
-lib/logo/helpfiles/rcs
-lib/logo/helpfiles/readchar
-lib/logo/helpfiles/readchars
-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
-lib/logo/helpfiles/refresh
-lib/logo/helpfiles/remainder
-lib/logo/helpfiles/remdup
-lib/logo/helpfiles/remove
-lib/logo/helpfiles/remprop
-lib/logo/helpfiles/repcount
-lib/logo/helpfiles/repeat
-lib/logo/helpfiles/rerandom
-lib/logo/helpfiles/reverse
-lib/logo/helpfiles/right
-lib/logo/helpfiles/rl
-lib/logo/helpfiles/round
-lib/logo/helpfiles/rseq
-lib/logo/helpfiles/rt
-lib/logo/helpfiles/run
-lib/logo/helpfiles/runparse
-lib/logo/helpfiles/runresult
-lib/logo/helpfiles/rw
-lib/logo/helpfiles/save
-lib/logo/helpfiles/savel
-lib/logo/helpfiles/savepict
-lib/logo/helpfiles/screenmode
-lib/logo/helpfiles/scrunch
-lib/logo/helpfiles/se
-lib/logo/helpfiles/sentence
-lib/logo/helpfiles/setbackground
-lib/logo/helpfiles/setbg
-lib/logo/helpfiles/setcursor
-lib/logo/helpfiles/seteditor
-lib/logo/helpfiles/seth
-lib/logo/helpfiles/setheading
-lib/logo/helpfiles/sethelploc
-lib/logo/helpfiles/setitem
-lib/logo/helpfiles/setlibloc
-lib/logo/helpfiles/setmargins
-lib/logo/helpfiles/setpalette
-lib/logo/helpfiles/setpc
-lib/logo/helpfiles/setpen
-lib/logo/helpfiles/setpencolor
-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
-lib/logo/helpfiles/settc
-lib/logo/helpfiles/settemploc
-lib/logo/helpfiles/settextcolor
-lib/logo/helpfiles/setwrite
-lib/logo/helpfiles/setwritepos
-lib/logo/helpfiles/setx
-lib/logo/helpfiles/setxy
-lib/logo/helpfiles/sety
-lib/logo/helpfiles/shell
-lib/logo/helpfiles/show
-lib/logo/helpfiles/shownp
-lib/logo/helpfiles/showturtle
-lib/logo/helpfiles/sin
-lib/logo/helpfiles/splitscreen
-lib/logo/helpfiles/sqrt
-lib/logo/helpfiles/ss
-lib/logo/helpfiles/st
-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
-lib/logo/helpfiles/tag
-lib/logo/helpfiles/test
-lib/logo/helpfiles/text
-lib/logo/helpfiles/textscreen
-lib/logo/helpfiles/thing
-lib/logo/helpfiles/throw
-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/turtlemode
-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
-lib/logo/helpfiles/uppercase
-lib/logo/helpfiles/usealternatenames
-lib/logo/helpfiles/wait
-lib/logo/helpfiles/while
-lib/logo/helpfiles/window
-lib/logo/helpfiles/word
-lib/logo/helpfiles/wordp
-lib/logo/helpfiles/wrap
-lib/logo/helpfiles/writepos
-lib/logo/helpfiles/writer
-lib/logo/helpfiles/xcor
-lib/logo/helpfiles/ycor
-%%PORTDOCS%%%%DOCSDIR%%/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/ucblogo.info-5
-%%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_16.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
-share/examples/logo/csls/crypto
-share/examples/logo/csls/diff
-share/examples/logo/csls/doctor
-share/examples/logo/csls/format
-share/examples/logo/csls/fsm
-share/examples/logo/csls/match
-share/examples/logo/csls/math
-share/examples/logo/csls/multi
-share/examples/logo/csls/pascal
-share/examples/logo/csls/playfair
-share/examples/logo/csls/plot
-share/examples/logo/csls/poker
-share/examples/logo/csls/pour
-share/examples/logo/csls/psort
-share/examples/logo/csls/solitaire
-share/examples/logo/csls/student
-share/examples/logo/csls/tower
-share/examples/logo/csls/ttt
-@dirrm lib/logo/helpfiles
-@dirrm lib/logo/logolib
+lib/logo/logolib/havemake
+lib/logo/logolib/extract
+%%EXAMPLESDIR%%/csls/algs
+%%EXAMPLESDIR%%/csls/tower
+%%EXAMPLESDIR%%/csls/student
+%%EXAMPLESDIR%%/csls/solitaire
+%%EXAMPLESDIR%%/csls/psort
+%%EXAMPLESDIR%%/csls/pour
+%%EXAMPLESDIR%%/csls/poker
+%%EXAMPLESDIR%%/csls/plot
+%%EXAMPLESDIR%%/csls/playfair
+%%EXAMPLESDIR%%/csls/pascal
+%%EXAMPLESDIR%%/csls/multi
+%%EXAMPLESDIR%%/csls/math
+%%EXAMPLESDIR%%/csls/match
+%%EXAMPLESDIR%%/csls/fsm
+%%EXAMPLESDIR%%/csls/format
+%%EXAMPLESDIR%%/csls/doctor
+%%EXAMPLESDIR%%/csls/diff
+%%EXAMPLESDIR%%/csls/crypto
+%%EXAMPLESDIR%%/csls/cards
+%%EXAMPLESDIR%%/csls/basic
+%%EXAMPLESDIR%%/csls/ttt
%%EMACS_LOGO_MODE%%@dirrm lib/logo/emacs
+@dirrm lib/logo/logolib
@dirrm lib/logo
-@dirrm share/examples/logo/csls
-@dirrm share/examples/logo
-%%WITH_FULL_DOCS%%@dirrm %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%EXAMPLESDIR%%/csls
+@dirrm %%EXAMPLESDIR%%
Index: files/patch-ac
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/lang/logo/files/patch-ac,v
retrieving revision 1.4
diff -u -u -r1.4 patch-ac
--- files/patch-ac 10 Nov 2002 17:51:53 -0000 1.4
+++ files/patch-ac 26 Feb 2005 11:08:59 -0000
@@ -1,25 +1,68 @@
---- makefile.in.orig Thu Sep 12 00:02:00 2002
-+++ makefile.in Sat Nov 9 20:48:38 2002
-@@ -2,9 +2,10 @@
+--- makefile.in.orig Wed Dec 1 03:11:07 2004
++++ makefile.in Sat Feb 26 22:08:47 2005
+@@ -2,9 +2,12 @@
CFLAGS = @CFLAGS@ @CPPFLAGS@ @X_CFLAGS@ -O0
LDFLAGS = @LDFLAGS@
LIBS = @X_PRE_LIBS@ @X_LIBS@ @LIBS@ @X_EXTRA_LIBS@
-prefix = @prefix@
-BINDIR = $(prefix)/bin
-LIBLOC = $(prefix)/lib/logo
-+
+BINDIR = $(PREFIX)/bin
+LIBLOC = $(PREFIX)/lib/logo
-+XMPDIR = $(PREFIX)/share/examples/logo
++DOCSDIR ?= $(PREFIX)/share/doc/logo
++INFODIR ?= $(PREFIX)/share/info
++EXAMPLESDIR ?= $(PREFIX)/share/examples/logo
++
+ MAKE = @MAKE@
# LIBLOC = `pwd`
-
-@@ -18,7 +22,7 @@
+@@ -19,7 +22,7 @@
HDRS = globals.h logo.h xgraphics.h
--all: logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
-+all: logo logolib helpfiles helpfiles/HELPCONTENTS
+-all: logo logolib/Messages helpfiles helpfiles/HELPCONTENTS logo-mode make-docs
++all: logo logolib/Messages helpfiles helpfiles/HELPCONTENTS
mem.o: mem.c
$(CC) $(CFLAGS) -O0 -c mem.c
+@@ -33,8 +36,8 @@
+
+ libloc.c:
+ echo 'char *libloc="'$(LIBLOC)'/logolib";' > libloc.c
+- echo 'char *helploc="'$(LIBLOC)'/helpfiles";' >> libloc.c
+- echo 'char *cslsloc="'$(LIBLOC)'/csls";' >> libloc.c
++ echo 'char *helploc="'$(DOCSDIR)'/helpfiles";' >> libloc.c
++ echo 'char *cslsloc="'$(EXAMPLESDIR)'/csls";' >> libloc.c
+ echo 'char *temploc="/tmp";' >> libloc.c
+ echo 'char *separator="/";' >> libloc.c
+
+@@ -65,18 +68,22 @@
+ cd docs; $(MAKE) ship
+
+ install: all
+- for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(LIBLOC)/helpfiles $(LIBLOC)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
++ for d in $(BINDIR) $(LIBLOC) $(LIBLOC)/logolib $(DOCSDIR)/helpfiles $(EXAMPLESDIR)/csls; do [ -d $$d ] || mkdir -p $$d || exit 1; done
+ cp logo $(BINDIR)/.
+ cp -f logolib/* $(LIBLOC)/logolib/.
+- cp -f helpfiles/* $(LIBLOC)/helpfiles/.
+- cp -f csls/* $(LIBLOC)/csls/.
+- (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
+- (cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
++ cp -f helpfiles/* $(DOCSDIR)/helpfiles/.
++ cp -f csls/* $(EXAMPLESDIR)/csls/.
++
++logo-mode-install:
++ (cd emacs; prefix=$(PREFIX) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE) install)
++
++docs-install:
++ (cd docs; prefix=$(PREFIX) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) DOCSDIR=$(DOCSDIR) INFODIR=$(INFODIR) $(MAKE) install)
+ # prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE) install
+
+ logo-mode:
+- (cd emacs; prefix=$(prefix) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE))
++ (cd emacs; prefix=$(PREFIX) LIBLOC=$(LIBLOC) BINDIR=$(BINDIR) $(MAKE))
+ # @prefix=$(prefix); LIBLOC=$(LIBLOC); BINDIR=$(BINDIR); export prefix LIBLOC BINDIR; cd emacs; $(MAKE)
+
+ make-docs:
+- (cd docs; prefix=$(prefix) LIBLOC=$(LIBLOC) $(MAKE) all)
++ (cd docs; prefix=$(PREFIX) LIBLOC=$(LIBLOC) $(MAKE) ucblogo.info)
Index: files/patch-emacs::makefile
===================================================================
RCS file: /home/ncvs/FreeBSD/ports/lang/logo/files/patch-emacs::makefile,v
retrieving revision 1.1
diff -u -u -r1.1 patch-emacs::makefile
--- files/patch-emacs::makefile 16 May 2002 13:59:14 -0000 1.1
+++ files/patch-emacs::makefile 26 Feb 2005 04:01:43 -0000
@@ -1,39 +1,19 @@
---- emacs/makefile.orig Wed Jul 25 00:54:03 2001
-+++ emacs/makefile Thu May 16 01:08:12 2002
-@@ -1,7 +1,7 @@
+--- emacs/makefile.orig Mon Nov 29 08:09:22 2004
++++ emacs/makefile Sat Feb 26 15:01:19 2005
+@@ -1,6 +1,6 @@
BUILDIR = `pwd`
+ EMACSDIR = $(LIBLOC)/emacs
-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 @@
+ INFOPATH = $(subst X,$(INFODIR),(setq logo-info-file \"X/ucblogo.info\"))
+@@ -53,3 +53,8 @@
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)/.
--
-
++ for d in $(INFODIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done
++ cp -f ../docs/*.info* $(INFODIR)/.
++
--- ucblogo-5.4.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?20050226121648.8935716E1>