Date: Tue, 5 Oct 2004 02:01:24 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/72324: Update port: misc/whichman to 2.4 Message-ID: <20041005020124.25769687.tkato432@yahoo.com> Resent-Message-ID: <200410041710.i94HAXi0077337@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 72324
>Category: ports
>Synopsis: Update port: misc/whichman to 2.4
>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: Mon Oct 04 17:10:33 GMT 2004
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 4.10-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Update to version 2.4
Remove file:
files/patch-aa
files/patch-ab
pkg-plist
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/misc/whichman/Makefile misc/whichman/Makefile
--- /usr/ports/misc/whichman/Makefile Sat Apr 12 23:00:14 2003
+++ misc/whichman/Makefile Tue Oct 5 01:16:17 2004
@@ -6,15 +6,26 @@
#
PORTNAME= whichman
-PORTVERSION= 2.0
+PORTVERSION= 2.4
CATEGORIES= misc
-MASTER_SITES= ${MASTER_SITE_SUNSITE} \
- http://www.linuxfocus.org/~guido.socher/
-MASTER_SITE_SUBDIR= apps/doctools
+MASTER_SITES= http://main.linuxfocus.org/~guido.socher/
MAINTAINER= ports@FreeBSD.org
COMMENT= Approximate matching utilities to search for manpages and files
-MAN1= whichman.1 ftff.1 ftwhich.1
+USE_REINPLACE= yes
+MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}"
+
+MAN1= ftff.1 ftwhich.1 whichman.1
+PLIST_FILES= bin/ftff bin/ftwhich bin/whichman
+
+post-patch:
+ @${REINPLACE_CMD} -e 's|/usr/man:||g' ${WRKSRC}/whichman.c
+
+do-install:
+.for name in ftff ftwhich whichman
+ ${INSTALL_PROGRAM} ${WRKSRC}/${name} ${PREFIX}/bin
+ ${INSTALL_MAN} ${WRKSRC}/man1/${name}.1 ${MANPREFIX}/man/man1
+.endfor
.include <bsd.port.mk>
diff -urN /usr/ports/misc/whichman/distinfo misc/whichman/distinfo
--- /usr/ports/misc/whichman/distinfo Fri Jan 30 14:51:02 2004
+++ misc/whichman/distinfo Tue Oct 5 01:11:35 2004
@@ -1,2 +1,2 @@
-MD5 (whichman-2.0.tar.gz) = 9b4b17efc7390c4223836cc684cfd763
-SIZE (whichman-2.0.tar.gz) = 17727
+MD5 (whichman-2.4.tar.gz) = cc3d35f26bbd8bf99f4f16b276384333
+SIZE (whichman-2.4.tar.gz) = 18379
diff -urN /usr/ports/misc/whichman/files/patch-aa misc/whichman/files/patch-aa
--- /usr/ports/misc/whichman/files/patch-aa Tue Jun 6 23:13:30 2000
+++ misc/whichman/files/patch-aa Thu Jan 1 09:00:00 1970
@@ -1,13 +0,0 @@
---- whichman.c.orig Tue Jun 6 15:16:51 2000
-+++ whichman.c Tue Jun 6 15:17:09 2000
-@@ -399,8 +399,8 @@
-
- mpath = (char *) getenv("MANPATH");
- if (mpath == NULL || *mpath == '\0') {
-- fprintf(stderr,"Warning: MANPATH not defined, using /usr/man\n");
-- mpath="/usr/man";
-+ fprintf(stderr,"Warning: MANPATH not defined, using /usr/share/man\n");
-+ mpath="/usr/share/man";
- }
- /* make a copy that is static */
- cmpath = (char *)malloc(sizeof(char)*(strlen(mpath) + 2));
diff -urN /usr/ports/misc/whichman/files/patch-ab misc/whichman/files/patch-ab
--- /usr/ports/misc/whichman/files/patch-ab Tue Jun 6 23:13:30 2000
+++ misc/whichman/files/patch-ab Thu Jan 1 09:00:00 1970
@@ -1,40 +0,0 @@
---- Makefile.orig Tue Apr 11 23:04:09 2000
-+++ Makefile Tue Jun 6 16:57:24 2000
-@@ -1,9 +1,9 @@
- # written by Guido Socher
--PREFIX=/usr
-+#PREFIX=/usr/local
- INSTALL=install
- MANP=man1/whichman.1 man1/ftff.1 man1/ftwhich.1
--CC=gcc
--CFLAGS= -Wall -O2
-+CC?=gcc
-+CFLAGS?= -Wall -O2
- #sun c/c++-compiler:
- #CC=CC
- #CFLAGS= -O
-@@ -29,17 +29,17 @@
- $(CC) $(CFLAGS) -c levdist.c
-
- install: whichman ftff ftwhich $(MANP)
-- strip whichman
-- strip ftwhich
-- strip ftff
-+# strip whichman
-+# strip ftwhich
-+# strip ftff
- [ -d "$(PREFIX)/bin" ] || $(INSTALL) -d $(PREFIX)/bin
- [ -d "$(PREFIX)/man/man1" ] || $(INSTALL) -d $(PREFIX)/man/man1
-- $(INSTALL) -m 755 whichman $(PREFIX)/bin
-- $(INSTALL) -m 755 ftwhich $(PREFIX)/bin
-- $(INSTALL) -m 755 ftff $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) whichman $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) ftwhich $(PREFIX)/bin
-+ $(BSD_INSTALL_PROGRAM) ftff $(PREFIX)/bin
- for p in $(MANP) ; do \
- echo "installing $$p in $(PREFIX)/man/man1"; \
-- $(INSTALL) -m 644 $$p $(PREFIX)/man/man1 ;\
-+ $(BSD_INSTALL_MAN) $$p $(PREFIX)/man/man1 ;\
- done
-
- install_with_cp: whichman ftff ftwhich $(MANP)
diff -urN /usr/ports/misc/whichman/pkg-plist misc/whichman/pkg-plist
--- /usr/ports/misc/whichman/pkg-plist Tue Jun 6 23:13:30 2000
+++ misc/whichman/pkg-plist Thu Jan 1 09:00:00 1970
@@ -1,3 +0,0 @@
-bin/whichman
-bin/ftwhich
-bin/ftff
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20041005020124.25769687.tkato432>