remove unnecessary patch.

This commit is contained in:
brad 2001-02-28 18:37:27 +00:00
parent 631823542f
commit 1e2f163349
2 changed files with 2 additions and 82 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.21 2001/01/17 18:34:01 brad Exp $
# $OpenBSD: Makefile,v 1.22 2001/02/28 18:37:27 brad Exp $
DISTNAME= joe2.8
PKGNAME= joe-2.8p1
@ -14,7 +14,7 @@ PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
MAKE_FLAGS= CFLAGS="${CFLAGS}" EXTRALIBS="-lcurses" TERMINFO="1" \
MAKE_FLAGS= CFLAGS="${CFLAGS}" EXTRALIBS="-lcurses" \
WHERERC="${SYSCONFDIR}/joe"
ALL_TARGET= joe

View File

@ -1,80 +0,0 @@
--- Makefile.orig Mon Jan 23 12:01:28 1995
+++ Makefile Mon Dec 21 02:33:53 1998
@@ -10,14 +10,16 @@
# to go:
WHEREJOE = /usr/local/bin
-WHERERC = /usr/local/lib
-WHEREMAN = /usr/man/man1
+WHERERC = /usr/local/lib/joe
+WHEREMAN = /usr/local/man/man1
# If you want to use TERMINFO, you have to set
# the following variable to 1. Also you have to
# include some additional libraries- see below.
+.if !defined(TERMINFO)
TERMINFO = 0
+.endif
# You may also have to add some additional
# defines to get the include files to work
@@ -27,7 +29,11 @@
# C compiler options: make's built-in rules use this variable
-CFLAGS = -O
+#CFLAGS = -O
+
+.if defined(SYS_JOERC)
+CFLAGS += -DSYS_JOERC=\"$(SYS_JOERC)/\"
+.endif
# C compiler to use: make's built-in rules use this variable
@@ -45,7 +51,11 @@
# add '-ltinfo', '-lcurses' or '-ltermlib',
# depending on the system.
+.if ($(TERMINFO) == 1)
+EXTRALIBS = -lcurses
+.else
EXTRALIBS =
+.endif
# Object files
@@ -90,10 +100,10 @@
if [ ! -d $(WHEREJOE) ]; then mkdir $(WHEREJOE); chmod a+rx $(WHEREJOE); fi
rm -f $(WHEREJOE)/joe $(WHEREJOE)/jmacs $(WHEREJOE)/jstar $(WHEREJOE)/jpico $(WHEREJOE)/rjoe $(WHEREJOE)/termidx
mv joe $(WHEREJOE)
- ln $(WHEREJOE)/joe $(WHEREJOE)/jmacs
- ln $(WHEREJOE)/joe $(WHEREJOE)/jstar
- ln $(WHEREJOE)/joe $(WHEREJOE)/rjoe
- ln $(WHEREJOE)/joe $(WHEREJOE)/jpico
+ ln -s $(WHEREJOE)/joe $(WHEREJOE)/jmacs
+ ln -s $(WHEREJOE)/joe $(WHEREJOE)/jstar
+ ln -s $(WHEREJOE)/joe $(WHEREJOE)/rjoe
+ ln -s $(WHEREJOE)/joe $(WHEREJOE)/jpico
mv termidx $(WHEREJOE)
if [ ! -d $(WHERERC) ]; then mkdir $(WHERERC); chmod a+rx $(WHERERC); fi
rm -f $(WHERERC)/joerc $(WHERERC)/jmacsrc $(WHERERC)/jstarrc $(WHERERC)/jpicorc $(WHERERC)/rjoerc $(WHEREMAN)/joe.1
@@ -115,12 +125,12 @@
chmod a+r $(WHERERC)/jpicorc
chmod a+r $(WHEREMAN)/joe.1
chmod a+x $(WHEREJOE)/termidx
- rm -f $(WHERERC)/termcap
- cp termcap $(WHERERC)/termcap
- chmod a+r $(WHERERC)/termcap
- rm -f $(WHERERC)/terminfo
- cp terminfo $(WHERERC)/terminfo
- chmod a+r $(WHERERC)/terminfo
+# rm -f $(WHERERC)/termcap
+# cp termcap $(WHERERC)/termcap
+# chmod a+r $(WHERERC)/termcap
+# rm -f $(WHERERC)/terminfo
+# cp terminfo $(WHERERC)/terminfo
+# chmod a+r $(WHERERC)/terminfo
# Cleanup proceedure