Date: Fri, 11 Aug 2006 00:32:30 +0200 (CEST) From: Gabor Kovesdan <gabor@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gabor Kovesdan <gabor@FreeBSD.org> Subject: ports/101787: [patch] archivers/unace Message-ID: <20060810223230.C244C289C26@catv-50635cb6.catv.broadband.hu> Resent-Message-ID: <200608102240.k7AMeKBE000477@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101787
>Category: ports
>Synopsis: [patch] archivers/unace
>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: Thu Aug 10 22:40:20 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@spitfire:/usr/src/sys/i386/compile/SPITFIRE i386
>Description:
- Respect DESTDIR
- Eliminate two patches and reinplace edit instead
>How-To-Repeat:
>Fix:
--- archivers-unace.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/archivers/unace/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- Makefile 22 Feb 2005 15:29:27 -0000 1.9
+++ Makefile 10 Aug 2006 22:28:52 -0000
@@ -20,7 +20,15 @@
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>
Index: files/patch-ab
===================================================================
RCS file: files/patch-ab
diff -N files/patch-ab
--- files/patch-ab 16 Sep 2000 18:09:56 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -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
Index: files/patch-uac__crt.h
===================================================================
RCS file: files/patch-uac__crt.h
diff -N files/patch-uac__crt.h
--- files/patch-uac__crt.h 22 Feb 2005 15:29:27 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/archivers/unace/files/patch-uac__crt.h,v 1.1 2005/02/22 15:29:27 naddy Exp $
-
---- 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
--- archivers-unace.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20060810223230.C244C289C26>