diff options
Diffstat (limited to 'editors/sam/patches/patch-aa')
| -rw-r--r-- | editors/sam/patches/patch-aa | 123 |
1 files changed, 60 insertions, 63 deletions
diff --git a/editors/sam/patches/patch-aa b/editors/sam/patches/patch-aa index 6d66315dcb4..0a93ea70d57 100644 --- a/editors/sam/patches/patch-aa +++ b/editors/sam/patches/patch-aa @@ -1,64 +1,61 @@ -$NetBSD: patch-aa,v 1.3 2000/09/13 10:42:00 tron Exp $ +$NetBSD: patch-aa,v 1.4 2001/05/01 09:16:25 agc Exp $ -*** libXg/Makefile.orig Fri Jul 28 14:02:17 1995 ---- libXg/Makefile Fri Jul 21 15:03:43 1995 -*************** -*** 1,24 **** - # Copyright (c) 1992 AT&T - All rights reserved. - # -! # Prototype Makefile for libXg - # -- # define operating system. ONE of: -- # -DIRIX -DSUNOS -DUMIPS -DSYSVR3 -DAIX -DOSF1 -- # -DHPUX -DAPOLLO -DCONVEX -DDYNIX -- # - # Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified - # if your compiler supports posix-compatible compilation -! OS=-DIRIX -ansiposix - - # add -Iincludedir for any include directories that need to be searched -! INCS=-I../include - - # set this if your X libraries are in different locations - # or if you need extra libraries to load with X11 applications -! XLIBS=/usr/local/X11R5/lib/libXt.a /usr/local/X11R5/lib/libX11.a - - # add name of library orderer - use ":" if none -! RANLIB=: - - # add name of librarian - AR=ar ---- 1,23 ---- - # Copyright (c) 1992 AT&T - All rights reserved. - # -! # Prototype BSDi Makefile for libXg -! # Courtesy of Boyd Roberts -! # -! # Define operating system type: -DBSDi - # - # Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified - # if your compiler supports posix-compatible compilation -! OS=-O2 -DBSDi - - # add -Iincludedir for any include directories that need to be searched -! INCS=-I../include -I${X11BASE}/include - - # set this if your X libraries are in different locations - # or if you need extra libraries to load with X11 applications -! XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lX11 - - # add name of library orderer - use ":" if none -! RANLIB=ranlib - - # add name of librarian - AR=ar -*************** -*** 50,56 **** - $(LIB): $(OBJS) - $(AR) rv $(LIB) $(OBJS) - $(RANLIB) $(LIB) -- -- $(LIB)(%.o): %.o - - $(OBJS): ../include/libg.h libgint.h ../include/libc.h ---- 49,53 ---- +--- libXg/Makefile.orig Tue May 1 09:42:03 2001 ++++ libXg/Makefile Tue May 1 09:48:09 2001 +@@ -1,24 +1,23 @@ + # Copyright (c) 1992 AT&T - All rights reserved. + # +-# Prototype Makefile for libXg ++# Prototype BSDi Makefile for libXg ++# Courtesy of Boyd Roberts ++# ++# Define operating system type: -DBSDi + # +-# define operating system. ONE of: +-# -DIRIX -DSUNOS -DUMIPS -DSYSVR3 -DAIX -DOSF1 +-# -DHPUX -DAPOLLO -DCONVEX -DDYNIX +-# + # Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified + # if your compiler supports posix-compatible compilation +-OS=-DIRIX -ansiposix ++OS=-O2 -DBSDi + + # add -Iincludedir for any include directories that need to be searched +-INCS=-I../include ++INCS=-I../include -I${X11BASE}/include + + # set this if your X libraries are in different locations + # or if you need extra libraries to load with X11 applications +-XLIBS=/usr/local/X11R5/lib/libXt.a /usr/local/X11R5/lib/libX11.a ++XLIBS=-L${X11BASE}/lib -Wl,-R${X11BASE}/lib -lXt -lX11 + + # add name of library orderer - use ":" if none +-RANLIB=: ++RANLIB=ranlib + + # add name of librarian + AR=ar +@@ -36,7 +35,7 @@ + rdfontfile.o rectclip.o rune.o segment.o string.o strwidth.o texture.o\ + wrbitmap.o wrbitmapfile.o xtbinit.o + +-all install: $(LIB) ++all : $(LIB) + compile: $(LIB) + test: test.o + $(CC) -o $@ $? $(LIB) $(XLIBS) -lm +@@ -47,10 +46,12 @@ + nuke: clean + rm -f $(LIB) + ++install: ${LIB} ++ cp ${LIB} ${PREFIX}/lib/${LIB} ++ ${RANLIB} ${PREFIX}/lib/${LIB} ++ + $(LIB): $(OBJS) + $(AR) rv $(LIB) $(OBJS) + $(RANLIB) $(LIB) +- +-$(LIB)(%.o): %.o + + $(OBJS): ../include/libg.h libgint.h ../include/libc.h |