cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

respect CC/CFLAGS, ok maintainer

Browse Source
This commit is contained in:
wilfried 2001-03-17 17:11:56 +00:00
parent a277f5d2d9
commit cc14644e38
4 changed files with 57 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
plan9/sam/patches/patch-ab
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ab,v 1.2 2000/06/07 00:52:08 espie Exp $
--- libXg/Makefile.orig Wed Jun 7 02:38:21 2000
+++ libXg/Makefile Wed Jun 7 02:38:26 2000
$OpenBSD: patch-ab,v 1.3 2001/03/17 17:11:56 wilfried Exp $
--- libXg/Makefile.orig Fri Mar 16 17:22:40 2001
+++ libXg/Makefile Fri Mar 16 17:23:30 2001
@@ -8,17 +8,17 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
@ -22,7 +22,17 @@ $OpenBSD: patch-ab,v 1.2 2000/06/07 00:52:08 espie Exp $
# add name of librarian
AR=ar
@@ -50,7 +50,5 @@ nuke: clean
@@ -26,8 +26,7 @@ AR=ar
# the name of the library
LIB=libXg.a
-CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS)
-CC=cc
+CFLAGS+=$(OS) -D_LIBXG_EXTENSION $(INCS)
OBJS= arc.o arith.o balloc.o bitblt.o bitbltclip.o border.o bscreenrect.o\
circle.o clipline.o clipr.o copymasked.o cursorset.o cursorswitch.o\
@@ -50,7 +49,5 @@ nuke: clean
$(LIB): $(OBJS)
$(AR) rv $(LIB) $(OBJS)
$(RANLIB) $(LIB)

17
plan9/sam/patches/patch-ac
View File

@ -1,7 +1,7 @@
$OpenBSD: patch-ac,v 1.2 2000/06/07 00:52:09 espie Exp $
--- libframe/Makefile.orig Wed Jun 7 02:38:21 2000
+++ libframe/Makefile Wed Jun 7 02:38:26 2000
@@ -8,14 +8,14 @@
$OpenBSD: patch-ac,v 1.3 2001/03/17 17:11:56 wilfried Exp $
--- libframe/Makefile.orig Fri Mar 16 17:22:40 2001
+++ libframe/Makefile Fri Mar 16 17:23:36 2001
@@ -8,22 +8,21 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
# if your compiler supports posix-compatible compilation
@ -18,3 +18,12 @@ $OpenBSD: patch-ac,v 1.2 2000/06/07 00:52:09 espie Exp $
# add name of library
AR=ar
-CFLAGS=-c $(OS) $(INCS) -D_LIBXG_EXTENSION
+CFLAGS+=-c $(OS) $(INCS) -D_LIBXG_EXTENSION
LIB=libframe.a
-CC=cc
OBJ=frbox.o frdelete.o frdraw.o frinit.o frinsert.o frptofchar.o\
frselect.o frstr.o frutil.o misc.o

23
plan9/sam/patches/patch-ad
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ad,v 1.2 2000/06/07 00:52:09 espie Exp $
--- sam/Makefile.orig Wed Jun 7 02:38:21 2000
+++ sam/Makefile Wed Jun 7 02:42:06 2000
$OpenBSD: patch-ad,v 1.3 2001/03/17 17:11:56 wilfried Exp $
--- sam/Makefile.orig Fri Mar 16 17:22:40 2001
+++ sam/Makefile Fri Mar 16 17:23:46 2001
@@ -8,7 +8,7 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
@ -27,7 +27,7 @@ $OpenBSD: patch-ad,v 1.2 2000/06/07 00:52:09 espie Exp $
# Set SHELLNAME and SHELLPATH to the name of a shell and the pathname
# of its executable
@@ -37,7 +37,7 @@ SHELLPATH=/bin/sh
@@ -37,11 +37,11 @@ SHELLPATH=/bin/sh
# Set RXNAME and RXPATHNAME to the name of the remote execution command
# and the pathname of its executable
RXNAME=rsh
@ -36,7 +36,20 @@ $OpenBSD: patch-ad,v 1.2 2000/06/07 00:52:09 espie Exp $
SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave
@@ -68,9 +68,9 @@ nuke: clean
-CFLAGS=$(OS) -D_LIBXG_EXTENSION $(INCS)
+CFLAGS+=$(OS) -D_LIBXG_EXTENSION $(INCS)
SYSFLAGS= -DHOMEDIR=\"$(HOMEDIR)\" -DRSAMNAME=\"$(RSAMNAME)\" \
-DTERMNAME=\"$(TERMNAME)\" -DTMP=\"$(TMP)\" \
@@ -50,7 +50,6 @@ SYSFLAGS= -DHOMEDIR=\"$(HOMEDIR)\" -DRS
-DSAMSAVE=\"$(SAMSAVE)\"
LIB=../libframe/libframe.a ../libXg/libXg.a
-CC=cc
OBJ=sam.o address.o buffer.o cmd.o disc.o error.o file.o io.o \
list.o mesg.o moveto.o multi.o rasp.o regexp.o shell.o \
@@ -68,9 +67,9 @@ nuke: clean
rm -f sam
install: sam

18
plan9/sam/patches/patch-af
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-af,v 1.2 2000/06/07 00:52:09 espie Exp $
--- samterm/Makefile.orig Wed Jun 7 02:38:21 2000
+++ samterm/Makefile Wed Jun 7 02:42:31 2000
$OpenBSD: patch-af,v 1.3 2001/03/17 17:11:56 wilfried Exp $
--- samterm/Makefile.orig Fri Mar 16 17:22:40 2001
+++ samterm/Makefile Fri Mar 16 17:23:49 2001
@@ -8,7 +8,7 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
@ -10,7 +10,7 @@ $OpenBSD: patch-af,v 1.2 2000/06/07 00:52:09 espie Exp $
# add -Iincludedir for any include directories that need to be searched
# for posix header files (for UMIPS, add -I/usr/include/posix)
@@ -16,11 +16,11 @@ INCS=-I../include
@@ -16,16 +16,15 @@ INCS=-I../include
# SAMTERM contains the name of the file containing the samterm
# executable.
@ -22,9 +22,15 @@ $OpenBSD: patch-af,v 1.2 2000/06/07 00:52:09 espie Exp $
-XLIBS=-lXt -lX11
+XLIBS=-L/usr/X11R6/lib -lXt -lX11
CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
-CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
+CFLAGS+=$(OS) $(INCS) -D_LIBXG_EXTENSION
@@ -41,6 +41,6 @@ nuke: clean
LIBS=../libframe/libframe.a ../libXg/libXg.a
-CC=cc
OBJ=main.o flayer.o icons.o io.o menu.o mesg.o rasp.o scroll.o unix.o
@@ -41,6 +40,6 @@ nuke: clean
rm -f samterm
install: samterm