Date: Tue, 5 May 2009 17:33:35 +0200 (CEST) From: Ulrich Spoerlein <uspoerlein@gmail.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: freebsd@akruijff.dds.nl Subject: ports/134234: [PATCH] sysutils/samesame: Unbreak build on ZFS Message-ID: <200905051533.n45FXZU1006430@roadrunner.spoerlein.net> Resent-Message-ID: <200905051540.n45Fe12U047790@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 134234
>Category: ports
>Synopsis: [PATCH] sysutils/samesame: Unbreak build on ZFS
>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: Tue May 05 15:40:00 UTC 2009
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 7.2-PRERELEASE i386
>Organization:
>Environment:
>Description:
The port's install routine is using bogus tests (during install time, no less!) breaking
on ZFS due to misusage of find(1).
- Fix the sed magic to really kill all test-foo deps and only those
Port maintainer (freebsd@akruijff.dds.nl) is cc'd.
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
Build samesame with ZFS backed OBJDIR:
===> Checking if sysutils/samesame already installed
/usr/bin/install -c -o root -g wheel -m 0755 samefile /usr/local/bin/
/usr/bin/install -c -o root -g wheel -m 0644 samefile.1.gz /usr/local/man/man1/
/usr/bin/install -c -o root -g wheel -m 0755 samelink /usr/local/bin/
/usr/bin/install -c -o root -g wheel -m 0644 samelink.1.gz /usr/local/man/man1/
Testing samearchive-lite
--- test.out 2009-05-04 22:26:14.747699199 +0200
+++ test.samearchive-lite 2009-04-11 05:28:07.000000000 +0200
@@ -1,6 +1,6 @@
11 test/file1a test2/file1a = 2 1
-11 test/file2c test2/file2c = 3 1
-11 test/file1b test2/file1b = 2 1
11 test/file3a test2/file3a = 1 1
-11 test/file2b test2/file2b = 3 1
11 test/file2a test2/file2a = 3 1
+11 test/file2c test2/file2c = 3 1
+11 test/file2b test2/file2b = 3 1
+11 test/file1b test2/file1b = 2 1
*** Error code 1
Stop in /usr/obj/usr/ports/sysutils/samesame/work/samesame-1.0.
>Fix:
--- samesame-1.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /tank/ncvs/ports/sysutils/samesame/Makefile,v
retrieving revision 1.2
diff -u -p -u -r1.2 Makefile
--- Makefile 1 May 2009 18:25:31 -0000 1.2
+++ Makefile 5 May 2009 15:28:16 -0000
@@ -47,10 +47,10 @@ CFLAGS+= -DPATH_INIT=256
CFLAGS+= -DSTATIC_CACHE_CAPACITY=8192
post-patch:
- @${REINPLACE_CMD} -e 's|test-samefile||g' \
- -e 's|test-samelink||g' \
- -e 's|test-samearchive||g' \
- -e 's|test-samearchive-lite||g' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e '/^install/s|test-samefile||g' \
+ -e '/^install/s|test-samelink||g' \
+ -e '/^install/s|test-samearchive-lite||g' \
+ -e '/^install/s|test-samearchive||g' ${WRKSRC}/Makefile
post-install:
${CHMOD} 770 ${WRKSRC}/test*
--- samesame-1.0.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905051533.n45FXZU1006430>