[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
misc/fd
おおがいとです。
自分自身は全然使っていないのですが、ユーザの方に fd のファンが
いるので、 pkg から入れており、作れなくなってからは local で
更新を行っていました。というのも、元々の maintainer さんである
nobu at psrc さんが、LICENSES で要求されている、「領布登録」を
行ってるらしく、許可なく更新できないと考えていたためです。
とはいえ、BROKEN_IN が二つ定義され、このままでは消えてしまうのかと
思い、先週 maintainer さんに mail を差し上げたのですが、今のところ
お返事を頂けていません。
このような場合、どうするのが良いでしょうか？ 後ろに手元にある
pkgsrc-current からの差分をつけます。
私の理解では、patch を本家に採用してもらった上で、NO_BIN_ON_FTP と
NO_BIN_ON_CDROM を指定すれば、領布登録は不要だとは思うのですが、
作者に連絡していないので、確信はありません。
# できれば、maintainer は tech-pkg-ja@jp.netbsd.org にしたいなと
# 思っています。
Tacha
Index: Makefile
===================================================================
RCS file: /cvsroot/NetBSD-cvs/main/pkgsrc/misc/fd/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- Makefile 18 May 2006 20:29:59 -0000 1.22
+++ Makefile 27 Jun 2006 14:42:56 -0000
@@ -1,29 +1,37 @@
# $NetBSD: Makefile,v 1.22 2006/05/18 20:29:59 wiz Exp $
#
-DISTNAME= FD-1.03u
-PKGNAME= fd-1.03u
+DISTNAME= FD-2.08d
+PKGNAME= fd-2.08d
CATEGORIES= misc
MASTER_SITES= http://hp.vector.co.jp/authors/VA012337/soft/fd/
MAINTAINER= nobu@psrc.isac.co.jp
COMMENT= File and directory management tool
-BROKEN_IN= pkgsrc-2005Q4 pkgsrc-2006Q1
-
MANLANG= ja
MAKE_ENV+= LANG=${MANLANG:Q}
-DOCS= README FAQ HISTORY ToAdmin
+DOCS= README FAQ HISTORY ToAdmin LICENSES TECHKNOW
+
+SUBST_CLASSES+= paths
+SUBST_MESSAGE.paths= Fixing hardcoded paths.
+SUBST_STAGE.paths= post-patch
+SUBST_FILES.paths= Makefile
+SUBST_SED.paths= -e 's|/usr/local|${PREFIX}|g'
+SUBST_SED.paths+= -e 's|/etc|${PKG_SYSCONFDIR}|g'
# require maintainer signature for binary package distributions
-do-configure:
- @cd ${WRKSRC}; v=version.h; ${MV} $$v $$v.orig; \
- ${SED} 's/\(distributor = \)NULL/\1"${MAINTAINER}"/' $$v.orig > $$v
+SUBST_CLASSES+=signature
+SUBST_MESSAGE.signature= Regist distributor information.
+SUBST_STAGE.signature= post-configure
+SUBST_FILES.signature= version.h
+SUBST_SED.signature= -e 's/\(distributor = \)NULL/\1"${MAINTAINER}"/'
post-install:
@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fd
@for i in ${DOCS}; do \
- ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd; \
+ ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd/$$i.ja; \
+ ${INSTALL_DATA} ${WRKSRC}/$$i.eng ${PREFIX}/share/doc/fd/$$i; \
done
.include "../../mk/bsd.pkg.mk"
Index: PLIST
===================================================================
RCS file: /cvsroot/NetBSD-cvs/main/pkgsrc/misc/fd/PLIST,v
retrieving revision 1.1
diff -u -r1.1 PLIST
--- PLIST 1 Nov 2001 01:28:00 -0000 1.1
+++ PLIST 27 Jun 2006 13:57:22 -0000
@@ -1,9 +1,18 @@
@comment $NetBSD: PLIST,v 1.1 2001/11/01 01:28:00 zuntum Exp $
bin/fd
+bin/fdsh
bin/fd-unicd.tbl
man/man1/fd.1
+man/man1/fdsh.1
+share/doc/fd/README.ja
+share/doc/fd/README
+share/doc/fd/FAQ.ja
share/doc/fd/FAQ
+share/doc/fd/HISTORY.ja
share/doc/fd/HISTORY
-share/doc/fd/README
+share/doc/fd/ToAdmin.ja
share/doc/fd/ToAdmin
-@dirrm share/doc/fd
+share/doc/fd/LICENSES.ja
+share/doc/fd/LICENSES
+share/doc/fd/TECHKNOW.ja
+share/doc/fd/TECHKNOW
Index: distinfo
===================================================================
RCS file: /cvsroot/NetBSD-cvs/main/pkgsrc/misc/fd/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- distinfo 24 Feb 2005 11:02:51 -0000 1.6
+++ distinfo 27 Jun 2006 14:39:01 -0000
@@ -1,6 +1,7 @@
$NetBSD: distinfo,v 1.6 2005/02/24 11:02:51 agc Exp $
-SHA1 (FD-1.03u.tar.gz) = 5fd312b801a81400ae10bc3e5630ce315b48c765
-RMD160 (FD-1.03u.tar.gz) = 943a706dc64c81397c71babe7eab332341b3cc09
-Size (FD-1.03u.tar.gz) = 340097 bytes
-SHA1 (patch-aa) = 7877fcbf53da90e6d10fa57e3c6f55c761e9f11c
+SHA1 (FD-2.08d.tar.gz) = 9439b6a36767ca95a93d399d79019786ffef6f35
+RMD160 (FD-2.08d.tar.gz) = 9dca54b2f462c1e731baa0454783c2b8dfd8b6d3
+Size (FD-2.08d.tar.gz) = 724064 bytes
+SHA1 (patch-ae) = 3b1dbc09fc690e8388147afd01bdfc4ece9e96cb
+SHA1 (patch-af) = 4f3ca3207ad7af3a98e22c7d8d7a310f264f6329
Index: patches/patch-aa
===================================================================
RCS file: patches/patch-aa
diff -N patches/patch-aa
--- patches/patch-aa 30 Dec 2001 13:46:04 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.5 2001/12/30 13:46:04 wiz Exp $
-
---- Makefile.in.orig Tue Dec 18 00:00:00 2001
-+++ Makefile.in Wed Dec 19 13:02:55 2001
-@@ -4,7 +4,7 @@
-
- TITLE = FD-
- VERSION = __VERSION__
--PREFIX = /usr/local
-+PREFIX ?= /usr/local
- MANSEC = 1
- TOPDIR = $(PREFIX)
- BINDIR = $(TOPDIR)/bin
Index: patches/patch-ae
===================================================================
RCS file: patches/patch-ae
diff -N patches/patch-ae
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-ae 27 Jun 2006 14:32:06 -0000
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- machine.h.orig 2005-12-26 00:00:00.000000000 +0900
++++ machine.h 2005-12-29 08:46:18.000000000 +0900
+@@ -603,6 +603,7 @@
+ #define USESETENV
+ #define USEMKTIME
+ #define SIGFNCINT
++#define USESTATVFSH
+ #include <sys/param.h>
+ # if defined (NetBSD1_0) && (NetBSD1_0 < 1)
+ # define USEFFSIZE
Index: patches/patch-af
===================================================================
RCS file: patches/patch-af
diff -N patches/patch-af
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-af 27 Jun 2006 14:39:00 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- dosdisk.c.orig 2006-06-27 23:38:22.000000000 +0900
++++ dosdisk.c 2006-06-27 23:38:25.000000000 +0900
+@@ -59,6 +59,9 @@
+ #include <sys/ioctl.h>
+ #define D_SECSIZE(dl) (dl).d_secsize
+ # ifdef BSD4
++# ifdef __NetBSD__
++# define OMIT_FSTYPENUMS
++# endif
+ # include <sys/disklabel.h>
+ # else /* !BSD4 */
+ # ifdef SOLARIS