Date: Fri, 11 Aug 2006 11:48:42 +0200 (CEST) From: Gabor Kovesdan <gabor@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gabor Kovesdan <gabor@FreeBSD.org> Subject: ports/101798: [patch] archivers/dzip Message-ID: <20060811094842.760E9289D47@catv-50635cb6.catv.broadband.hu> Resent-Message-ID: <200608110950.k7B9oDQn062958@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101798
>Category: ports
>Synopsis: [patch] archivers/dzip
>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: Fri Aug 11 09:50:13 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
- Don't override MAKE_ARGS, use reinplace edit instead
- Remove a -e where not necessary
>How-To-Repeat:
>Fix:
--- archivers-dzip.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/archivers/dzip/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- Makefile 22 Mar 2006 09:56:34 -0000 1.7
+++ Makefile 11 Aug 2006 09:45:26 -0000
@@ -19,7 +19,6 @@
WRKSRC= ${WRKDIR}
MAKEFILE= ${WRKSRC}/Makefile.linux
-MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
ALL_TARGET= ${PORTNAME}
PLIST_FILES= bin/${PORTNAME}
@@ -28,11 +27,14 @@
${REINPLACE_CMD} -e 's/ifdef BIG_ENDIAN/if BYTE_ORDER == BIG_ENDIAN/' \
-e 's/ifndef BIG_ENDIAN/if BYTE_ORDER == LITTLE_ENDIAN/' \
${WRKSRC}/dzip.h ${WRKSRC}/conmain.c
- ${REINPLACE_CMD} -e '4s,^,#include <machine/endian.h>,' ${WRKSRC}/dzip.h
- ${REINPLACE_CMD} -e 's/) $$(OBJECTS/&:T/' ${MAKEFILE}
+ ${REINPLACE_CMD} '4s,^,#include <machine/endian.h>,' ${WRKSRC}/dzip.h
+ ${REINPLACE_CMD} -e 's/) $$(OBJECTS/&:T/' \
+ -e 's|CC =|CC ?=|' \
+ -e 's|CFLAGS =|CFLAGS ?=|' \
+ ${MAKEFILE}
${REINPLACE_CMD} '21d;23d' ${WRKSRC}/dzipcon.h
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${TARGETDIR}/bin
.include <bsd.port.mk>
--- archivers-dzip.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?20060811094842.760E9289D47>