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

use ${CC}, ${PREFIX}, ${X11BASE}, new patch names, use ssh instead of rsh; with and ok naddy@

Browse Source
This commit is contained in:
markus 2002-11-04 10:28:56 +00:00
parent 336b1e9041
commit 72bf80f9c1
6 changed files with 29 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plan9/sam/patches/patch-aa → plan9/sam/patches/patch-doc_sam_1
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-aa,v 1.2 2000/06/07 00:52:08 espie Exp $
--- doc/sam.1.orig Wed Jun 7 02:38:18 2000
+++ doc/sam.1 Wed Jun 7 02:38:25 2000
$OpenBSD: patch-doc_sam_1,v 1.1 2002/11/04 10:28:56 markus Exp $
--- doc/sam.1.orig Wed Oct 30 21:05:47 2002
+++ doc/sam.1 Wed Oct 30 21:05:50 2002
@@ -1,34 +1,3 @@
-.de F
-.B

8
plan9/sam/patches/patch-ab → plan9/sam/patches/patch-libXg_Makefile
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-libXg_Makefile,v 1.1 2002/11/04 10:28:56 markus Exp $
--- libXg/Makefile.orig Thu Oct 31 00:27:21 2002
+++ libXg/Makefile Thu Oct 31 00:27:59 2002
@@ -8,17 +8,17 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
@ -10,7 +10,7 @@ $OpenBSD: patch-ab,v 1.3 2001/03/17 17:11:56 wilfried Exp $
# add -Iincludedir for any include directories that need to be searched
-INCS=-I../include
+INCS=-I../include -I/usr/X11R6/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

6
plan9/sam/patches/patch-ac → plan9/sam/patches/patch-libframe_Makefile
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-libframe_Makefile,v 1.1 2002/11/04 10:28:56 markus Exp $
--- libframe/Makefile.orig Wed Oct 30 21:05:48 2002
+++ libframe/Makefile Wed Oct 30 21:05:50 2002
@@ -8,22 +8,21 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified

33
plan9/sam/patches/patch-ad → plan9/sam/patches/patch-sam_Makefile
View File

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-sam_Makefile,v 1.1 2002/11/04 10:28:56 markus Exp $
--- sam/Makefile.orig Thu Oct 31 00:48:26 2002
+++ sam/Makefile Thu Oct 31 00:48:52 2002
@@ -8,7 +8,7 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
@ -17,9 +17,9 @@ $OpenBSD: patch-ad,v 1.3 2001/03/17 17:11:56 wilfried Exp $
-TERMNAME=/v/bin/samterm
-SAMDIR=/usr/bin
-SAMSAVEDIR=/v/bin
+TERMNAME=/usr/local/bin/samterm
+SAMDIR=/usr/local/bin
+SAMSAVEDIR=/usr/local/bin
+TERMNAME=${PREFIX}/bin/samterm
+SAMDIR=${PREFIX}/bin
+SAMSAVEDIR=${PREFIX}/bin
# Set TMP to a good place for tmp files (with lots of room)
-TMP=/tmp
@ -27,12 +27,14 @@ $OpenBSD: patch-ad,v 1.3 2001/03/17 17:11:56 wilfried Exp $
# Set SHELLNAME and SHELLPATH to the name of a shell and the pathname
# of its executable
@@ -37,11 +37,11 @@ SHELLPATH=/bin/sh
@@ -36,12 +36,12 @@ SHELLPATH=/bin/sh
# Set RXNAME and RXPATHNAME to the name of the remote execution command
# and the pathname of its executable
RXNAME=rsh
-RXNAME=rsh
-RXPATHNAME=/usr/bsd/rsh
+RXPATHNAME=/usr/bin/rsh
+RXNAME=ssh
+RXPATHNAME=/usr/bin/ssh
SAMSAVE=/bin/sh\\n$(SAMSAVEDIR)/samsave
@ -49,16 +51,3 @@ $OpenBSD: patch-ad,v 1.3 2001/03/17 17:11:56 wilfried Exp $
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
- cp sam $(SAMDIR)/$(RSAMNAME)
- cp samsave $(SAMSAVEDIR)/samsave
- chmod +x $(SAMSAVEDIR)/samsave
+ cp sam $(DESTDIR)$(SAMDIR)/$(RSAMNAME)
+ cp samsave $(DESTDIR)$(SAMSAVEDIR)/samsave
+ chmod +x $(DESTDIR)$(SAMSAVEDIR)/samsave
$(OBJ): sam.h ../include/u.h ../include/libc.h errors.h mesg.h

6
plan9/sam/patches/patch-ae → plan9/sam/patches/patch-sam_unix_c
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-ae,v 1.2 2000/06/07 00:52:09 espie Exp $
--- sam/unix.c.orig Wed Jun 7 02:38:23 2000
+++ sam/unix.c Wed Jun 7 02:38:26 2000
$OpenBSD: patch-sam_unix_c,v 1.1 2002/11/04 10:28:56 markus Exp $
--- sam/unix.c.orig Wed Oct 30 21:05:49 2002
+++ sam/unix.c Wed Oct 30 21:05:50 2002
@@ -147,18 +147,18 @@ notifyf(void *a, char *b) /* never calle
int
newtmp(int i)

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

@ -1,6 +1,6 @@
$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
$OpenBSD: patch-samterm_Makefile,v 1.1 2002/11/04 10:28:56 markus Exp $
--- samterm/Makefile.orig Thu Oct 31 00:48:26 2002
+++ samterm/Makefile Thu Oct 31 00:49:03 2002
@@ -8,7 +8,7 @@
#
# Additionally, -D_POSIX_SOURCE (or its equivalent) may be specified
@ -15,12 +15,12 @@ $OpenBSD: patch-af,v 1.3 2001/03/17 17:11:56 wilfried Exp $
# SAMTERM contains the name of the file containing the samterm
# executable.
-SAMTERM=/v/bin/samterm
+SAMTERM=/usr/local/bin/samterm
+SAMTERM=${PREFIX}/bin/samterm
# set this if your X libraries are in different locations
# or if you need extra libraries to load with X11 applications
-XLIBS=-lXt -lX11
+XLIBS=-L/usr/X11R6/lib -lXt -lX11
+XLIBS=-L${X11BASE}/lib -lXt -lX11
-CFLAGS=$(OS) $(INCS) -D_LIBXG_EXTENSION
+CFLAGS+=$(OS) $(INCS) -D_LIBXG_EXTENSION
@ -30,11 +30,3 @@ $OpenBSD: patch-af,v 1.3 2001/03/17 17:11:56 wilfried Exp $
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
- cp samterm $(SAMTERM)
+ cp samterm $(DESTDIR)$(SAMTERM)
$(OBJ): samterm.h flayer.h ../include/frame.h ../include/libg.h ../include/u.h ../include/libc.h ../sam/mesg.h