Attachment #69713 for bug #101918

View | Details | Raw Unified | Return to bug 101918
Collapse All | Expand All




ALL_TARGET=	ha
USE_GMAKE=	yes

post-patch:
	@${REINPLACE_CMD} 's,<malloc.h>,<stdlib.h>,' \
		${WRKSRC}/c/hsc.c ${WRKSRC}/c/cpy.c \
		${WRKSRC}/c/asc.c
	@${REINPLACE_CMD} -e 's|CC =|CC ?=|' \
		-e 's|LDFLAGS = -O2||' \
		-e 's|CFLAGS = -Wall -O2|CFLAGS += -Wall|' \
		${WRKSRC}/makefile.nix

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/ha ${TARGETDIR}/bin

.include <bsd.port.mk>




--- makefile.nix.orig	Wed Jan 11 23:26:26 1995
+++ makefile.nix	Sat Mar 30 18:39:08 2002
@@ -21,10 +21,9 @@
 
 MCH = nix
 
-CC = gcc
+CC ?= gcc
 CPP = $(CC) -E
-CFLAGS = -Wall -O2 -c -I../$(MCH) -I../include
-LDFLAGS = -O2
+CFLAGS += -Wall  -c -I../$(MCH) -I../include
 
 MDEFINES = "CC=$(CC)" "CPP=$(CPP)" "CFLAGS=$(CFLAGS)" "DEFS=$(DEFS)"
 SUBDIRS = c $(MCH) include

Return to bug 101918

Lines 22-33 Link Here

(-)Makefile (-3 / +7 lines)
22	ALL_TARGET= ha	22	ALL_TARGET= ha
23	USE_GMAKE= yes	23	USE_GMAKE= yes
24		24
25	pre-patch:	25	post-patch:
26	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \	26	@${REINPLACE_CMD} 's,<malloc.h>,<stdlib.h>,' \
27	${WRKSRC}/c/hsc.c ${WRKSRC}/c/cpy.c \	27	${WRKSRC}/c/hsc.c ${WRKSRC}/c/cpy.c \
28	${WRKSRC}/c/asc.c	28	${WRKSRC}/c/asc.c
		29	@${REINPLACE_CMD} -e 's\|CC =\|CC ?=\|' \
		30	-e 's\|LDFLAGS = -O2\|\|' \
		31	-e 's\|CFLAGS = -Wall -O2\|CFLAGS += -Wall\|' \
		32	${WRKSRC}/makefile.nix
29		33
30	do-install:	34	do-install:
31	cd ${WRKSRC}; ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ha ${PREFIX}/bin	35	${INSTALL_PROGRAM} ${WRKSRC}/ha ${TARGETDIR}/bin
32		36
33	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Removed Link Here

(-)files/patch-ab (-15 lines)
1	--- makefile.nix.orig Wed Jan 11 23:26:26 1995
2	+++ makefile.nix Sat Mar 30 18:39:08 2002
3	@@ -21,10 +21,9 @@
4
5	MCH = nix
6
7	-CC = gcc
8	+CC ?= gcc
9	CPP = $(CC) -E
10	-CFLAGS = -Wall -O2 -c -I../$(MCH) -I../include
11	-LDFLAGS = -O2
12	+CFLAGS += -Wall -c -I../$(MCH) -I../include
13
14	MDEFINES = "CC=$(CC)" "CPP=$(CPP)" "CFLAGS=$(CFLAGS)" "DEFS=$(DEFS)"
15	SUBDIRS = c $(MCH) include