- Respect DESTDIR

- Eliminate two patches and reinplace edit instead

PR:		101787
Submitted by:	gabor
Approved by:	maintainer

3 files changed, 9 insertions, 44 deletions

diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index cb0bc6701239..c73bef4d2936 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -20,7 +20,15 @@ USE_GMAKE=	yes
 ALL_TARGET=	clean unace
 PLIST_FILES=	bin/unace
 
+post-patch:
+	@${REINPLACE_CMD} -e "s|CFLAGS =|CFLAGS ?=|" \
+			-e "s|CC =|CC ?=|" \
+			-e 's|gcc $$(CFLAGS)|$${CC} $$(CFLAGS)|' \
+			${WRKSRC}/Makefile
+	@${REINPLACE_CMD} 's|(CHAR \* s, thead \* head, INT nopath);|(CHAR \* s, thead \* head, INT nopath, unsigned int size);|' \
+			${WRKSRC}/uac_crt.h
+
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/unace ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/unace ${TARGETDIR}/bin
 
 .include <bsd.port.mk>
diff --git a/archivers/unace/files/patch-ab b/archivers/unace/files/patch-ab
deleted file mode 100644
index 8a6189c0a6bc..000000000000
--- a/archivers/unace/files/patch-ab
+++ /dev/null
@@ -1,29 +0,0 @@
---- Makefile.orig	Wed May 12 16:10:27 1999
-+++ Makefile	Tue Aug 22 02:20:26 2000
-@@ -13,14 +13,14 @@
- #CFLAGS = -dNOSTRICMP         #for UNIX compilers not supporting stricmp()
- #CFLAGS = -dHI_LO_BYTE_ORDER  #select correct byte order for your machine!!
- 
--#CFLAGS = -Wall -O3 -s #-DNDEBUG
-+CFLAGS += -DNDEBUG
- #CFLAGS = -g -Wall -DMDEBUG
--CFLAGS = -O3 -fno-strength-reduce -fomit-frame-pointer # These are for Linux
-+#CFLAGS = -O3 -fno-strength-reduce -fomit-frame-pointer # These are for Linux
- #CFLAGS = -O -g -Wall -dLO_HI_BYTE_ORDER
- CHALLOC = challoc.o
- CHALLOC =
- CHNEW = chnew.o challoc.o
--CC = gcc
-+CC ?= gcc
- 
- ifeq ($(OSTYPE), Linux)
- CFLAGS += -DUNIX -DCASEINSENSE
-@@ -38,7 +38,7 @@
- 
- 
- unace$(EXEEXT): $(OBJ) $(CHALLOC)
--	gcc $(CFLAGS) -o $@ $^ $(LIBS)
-+	$(CC) $(CFLAGS) -o $@ $^ $(LIBS)
- 
- clean:
- 	rm -f *.o a.out core unace unace.exe
diff --git a/archivers/unace/files/patch-uac__crt.h b/archivers/unace/files/patch-uac__crt.h
deleted file mode 100644
index 20d6019fd038..000000000000
--- a/archivers/unace/files/patch-uac__crt.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD$
-
---- uac_crt.h.orig
-+++ uac_crt.h
-@@ -4,7 +4,7 @@
- 
- #include "acestruc.h"
- 
--CHAR *ace_fname(CHAR * s, thead * head, INT nopath);
-+CHAR *ace_fname(CHAR * s, thead * head, INT nopath, unsigned int size);
- INT  create_dest_file(CHAR * file, INT a);
- 
- #ifdef UNIX