From 1717ce0894a597103eea3e9120ae5d3c6633b8c8 Mon Sep 17 00:00:00 2001 From: sem Date: Tue, 11 Oct 2005 19:06:10 +0000 Subject: - Update to 5.5 and unbreak PR: ports/87219 Submitted by: Gabor Kovesdan --- lang/logo/Makefile | 10 ++++------ lang/logo/distinfo | 4 ++-- lang/logo/files/patch-ac | 25 ------------------------- lang/logo/files/patch-docs-makefile | 9 +++++++++ lang/logo/files/patch-docs::makefile | 9 --------- lang/logo/files/patch-emacs-makefile | 19 +++++++++++++++++++ lang/logo/files/patch-emacs::makefile | 19 ------------------- lang/logo/files/patch-makefile.in | 24 ++++++++++++++++++++++++ lang/logo/pkg-plist | 12 ++++++++++++ 9 files changed, 70 insertions(+), 61 deletions(-) delete mode 100644 lang/logo/files/patch-ac create mode 100644 lang/logo/files/patch-docs-makefile delete mode 100644 lang/logo/files/patch-docs::makefile create mode 100644 lang/logo/files/patch-emacs-makefile delete mode 100644 lang/logo/files/patch-emacs::makefile create mode 100644 lang/logo/files/patch-makefile.in (limited to 'lang/logo') diff --git a/lang/logo/Makefile b/lang/logo/Makefile index 8fab9028921..d3c7bbe0a98 100644 --- a/lang/logo/Makefile +++ b/lang/logo/Makefile @@ -6,17 +6,14 @@ # PORTNAME= ucblogo -PORTVERSION= 5.4 +PORTVERSION= 5.5 CATEGORIES= lang -MASTER_SITES= ftp://ftp.cs.berkeley.edu/pub/ucblogo/ +MASTER_SITES= http://www.cs.berkeley.edu/~bh/downloads/ +DISTNAME= ${PORTNAME} MAINTAINER= ports@FreeBSD.org COMMENT= Brian Harvey's logo language interpreter -BROKEN= "5.4 fails to fetch, latest version is 5.5" -DEPRECATED= ${BROKEN} -EXPIRATION_DATE= 2005-12-09 - .if defined(EMACS_LOGO_MODE) BUILD_DEPENDS= emacs:${PORTSDIR}/editors/emacs .endif @@ -27,6 +24,7 @@ BUILD_DEPENDS+= tex:${PORTSDIR}/print/teTeX \ ps2pdf:${PORTSDIR}/${GHOSTSCRIPT_PORT} .endif +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} USE_XLIB= yes MAKEFILE= makefile HAS_CONFIGURE= yes diff --git a/lang/logo/distinfo b/lang/logo/distinfo index 3bef7b1bb0f..bf911d3bb07 100644 --- a/lang/logo/distinfo +++ b/lang/logo/distinfo @@ -1,2 +1,2 @@ -MD5 (ucblogo-5.4.tar.gz) = d0617473e165ad19d3157d9e867e2f8d -SIZE (ucblogo-5.4.tar.gz) = 1262512 +MD5 (ucblogo.tar.gz) = caf68577630645718492fd7d10fd4927 +SIZE (ucblogo.tar.gz) = 1290273 diff --git a/lang/logo/files/patch-ac b/lang/logo/files/patch-ac deleted file mode 100644 index e9dbd4a9022..00000000000 --- a/lang/logo/files/patch-ac +++ /dev/null @@ -1,25 +0,0 @@ ---- makefile.in.orig Tue Nov 30 11:11:07 2004 -+++ makefile.in Sat Feb 12 13:04:54 2005 -@@ -2,9 +2,10 @@ - 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 - MAKE = @MAKE@ - - # LIBLOC = `pwd` -@@ -19,7 +20,7 @@ - - HDRS = globals.h logo.h xgraphics.h - --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 diff --git a/lang/logo/files/patch-docs-makefile b/lang/logo/files/patch-docs-makefile new file mode 100644 index 00000000000..f84b2048d75 --- /dev/null +++ b/lang/logo/files/patch-docs-makefile @@ -0,0 +1,9 @@ +--- docs/makefile.orig Tue Nov 30 16:57:46 2004 ++++ docs/makefile Mon Oct 10 18:12:01 2005 +@@ -1,6 +1,4 @@ + BUILDIR = `pwd` +-INFODIR = $(prefix)/info +-DOCSDIR = $(LIBLOC)/docs + HTMLDIR = $(DOCSDIR)/html + + all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info diff --git a/lang/logo/files/patch-docs::makefile b/lang/logo/files/patch-docs::makefile deleted file mode 100644 index 900704d1c0f..00000000000 --- a/lang/logo/files/patch-docs::makefile +++ /dev/null @@ -1,9 +0,0 @@ ---- docs/makefile.orig Thu Feb 24 16:37:18 2005 -+++ docs/makefile Thu Feb 24 16:37:30 2005 -@@ -1,6 +1,4 @@ - BUILDIR = `pwd` --INFODIR = $(prefix)/info --DOCSDIR = $(LIBLOC)/docs - HTMLDIR = $(DOCSDIR)/html - - all: usermanual.ps usermanual.pdf html/usermanual_1.html ucblogo.info diff --git a/lang/logo/files/patch-emacs-makefile b/lang/logo/files/patch-emacs-makefile new file mode 100644 index 00000000000..d66375e9966 --- /dev/null +++ b/lang/logo/files/patch-emacs-makefile @@ -0,0 +1,19 @@ +--- emacs/makefile.orig Sun Nov 28 22:09:22 2004 ++++ emacs/makefile Mon Oct 10 18:15:03 2005 +@@ -1,6 +1,6 @@ + BUILDIR = `pwd` + EMACSDIR = $(LIBLOC)/emacs +-INFODIR = $(prefix)/info ++INFODIR = $(PREFIX)/info + LOADPATH = $(subst X,$(EMACSDIR),(setq load-path (cons "\"X\"" load-path))) + LOGOBIN = $(subst X,$(BINDIR),(setq logo-binary-name \"X/logo\")) + INFOPATH = $(subst X,$(INFODIR),(setq logo-info-file \"X/ucblogo.info\")) +@@ -39,7 +39,7 @@ + -rm -f e.* + -rm -f add.user install-logo-mode dot.emacs dot.loops *.elc + +-install: all ++install-emacs: all + for d in $(EMACSDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done + cp -f logo.* $(EMACSDIR)/. + cp -f letrec.* $(EMACSDIR)/. diff --git a/lang/logo/files/patch-emacs::makefile b/lang/logo/files/patch-emacs::makefile deleted file mode 100644 index f44d5cb3a06..00000000000 --- a/lang/logo/files/patch-emacs::makefile +++ /dev/null @@ -1,19 +0,0 @@ ---- emacs/makefile.orig Sun Nov 28 16:09:22 2004 -+++ emacs/makefile Sat Feb 12 14:45:12 2005 -@@ -1,6 +1,6 @@ - BUILDIR = `pwd` - EMACSDIR = $(LIBLOC)/emacs --INFODIR = $(prefix)/info -+INFODIR = $(PREFIX)/info - LOADPATH = $(subst X,$(EMACSDIR),(setq load-path (cons "\"X\"" load-path))) - LOGOBIN = $(subst X,$(BINDIR),(setq logo-binary-name \"X/logo\")) - INFOPATH = $(subst X,$(INFODIR),(setq logo-info-file \"X/ucblogo.info\")) -@@ -39,7 +39,7 @@ - -rm -f e.* - -rm -f add.user install-logo-mode dot.emacs dot.loops *.elc - --install: all -+install-emacs: all - for d in $(EMACSDIR); do [ -d $$d ] || mkdir -p $$d || exit 1; done - cp -f logo.* $(EMACSDIR)/. - cp -f letrec.* $(EMACSDIR)/. diff --git a/lang/logo/files/patch-makefile.in b/lang/logo/files/patch-makefile.in new file mode 100644 index 00000000000..0b5f21ab923 --- /dev/null +++ b/lang/logo/files/patch-makefile.in @@ -0,0 +1,24 @@ +--- makefile.in.orig Tue Nov 30 17:11:07 2004 ++++ makefile.in Mon Oct 10 18:20:37 2005 +@@ -2,9 +2,9 @@ + 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 + MAKE = @MAKE@ + + # LIBLOC = `pwd` +@@ -19,7 +19,7 @@ + + HDRS = globals.h logo.h xgraphics.h + +-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 diff --git a/lang/logo/pkg-plist b/lang/logo/pkg-plist index d770a42bd5c..5b42ca86273 100644 --- a/lang/logo/pkg-plist +++ b/lang/logo/pkg-plist @@ -36,6 +36,8 @@ lib/logo/helpfiles/buryname lib/logo/helpfiles/butfirst lib/logo/helpfiles/butfirsts lib/logo/helpfiles/butlast +lib/logo/helpfiles/button +lib/logo/helpfiles/buttonp lib/logo/helpfiles/bye lib/logo/helpfiles/cascade lib/logo/helpfiles/case @@ -158,6 +160,8 @@ lib/logo/helpfiles/loadpict lib/logo/helpfiles/local lib/logo/helpfiles/localmake lib/logo/helpfiles/log10 +lib/logo/helpfiles/logoplatform +lib/logo/helpfiles/logoversion lib/logo/helpfiles/lowercase lib/logo/helpfiles/lput lib/logo/helpfiles/lshift @@ -174,6 +178,7 @@ lib/logo/helpfiles/member lib/logo/helpfiles/memberp lib/logo/helpfiles/minus lib/logo/helpfiles/modulo +lib/logo/helpfiles/mousepos lib/logo/helpfiles/name lib/logo/helpfiles/namelist lib/logo/helpfiles/namep @@ -233,6 +238,7 @@ lib/logo/helpfiles/primitivep lib/logo/helpfiles/primitives lib/logo/helpfiles/print lib/logo/helpfiles/printdepthlimit +lib/logo/helpfiles/printout lib/logo/helpfiles/printwidthlimit lib/logo/helpfiles/procedurep lib/logo/helpfiles/procedures @@ -405,6 +411,7 @@ lib/logo/logolib/ignore lib/logo/logolib/invoke lib/logo/logolib/iseq lib/logo/logolib/localmake +lib/logo/logolib/logo-logo lib/logo/logolib/macroexpand lib/logo/logolib/map lib/logo/logolib/map.se @@ -443,14 +450,18 @@ lib/logo/logolib/xcor lib/logo/logolib/ycor %%EXAMPLESDIR%%/csls/algs %%EXAMPLESDIR%%/csls/basic +%%EXAMPLESDIR%%/csls/buttons %%EXAMPLESDIR%%/csls/cards %%EXAMPLESDIR%%/csls/crypto %%EXAMPLESDIR%%/csls/diff %%EXAMPLESDIR%%/csls/doctor +%%EXAMPLESDIR%%/csls/dotgame %%EXAMPLESDIR%%/csls/format %%EXAMPLESDIR%%/csls/fsm +%%EXAMPLESDIR%%/csls/master %%EXAMPLESDIR%%/csls/match %%EXAMPLESDIR%%/csls/math +%%EXAMPLESDIR%%/csls/mines %%EXAMPLESDIR%%/csls/multi %%EXAMPLESDIR%%/csls/pascal %%EXAMPLESDIR%%/csls/playfair @@ -459,6 +470,7 @@ lib/logo/logolib/ycor %%EXAMPLESDIR%%/csls/pour %%EXAMPLESDIR%%/csls/psort %%EXAMPLESDIR%%/csls/solitaire +%%EXAMPLESDIR%%/csls/streams %%EXAMPLESDIR%%/csls/student %%EXAMPLESDIR%%/csls/tower %%EXAMPLESDIR%%/csls/ttt -- cgit