ports/101918: [patch] archivers/ha

[Gabor Kovesdan]

>Number:         101918
>Category:       ports
>Synopsis:       [patch] archivers/ha
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 12 13:40:14 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Gabor Kovesdan
>Release:        FreeBSD 6.1-STABLE i386
>Organization:
n/a
>Environment:
System: FreeBSD spitfire 6.1-STABLE FreeBSD 6.1-STABLE #0: Sat Jul 29 18:31:18 CEST 2006 gabor at spitfire:/usr/src/sys/i386/compile/SPITFIRE i386

>Description:

- Respect DESTDIR
- Eliminate a patch
- Use INSTALL_PROGRAM to install the binary

>How-To-Repeat:
>Fix:

--- archivers-ha.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/archivers/ha/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- Makefile	3 May 2006 05:14:02 -0000	1.18
+++ Makefile	12 Aug 2006 13:14:26 -0000
@@ -22,12 +22,16 @@
 ALL_TARGET=	ha
 USE_GMAKE=	yes
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
+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:
-	cd ${WRKSRC}; ${INSTALL} ${COPY} ${STRIP} -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ha ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/ha ${TARGETDIR}/bin
 
 .include <bsd.port.mk>
Index: files/patch-ab
===================================================================
RCS file: files/patch-ab
diff -N files/patch-ab
--- files/patch-ab	31 Mar 2002 02:39:41 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,15 +0,0 @@
---- 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
--- archivers-ha.diff ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: