aboutsummaryrefslogtreecommitdiffstats
path: root/archivers
diff options
context:
space:
mode:
authorkris <kris@FreeBSD.org>2002-03-31 10:39:41 +0800
committerkris <kris@FreeBSD.org>2002-03-31 10:39:41 +0800
commite8891ea38f7a33dc4ab12f462326f7b4c6f9e7a7 (patch)
tree435c02f1610b4c6ee852fbda96d71b386ec1b800 /archivers
parent21e216edd75d9779910b787f7084167af0bc73bc (diff)
downloadfreebsd-ports-gnome-e8891ea38f7a33dc4ab12f462326f7b4c6f9e7a7.tar.gz
freebsd-ports-gnome-e8891ea38f7a33dc4ab12f462326f7b4c6f9e7a7.tar.zst
freebsd-ports-gnome-e8891ea38f7a33dc4ab12f462326f7b4c6f9e7a7.zip
Remove #include <malloc.h>
Respect CC and CFLAGS
Diffstat (limited to 'archivers')
-rw-r--r--archivers/ha/Makefile6
-rw-r--r--archivers/ha/files/patch-ab15
2 files changed, 20 insertions, 1 deletions
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index b95699e0d00b..4efa687286a5 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -16,10 +16,14 @@ MAINTAINER= ache@FreeBSD.org
NO_WRKSUBDIR= yes
MAKEFILE= makefile.nix
-MAKE_FLAGS= CC=cc -f
ALL_TARGET= ha
USE_GMAKE= yes
+pre-patch:
+ @${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+ ${WRKSRC}/c/hsc.c ${WRKSRC}/c/cpy.c \
+ ${WRKSRC}/c/asc.c
+
do-install:
cd ${WRKSRC}; ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ha ${PREFIX}/bin
diff --git a/archivers/ha/files/patch-ab b/archivers/ha/files/patch-ab
new file mode 100644
index 000000000000..65be1d557ba1
--- /dev/null
+++ b/archivers/ha/files/patch-ab
@@ -0,0 +1,15 @@
+--- 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