diff options
| author | Volker Stolz <vs@FreeBSD.org> | 2005-04-22 09:00:37 +0000 |
|---|---|---|
| committer | Volker Stolz <vs@FreeBSD.org> | 2005-04-22 09:00:37 +0000 |
| commit | 3ed5971f4927f1c9cdd7cff97ed09888b528b542 (patch) | |
| tree | 0301ffd93231928aa16588dafaee630cce5784de /misc | |
| parent | Use dashed options for tar(1). Some old versions of tar(1) (diff) | |
- Fix runtime error by regenerating path in config.h
- Use MAKE_ARGS instead of patches
Notes
Notes:
svn path=/head/; revision=133919
Diffstat (limited to 'misc')
| -rw-r--r-- | misc/boxes/Makefile | 5 | ||||
| -rw-r--r-- | misc/boxes/files/patch-aa | 11 | ||||
| -rw-r--r-- | misc/boxes/files/patch-ab | 13 |
3 files changed, 4 insertions, 25 deletions
diff --git a/misc/boxes/Makefile b/misc/boxes/Makefile index 36c2bdf5fe0d..99910b39b93d 100644 --- a/misc/boxes/Makefile +++ b/misc/boxes/Makefile @@ -21,12 +21,15 @@ MAN1= boxes.1 USE_GMAKE= yes USE_BISON= yes ALL_TARGET= boxes -MAKE_ARGS= GLOBALCONF=${GLOBALCONF} CFLAGS_ADDTL="${CFLAGS}" +MAKE_ARGS= CC="${CC}" GLOBALCONF=${GLOBALCONF} CFLAGS="${CFLAGS} -ansi -I. -Iregexp" GLOBALCONF= ${DATADIR}/boxes-config PLIST_FILES= bin/boxes share/boxes/boxes-config PLIST_DIRS= share/boxes +do-configure: + ${RM} ${WRKSRC}/src/boxes.h ${WRKSRC}/doc/boxes.1 + do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/boxes ${PREFIX}/bin ${MKDIR} ${DATADIR} diff --git a/misc/boxes/files/patch-aa b/misc/boxes/files/patch-aa deleted file mode 100644 index fba8cd8bb141..000000000000 --- a/misc/boxes/files/patch-aa +++ /dev/null @@ -1,11 +0,0 @@ ---- ./src/regexp/Makefile.orig Sun Oct 20 17:56:12 2002 -+++ ./src/regexp/Makefile Sun Oct 20 17:56:19 2002 -@@ -32,7 +32,7 @@ - #============================================================================ - - --CFLAGS = -traditional -O -I. $(CFLAGS_ADDTL) -+CFLAGS += -I. $(CFLAGS_ADDTL) - - ALL_CL = regexp/regexp.c regexp/regsub.c - C_SRC = $(notdir $(ALL_CL)) diff --git a/misc/boxes/files/patch-ab b/misc/boxes/files/patch-ab deleted file mode 100644 index 55497855b01c..000000000000 --- a/misc/boxes/files/patch-ab +++ /dev/null @@ -1,13 +0,0 @@ ---- ./src/Makefile.orig Sun Oct 20 17:58:59 2002 -+++ ./src/Makefile Sun Oct 20 17:59:05 2002 -@@ -78,8 +78,8 @@ - - LEX = flex - YACC = bison --CC = gcc --CFLAGS = -ansi -I. -Iregexp -Wall -W $(CFLAGS_ADDTL) -+CC ?= cc -+CFLAGS += -ansi -I. -Iregexp -Wall -W $(CFLAGS_ADDTL) - LDFLAGS = -Lregexp - - GEN_HDR = parser.h boxes.h |