head	1.6;
access;
symbols
	RELEASE_6_0_0:1.5
	RELEASE_5_4_0:1.5
	RELEASE_4_11_0:1.4
	RELEASE_5_3_0:1.4
	RELEASE_4_10_0:1.4
	RELEASE_5_2_1:1.4
	RELEASE_5_2_0:1.4
	RELEASE_4_9_0:1.4
	RELEASE_5_1_0:1.4
	RELEASE_4_8_0:1.4
	RELEASE_5_0_0:1.4
	RELEASE_4_7_0:1.3
	RELEASE_4_6_2:1.3
	RELEASE_4_6_1:1.3
	RELEASE_4_6_0:1.3
	RELEASE_5_0_DP1:1.2
	RELEASE_4_5_0:1.2
	RELEASE_4_4_0:1.2
	RELEASE_4_3_0:1.2
	RELEASE_4_2_0:1.2
	RELEASE_4_1_1:1.2
	RELEASE_4_1_0:1.2
	RELEASE_3_5_0:1.2
	RELEASE_4_0_0:1.2
	RELEASE_3_4_0:1.2
	RELEASE_3_3_0:1.2
	RELEASE_3_2_0:1.1
	RELEASE_3_1_0:1.1
	RELEASE_2_2_8:1.1
	RELEASE_3_0_0:1.1
	RELEASE_2_2_7:1.1
	RELEASE_2_2_6:1.1
	RELEASE_2_2_5:1.1
	RELEASE_2_2_1:1.1
	RELEASE_2_2_2:1.1;
locks; strict;
comment	@# @;


1.6
date	2005.10.11.19.06.10;	author sem;	state dead;
branches;
next	1.5;

1.5
date	2005.02.25.22.01.51;	author pav;	state Exp;
branches;
next	1.4;

1.4
date	2002.11.10.17.51.53;	author arved;	state Exp;
branches;
next	1.3;

1.3
date	2002.05.16.13.59.14;	author dwcjr;	state Exp;
branches;
next	1.2;

1.2
date	99.06.21.13.56.49;	author sheldonh;	state Exp;
branches;
next	1.1;

1.1
date	95.04.15.22.49.44;	author jmacd;	state Exp;
branches;
next	;


desc
@@


1.6
log
@- Update to 5.5 and unbreak

PR:		ports/87219
Submitted by:	Gabor Kovesdan <gabor.kovesdan@@t-hosting.hu>
@
text
@--- 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
@


1.5
log
@- Update to 5.4

PR:		ports/78077
Submitted by:	Lowell Gilbert <freebsd-bugs-local@@be-well.ilk.org>
@
text
@@


1.4
log
@Update to 5.2 to work around a wrong WRKSRC usage submitted in:

PR:		45164
Submitted by:	Volker Stolz <vs@@foldr.org>
@
text
@d1 2
a2 2
--- makefile.in.orig	Thu Sep 12 00:02:00 2002
+++ makefile.in	Sat Nov  9 20:48:38 2002
d14 1
d17 1
a17 2
 
@@@@ -18,7 +22,7 @@@@
d21 2
a22 2
-all:	logo logolib helpfiles helpfiles/HELPCONTENTS logo-mode
+all:	logo logolib helpfiles helpfiles/HELPCONTENTS
@


1.3
log
@Update to 5.1

PR:		38127
Submitted by:	obraun@@informatik.unibw-muenchen.de
@
text
@d1 25
a25 78
*** 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
  LDFLAGS	= @@LDFLAGS@@
  LIBS  = @@X_PRE_LIBS@@ @@X_LIBS@@ @@LIBS@@ @@X_EXTRA_LIBS@@
! prefix = @@prefix@@
! BINDIR        = $(prefix)/bin
! LIBLOC        = $(prefix)/lib/logo
  
  # LIBLOC      = `pwd`
  
--- 2,14 ----
  CFLAGS	= @@CFLAGS@@ @@CPPFLAGS@@ @@X_CFLAGS@@ -O0
  LDFLAGS	= @@LDFLAGS@@
  LIBS  = @@X_PRE_LIBS@@ @@X_LIBS@@ @@LIBS@@ @@X_EXTRA_LIBS@@
! 
! BINDIR        = $(PREFIX)/bin
! LIBLOC        = $(PREFIX)/lib/logo
! XMPDIR        = $(PREFIX)/share/examples/logo
! .ifndef NOPORTDOCS
! DOCDIR        = $(PREFIX)/share/doc/logo
! .endif
  
  # LIBLOC      = `pwd`
  
***************
*** 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 -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
! 	install -c -s -o bin -g bin -m 555 logo $(BINDIR)/
! 	install -c -o bin -g bin -m 444 logolib/* $(LIBLOC)/logolib/
! 	install -c -o bin -g bin -m 444 helpfiles/* $(LIBLOC)/helpfiles/
! 	install -c -o bin -g bin -m 444 csls/* $(XMPDIR)/csls/
! .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
@


1.2
log
@Update 3.3 -> 4.6 and add a master site. Patches differ slightly from
those submitted.

PR:	10699
Submitted by:	Jose Marques <jose@@nobody.org>
@
text
@d1 2
a2 2
*** makefile.in.orig	Tue Jan  6 20:35:51 1998
--- makefile.in	Mon Jun 21 15:43:33 1999
d29 19
a47 2
*** 56,62 ****
  	rm makefile makehelp logo *.o libloc.c
d52 8
a59 4
! 	cp logolib/* $(LIBLOC)/logolib/.
! 	cp helpfiles/* $(LIBLOC)/helpfiles/.
--- 60,70 ----
  	rm makefile makehelp logo *.o libloc.c
d70 9
@


1.1
log
@oh yeah, I had to patch the makefile too.
@
text
@d1 2
a2 2
*** makefile.in.old	Sun Dec 25 08:43:59 1994
--- makefile.in	Sat Apr 15 15:21:08 1995
d4 23
a26 13
*** 1,7 ****
  CC	= @@CC@@
  CFLAGS	= @@CFLAGS@@ @@CPPFLAGS@@ @@X_CFLAGS@@
  LIBS	= @@X_LIBS@@ @@LIBS@@
! LIBLOC	= `pwd`
  
  OBJS 	= coms.o error.o eval.o files.o graphics.o init.o intern.o \
  	  libloc.o lists.o logodata.o main.o math.o mem.o paren.o parse.o \
--- 1,7 ----
  CC	= @@CC@@
  CFLAGS	= @@CFLAGS@@ @@CPPFLAGS@@ @@X_CFLAGS@@
  LIBS	= @@X_LIBS@@ @@LIBS@@
! LIBLOC	?= `pwd`
a27 2
  OBJS 	= coms.o error.o eval.o files.o graphics.o init.o intern.o \
  	  libloc.o lists.o logodata.o main.o math.o mem.o paren.o parse.o \
d29 2
a30 2
*** 35,40 ****
--- 35,46 ----
d32 7
a38 8
  makehelp:	makehelp.c
  	$(CC) -o makehelp makehelp.c
+ 
+ install:
+ 	install -c logo ${PREFIX}/bin
+ 	mkdir -p ${LIBLOC}
+ 	cp -rp logolib ${LIBLOC}
+ 	cp -rp helpfiles ${LIBLOC}
d40 9
a48 2
  clean:
  	rm *.o libloc.c
@

