respect CC/CXX/CFLAGS

This commit is contained in:
wilfried 2001-03-17 15:14:55 +00:00
parent 251486ab39
commit c5241ee5e8
4 changed files with 48 additions and 19 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2000/10/22 15:42:06 espie Exp $
# $OpenBSD: Makefile,v 1.10 2001/03/17 15:14:55 wilfried Exp $
#
DISTNAME= xevil1.5
@ -20,4 +20,16 @@ PERMIT_DISTFILES_FTP= Yes
WRKDIST= ${WRKDIR}
ALL_TARGET= freebsd
do-install:
${INSTALL_PROGRAM} ${WRKBUILD}/xevil $(PREFIX)/bin
${INSTALL_MAN} ${WRKSRC}/xevil.6 $(PREFIX)/man/man6
cd ${WRKSRC} && ${INSTALL_DATA} \
${WRKSRC}/app-defaults/XEvil.iris \
${WRKSRC}/app-defaults/XEvil.mac \
${WRKSRC}/app-defaults/XEvil.sun3 \
${WRKSRC}/app-defaults/XEvil.sun4_sparc \
$(PREFIX)/lib/X11/app-defaults/
.include <bsd.port.mk>

View File

@ -0,0 +1,23 @@
$OpenBSD: patch-Makefile,v 1.1 2001/03/17 15:14:55 wilfried Exp $
--- Makefile.orig Mon Jun 3 22:47:02 1996
+++ Makefile Sat Mar 17 16:11:56 2001
@@ -8,8 +8,6 @@
#### Defines that are applicable to makes on all architectures
SHELL = /bin/sh
TARGETS = xevil #xshow
-DEBUG_OPT = -O #-g# #-DPRINT_ERRORS
-LINK_OPT = -O
#SRC_DIR and WORK_DIR are only used for `make workdir`
SRC_DIR = /mit/hardts/src/X/xevil1.4.9
@@ -94,8 +92,8 @@ ds:
freebsd:
- @$(MAKE) CC="c++" CFLAGS="-DUSE_RANDOM -DPROTECTED_IS_PUBLIC" \
-INCL_DIRS=-I/usr/X11R6/include LIBS_DIRS=-L/usr/X11R6/lib \
+ @$(MAKE) CC="${CXX}" CFLAGS="${CFLAGS} -DUSE_RANDOM -DPROTECTED_IS_PUBLIC" \
+INCL_DIRS=-I${X11BASE}/include LIBS_DIRS=-L${X11BASE}/lib \
LIBS="-lX11 -lm" $(TARGETS)

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-utils_h,v 1.1 2001/03/17 15:14:55 wilfried Exp $
--- utils.h.orig Mon Jun 3 22:06:44 1996
+++ utils.h Fri Mar 16 19:39:08 2001
@@ -54,7 +54,7 @@ extern "C"
// Defines
-#define MSEC_PER_CLOCK (1.0e3 / CLOCKS_PER_SEC)
+#define MSEC_PER_CLOCK 8 // (1.0e3 / CLOCKS_PER_SEC)
#ifndef max
#define max(a,b) (a<b ? b : a)

View File

@ -1,18 +0,0 @@
#!/bin/sh
cd $WRKSRC || exit 1
cat >> Makefile << END
all: freebsd
install:
cp xevil \$(PREFIX)/bin
mkdir -p \$(PREFIX)/lib/app-defaults
for f in iris mac sun3 sun4_sparc; do \
cp app-defaults/XEvil.\$\$f \$(PREFIX)/lib/X11/app-defaults/; done
install -c -m 444 -o bin -g bin xevil.6 \$(PREFIX)/man/man6/xevil.6
END
exit 0