Attachment #119156 for bug #161621

View | Details | Raw Unified | Return to bug 161621
Collapse All | Expand All




MAINTAINER=	ports@FreeBSD.org
COMMENT=	A graphical diff tool

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>




--- 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

Lines 1-10 Link Here

(-)sysutils/dirdiff/files/patch-ab (-10 lines)
1	--- dirdiff.orig Tue Mar 13 20:30:41 2001
2	+++ dirdiff Fri Mar 5 04:55:43 2004
3	@@ -1,6 +1,6 @@
4	#!/bin/sh
5	# Tcl ignores the next line \
6	-exec wish "$0" -- "${1+$@}"
7	+exec wish8.4 "$0" -- "${1+$@}"
8
9	# Copyright (C) 1999-2001 Paul Mackerras. All rights reserved.
10	# This program is free software; it may be used, copied, modified

Lines 1-2 Link Here

(-)sysutils/dirdiff/pkg-plist (-2 lines)
1	bin/dirdiff
2	lib/libfilecmp.so.0

Return to bug 161621

Lines 14-20 Link Here

(-)sysutils/dirdiff/Makefile (-2 / +20 lines)
14	MAINTAINER= ports@FreeBSD.org	14	MAINTAINER= ports@FreeBSD.org
15	COMMENT= A graphical diff tool	15	COMMENT= A graphical diff tool
16		16
17	BUILD_DEPENDS= tclsh8.4:${PORTSDIR}/lang/tcl84	17	LICENSE= GPLv2 # (or later)
18	RUN_DEPENDS= wish8.4:${PORTSDIR}/x11-toolkits/tk84	18	LICENSE_FILE= ${WRKSRC}/COPYING
		19
		20	USE_TCL_BUILD= yes
		21	USE_TK= yes
		22
		23	PLIST_FILES= bin/dirdiff lib/libfilecmp.so.0
		24
		25	CFLAGS+= -fPIC -I${TCL_INCLUDEDIR}
		26
		27	post-patch:
		28	@${REINPLACE_CMD} -e \
		29	's\|.0.0\|.0\|g ; \
		30	s\|^CFLAGS=\|CFLAGS?=\|g' ${WRKSRC}/Makefile
		31	@${REINPLACE_CMD} -e \
		32	's\|^exec wish \|exec ${WISH:T} \|' ${WRKSRC}/dirdiff
		33
		34	do-install:
		35	${INSTALL_SCRIPT} ${WRKSRC}/dirdiff ${PREFIX}/bin
		36	${INSTALL_DATA} ${WRKSRC}/libfilecmp.so.0 ${PREFIX}/lib
19		37
20	.include <bsd.port.mk>	38	.include <bsd.port.mk>

Lines 1-31 Link Here

(-)sysutils/dirdiff/files/patch-aa (-31 lines)
1	--- Makefile.orig Tue Apr 19 19:52:01 2005
2	+++ Makefile Wed Jul 6 15:05:14 2005
3	@@ -2,21 +2,21 @@
4	#
5	# In fact all we have to make is the libfilecmp.so.0.0 library.
6
7	-BINDIR=$(DESTDIR)/usr/bin
8	-LIBDIR=$(DESTDIR)/usr/lib
9	+BINDIR=$(DESTDIR)${PREFIX}/bin
10	+LIBDIR=$(DESTDIR)${PREFIX}/lib
11	INSTALL=install
12
13	# You may need to change the -I arguments depending on your system
14	-CFLAGS=-O3 -I/usr/include/tcl8.3/ -I/usr/include/tcl
15	+CFLAGS+=-fPIC -I/usr/local/include/tcl8.4/
16
17	-all: libfilecmp.so.0.0
18	+all: libfilecmp.so.0
19
20	-libfilecmp.so.0.0: filecmp.c
21	+libfilecmp.so.0: filecmp.c
22	$(CC) $(CFLAGS) -shared -o $@ filecmp.c
23
24	-install: dirdiff libfilecmp.so.0.0
25	+install: dirdiff libfilecmp.so.0
26	$(INSTALL) -c dirdiff $(BINDIR)
27	- $(INSTALL) -c libfilecmp.so.0.0 $(LIBDIR)
28	+ $(INSTALL) -c libfilecmp.so.0 $(LIBDIR)
29
30	clean:
31	rm -f libfilecmp.so.0.0