Date: Sat, 15 Oct 2011 02:59:36 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/161621: Update port: sysutils/dirdiff Message-ID: <20111015025936.d57f5fbf.tkato432@yahoo.com> Resent-Message-ID: <201110141850.p9EIoJLW051582@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 161621
>Category: ports
>Synopsis: Update port: sysutils/dirdiff
>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 Oct 14 18:50:19 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Add LICENSE
- Support USE_TK
- Support PLIST_FILES
Remove file:
files/patch-aa
files/patch-ab
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/sysutils/dirdiff/Makefile sysutils/dirdiff/Makefile
--- /usr/ports/sysutils/dirdiff/Makefile 2010-12-29 19:05:10.000000000 +0900
+++ sysutils/dirdiff/Makefile 2011-09-04 20:35:15.000000000 +0900
@@ -14,7 +14,25 @@
MAINTAINER= ports@FreeBSD.org
COMMENT= A graphical diff tool
-BUILD_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84
-RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84
+LICENSE= GPLv2 # (or later)
+LICENSE_FILE= ${WRKSRC}/COPYING
+
+USE_TCL_BUILD= yes
+USE_TK= yes
+
+PLIST_FILES= bin/dirdiff lib/libfilecmp.so.0
+
+CFLAGS+= -fPIC -I${TCL_INCLUDEDIR}
+
+post-patch:
+ @${REINPLACE_CMD} -e \
+ 's|.0.0|.0|g ; \
+ s|^CFLAGS=|CFLAGS?=|g' ${WRKSRC}/Makefile
+ @${REINPLACE_CMD} -e \
+ 's|^exec wish |exec ${WISH:T} |' ${WRKSRC}/dirdiff
+
+do-install:
+ ${INSTALL_SCRIPT} ${WRKSRC}/dirdiff ${PREFIX}/bin
+ ${INSTALL_DATA} ${WRKSRC}/libfilecmp.so.0 ${PREFIX}/lib
.include <bsd.port.mk>
diff -urN /usr/ports/sysutils/dirdiff/files/patch-aa sysutils/dirdiff/files/patch-aa
--- /usr/ports/sysutils/dirdiff/files/patch-aa 2005-07-06 16:22:31.000000000 +0900
+++ sysutils/dirdiff/files/patch-aa 1970-01-01 09:00:00.000000000 +0900
@@ -1,31 +0,0 @@
---- Makefile.orig Tue Apr 19 19:52:01 2005
-+++ Makefile Wed Jul 6 15:05:14 2005
-@@ -2,21 +2,21 @@
- #
- # In fact all we have to make is the libfilecmp.so.0.0 library.
-
--BINDIR=$(DESTDIR)/usr/bin
--LIBDIR=$(DESTDIR)/usr/lib
-+BINDIR=$(DESTDIR)${PREFIX}/bin
-+LIBDIR=$(DESTDIR)${PREFIX}/lib
- INSTALL=install
-
- # You may need to change the -I arguments depending on your system
--CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
-+CFLAGS+=-fPIC -I/usr/local/include/tcl8.4/
-
--all: libfilecmp.so.0.0
-+all: libfilecmp.so.0
-
--libfilecmp.so.0.0: filecmp.c
-+libfilecmp.so.0: filecmp.c
- $(CC) $(CFLAGS) -shared -o $@ filecmp.c
-
--install: dirdiff libfilecmp.so.0.0
-+install: dirdiff libfilecmp.so.0
- $(INSTALL) -c dirdiff $(BINDIR)
-- $(INSTALL) -c libfilecmp.so.0.0 $(LIBDIR)
-+ $(INSTALL) -c libfilecmp.so.0 $(LIBDIR)
-
- clean:
- rm -f libfilecmp.so.0.0
diff -urN /usr/ports/sysutils/dirdiff/files/patch-ab sysutils/dirdiff/files/patch-ab
--- /usr/ports/sysutils/dirdiff/files/patch-ab 2004-03-06 21:09:20.000000000 +0900
+++ sysutils/dirdiff/files/patch-ab 1970-01-01 09:00:00.000000000 +0900
@@ -1,10 +0,0 @@
---- dirdiff.orig Tue Mar 13 20:30:41 2001
-+++ dirdiff Fri Mar 5 04:55:43 2004
-@@ -1,6 +1,6 @@
- #!/bin/sh
- # Tcl ignores the next line \
--exec wish "$0" -- "${1+$@}"
-+exec wish8.4 "$0" -- "${1+$@}"
-
- # Copyright (C) 1999-2001 Paul Mackerras. All rights reserved.
- # This program is free software; it may be used, copied, modified
diff -urN /usr/ports/sysutils/dirdiff/pkg-plist sysutils/dirdiff/pkg-plist
--- /usr/ports/sysutils/dirdiff/pkg-plist 2005-07-06 16:22:32.000000000 +0900
+++ sysutils/dirdiff/pkg-plist 1970-01-01 09:00:00.000000000 +0900
@@ -1,2 +0,0 @@
-bin/dirdiff
-lib/libfilecmp.so.0
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111015025936.d57f5fbf.tkato432>