Date: Sun, 13 Aug 2006 00:39:50 +0200 (CEST) From: Gabor Kovesdan <gabor@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: Gabor Kovesdan <gabor@FreeBSD.org> Subject: ports/101949: [patch] archivers/squsq Message-ID: <20060812223950.DF500289D47@catv-50635cb6.catv.broadband.hu> Resent-Message-ID: <200608122240.k7CMeDGI065394@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 101949
>Category: ports
>Synopsis: [patch] archivers/squsq
>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 22:40:12 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 a patch
>How-To-Repeat:
>Fix:
--- archivers-squsq.diff begins here ---
Index: Makefile
===================================================================
RCS file: /usr/cvs/ports/archivers/squsq/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- Makefile 27 Jul 2004 07:04:25 -0000 1.3
+++ Makefile 12 Aug 2006 22:36:26 -0000
@@ -20,7 +20,11 @@
PLIST_FILES= bin/sq bin/usq
+post-patch:
+ @${REINPLACE_CMD} "s@#ifdef C70 | TOPS20@#if defined(C70) || defined(TOPS20)@" \
+ ${WRKSRC}/usq.c
+
do-install:
- ${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq ${PREFIX}/bin
+ ${INSTALL_PROGRAM} ${WRKSRC}/sq ${WRKSRC}/usq ${TARGETDIR}/bin
.include <bsd.port.mk>
Index: files/patch-aa
===================================================================
RCS file: files/patch-aa
diff -N files/patch-aa
--- files/patch-aa 12 May 2003 13:30:46 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,20 +0,0 @@
---- usq.c.orig Sun Jan 17 01:54:04 1988
-+++ usq.c Sun Jan 17 01:54:05 1988
-@@ -215,7 +215,7 @@
- goto closein;
- }
-
--#ifdef C70 | TOPS20
-+#if defined(C70) || defined(TOPS20)
- filecrc = getx16(inbuff);
- #else
- filecrc = getw16(inbuff);
-@@ -239,7 +239,7 @@
- printf("%s -> %s: ", infile, outfile);
- #endif
-
--#ifdef C70 | TOPS20
-+#if defined(C70) || defined(TOPS20)
- numnodes = getx16(inbuff);
- #else
- numnodes = getw16(inbuff);
--- archivers-squsq.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?20060812223950.DF500289D47>