From owner-freebsd-ports-bugs@FreeBSD.ORG Thu Aug 10 22:40:21 2006 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 236BF16A5BD for ; Thu, 10 Aug 2006 22:40:21 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9DEAD43D45 for ; Thu, 10 Aug 2006 22:40:20 +0000 (GMT) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id k7AMeKpD000478 for ; Thu, 10 Aug 2006 22:40:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k7AMeKBE000477; Thu, 10 Aug 2006 22:40:20 GMT (envelope-from gnats) Resent-Date: Thu, 10 Aug 2006 22:40:20 GMT Resent-Message-Id: <200608102240.k7AMeKBE000477@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Gabor Kovesdan Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E408916A4DD; Thu, 10 Aug 2006 22:32:31 +0000 (UTC) (envelope-from root@catv-50635cb6.catv.broadband.hu) Received: from catv-50635cb6.catv.broadband.hu (catv-50635cb6.catv.broadband.hu [80.99.92.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2D9D643D58; Thu, 10 Aug 2006 22:32:31 +0000 (GMT) (envelope-from root@catv-50635cb6.catv.broadband.hu) Received: by catv-50635cb6.catv.broadband.hu (Postfix, from userid 0) id C244C289C26; Fri, 11 Aug 2006 00:32:30 +0200 (CEST) Message-Id: <20060810223230.C244C289C26@catv-50635cb6.catv.broadband.hu> Date: Fri, 11 Aug 2006 00:32:30 +0200 (CEST) From: Gabor Kovesdan To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Gabor Kovesdan Subject: ports/101787: [patch] archivers/unace X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Gabor Kovesdan List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 10 Aug 2006 22:40:21 -0000 >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 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: