[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: misc/fd

Subject: Re: misc/fd
From: Tatoku Ogaito <tacha@tack.fukui-med.ac.jp>
To: tech-pkg-ja@jp.netbsd.org
Date: Sat, 22 Jul 2006 01:39:46 +0900 (JST)
Message-Id: <20060722.013946.38321670.tacha@tack.fukui-med.ac.jp>
In-Reply-To: <200606291539.ICE00052.UPCBB@lins.jp><44A3E8D8.480A9625@ims.ac.jp>
References: <20060629.125847.132920409.tacha@tack.fukui-med.ac.jp><20060629.140012.71112035.taca@back-street.net><44A3E8D8.480A9625@ims.ac.jp>
Delivered-To: mailing list tech-pkg-ja@jp.netbsd.org
Mailing-List: contact tech-pkg-ja-help@jp.netbsd.org; run by ezmlm-idx

おおがいとです。

すっかり間の抜けたメールですが、現状を御報告

>> In Message <200606291539.ICE00052.UPCBB@lins.jp>
 at Thu, 29 Jun 2006 15:39:53 +0900
 OBATA Akio <obata@lins.jp> wrote:

 > でもまあ、なんと言いましょうか、pkgsrc の MAINTAINER ってのは、
 > pkgsrc をいじっているのであって、バイナリパッケージの作成までは
 > 与り知らないところだと思います。どんなプラットフォームで作られるのやら。
 > ということで、MAINTAINERが頒布登録なんて不可能じゃないかと思うのですが、
 > どうでしょうか？
 > ＃白井さんにも聞いてみないとわかりませんが。
 > ＃想定外なのではないかと思ってみたり。

この辺りの点について現在、しらいさんと議論をしています。
基本的に領布登録はしてほしいということです。

>> In Message <44A3E8D8.480A9625@ims.ac.jp>
 at Thu, 29 Jun 2006 23:51:04 +0900
 Osamu OISHI <oishi@ims.ac.jp> wrote:

 > 今pkg/33067を見ていると
...
 > でないとNetBSD-2.Xでcompileできなくなるのは確認できました。

との事なので、2nd part につけるような変更にするのはどうでしょうか？
NetBSD/i386(1.6.2_STABLE, 2.1_STABLE, 3.0_STABLE, 3.99.21), 
NetBSD/amd64(3.99.21), NetBSD/alpha, NetBSD/macppc, 
NetBSD/sparc64 (以上 3.0_STABLE)で compile/起動を確認しました。
# もっとも、i386 の 1.6.2_STABLE と 2.1_STABLE は chroot した環境ですけど。

shells/fd2 という話もあるので、とりあえず作ったのを 3rd part に
つけます。patches/ 以下は、主にしらいさん提供です。

こちらも NetBSD/i386(1.6.2_STABLE, 2.1_STABLE, 3.0_STABLE, 3.99.21), 
NetBSD/amd64(3.99.21), NetBSD/alpha, NetBSD/macppc, NetBSD/sparc64 
(以上 3.0_STABLE)で compile/起動を確認しています。

 > これはbinary配布を行わない場合は領布登録は不要と言っているわけですが、

ではないようで、その場合でもソースの領布にはあたるので
ソース領布登録を行うことが望ましいとおっしゃっていると
理解しています。

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	21 Jul 2006 16:09:17 -0000
@@ -6,19 +6,28 @@
 CATEGORIES=	misc
 MASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
 
-MAINTAINER=	nobu@psrc.isac.co.jp
+MAINTAINER=	tech-pkg-ja@jp.netbsd.org
 COMMENT=	File and directory management tool
 
-BROKEN_IN=	pkgsrc-2005Q4 pkgsrc-2006Q1
-
 MANLANG=	ja
 MAKE_ENV+=	LANG=${MANLANG:Q}
 DOCS=		README FAQ HISTORY ToAdmin
 
+RESTRICTED=     We registrate only source circulation.
+NO_BIN_ON_CDROM=        ${RESTRICTED}
+NO_BIN_ON_FTP=          ${RESTRICTED}
+
+SUBST_CLASSES+=	paths
+SUBST_MESSAGE.paths=	Fixing hardcoded paths.
+SUBST_STAGE.paths=	post-patch
+SUBST_FILES.paths=	Makefile.in
+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
+#do-configure:
+#	@cd ${WRKSRC}; v=version.h; ${MV} $$v $$v.orig; \
+#	${SED} 's/\(distributor = \)NULL/\1"${MAINTAINER}"/' $$v.orig > $$v
 
 post-install:
 	@${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fd
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	3 Jul 2006 08:57:52 -0000
@@ -3,4 +3,6 @@
 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 (patch-ac) = bf140f9f6ab78bc9580a9d175068468b55f6b705
+SHA1 (patch-af) = 50403084ce3955f6cb77c23f975400732cb050bb
+SHA1 (patch-ag) = 359464ddb1511d62c8a74741a093623d28fe064c
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-ac
===================================================================
RCS file: patches/patch-ac
diff -N patches/patch-ac
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-ac	3 Jul 2006 08:51:18 -0000
@@ -0,0 +1,25 @@
+$NetBSD$
+
+--- machine.h.orig	2001-12-18 00:00:00.000000000 +0900
++++ machine.h	2006-07-03 17:41:50.000000000 +0900
+@@ -490,7 +490,6 @@
+ #define	DECLERRLIST
+ #define	USELEAPCNT
+ #define	USETERMIOS
+-#define	USEMOUNTH
+ #define	USEMNTINFO
+ #define	USEFFSTYPE
+ #define	USERE_COMP
+@@ -504,6 +503,12 @@
+ #define	USESETPGID
+ #define	SIGFNCINT
+ #include <sys/param.h>
++#if           (__NetBSD_Version__ >= 300000000)
++# define	USESTATVFSH
++# define	f_flags	f_flag
++#else
++# define	USEMOUNTH
++#endif
+ # if	defined (NetBSD1_0) && (NetBSD1_0 < 1)
+ # define	USEFFSIZE
+ # endif
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	3 Jul 2006 08:51:21 -0000
@@ -0,0 +1,14 @@
+$NetBSD$
+
+--- dosdisk.c.orig	2006-07-03 14:26:52.000000000 +0900
++++ dosdisk.c	2006-07-03 14:27:32.000000000 +0900
+@@ -62,6 +62,9 @@
+ #include <sys/ioctl.h>
+ #define	D_SECSIZE(dl)	(dl).d_secsize
+ # if	defined (BSD4) || defined (BSD43)
++#if defined(__NetBSD__)
++# define OMIT_FSTYPENUMS
++#endif
+ # include <sys/disklabel.h>
+ # else
+ #  ifdef	SOLARIS
Index: patches/patch-ag
===================================================================
RCS file: patches/patch-ag
diff -N patches/patch-ag
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-ag	3 Jul 2006 08:57:49 -0000
@@ -0,0 +1,55 @@
+$NetBSD$
+
+--- info.c.orig	2001-12-18 00:00:00.000000000 +0900
++++ info.c	2006-07-03 16:41:26.000000000 +0900
+@@ -480,7 +480,7 @@
+ static FILE *NEAR setmntent(file, mode)
+ char *file, *mode;
+ {
+-	struct statfs *buf;
++	statfs_t *buf;
+ 	int size;
+ 
+ 	buf = NULL;
+@@ -491,9 +491,9 @@
+ # ifdef	USEMNTINFOR
+ 	getmntinfo_r(&buf, MNT_WAIT, &mnt_size, &size);
+ # else
+-	size = (getfsstat(NULL, 0, MNT_WAIT) + 1) * sizeof(struct statfs);
++	size = (getfsstat(NULL, 0, MNT_WAIT) + 1) * sizeof(statfs_t);
+ 	if (size > 0) {
+-		buf = (struct statfs *)malloc2(mnt_size);
++		buf = (statfs_t *)malloc2(mnt_size);
+ 		mnt_size = getfsstat(buf, mnt_size, MNT_WAIT);
+ 	}
+ # endif
+@@ -505,6 +505,11 @@
+ #define	MNT_RDONLY	M_RDONLY
+ #endif
+ 
++#if	!defined (MNT_RDONLY) && defined (ST_RDONLY)
++#define	MNT_RDONLY	ST_RDONLY
++#endif
++
++
+ static mnt_t *NEAR getmntent2(fp, mntp)
+ FILE *fp;
+ mnt_t *mntp;
+@@ -512,7 +517,7 @@
+ 	static char *fsname = NULL;
+ 	static char *dir = NULL;
+ 	static char *type = NULL;
+-	struct statfs *buf;
++	statfs_t *buf;
+ #ifdef	USEMNTINFO
+ # ifdef	USEVFCNAME
+ 	struct vfsconf *conf;
+@@ -541,7 +546,7 @@
+ 	int len;
+ 
+ 	if (mnt_ptr >= mnt_size) return(NULL);
+-	buf = (struct statfs *)fp;
++	buf = (statfs_t *)fp;
+ 
+ 	len = strlen(buf[mnt_ptr].f_mntfromname) + 1;
+ 	fsname = realloc2(fsname, len);

# This is a shell archive.  Save it in a file, remove anything before
# this line, and then unpack it by entering "sh file".  Note, it may
# create directories; files and directories will be owned by you and
# have default permissions.
#
# This archive contains:
#
#	fd2/DESCR
#	fd2/Makefile
#	fd2/PLIST
#	fd2/distinfo
#	fd2/patches/patch-aa
#	fd2/patches/patch-ab
#	fd2/patches/patch-ac
#	fd2/patches/patch-ad
#
echo x - fd2/DESCR
sed 's/^X//' >fd2/DESCR << 'END-of-fd2/DESCR'
X`FD' is a file and directory management tool for text terminal.
XBrowsing file list, viewing, editing, archiving/extracting management
Xwith a few touch.
X
XFD for unix by shirai@unixusers.net, and it is a clone of
XFD for DOS (AT and PC9801) designed by A. Idei (SDI00544@niftyserve.or.jp).
END-of-fd2/DESCR
echo x - fd2/Makefile
sed 's/^X//' >fd2/Makefile << 'END-of-fd2/Makefile'
X# $NetBSD$
X#
X
XDISTNAME=	FD-2.08d
XPKGNAME=	fd-2.08d
XCATEGORIES=	misc
XMASTER_SITES=	http://hp.vector.co.jp/authors/VA012337/soft/fd/
X
XMAINTAINER=	tacha@NetBSD.org
XCOMMENT=	File and directory management tool
X
XMANLANG=	ja
XMAKE_ENV+=	LANG=${MANLANG:Q}
XDOCS=		README FAQ HISTORY ToAdmin LICENSES TECHKNOW
X
XRESTRICTED=     We registrate only source circulation.
XNO_BIN_ON_CDROM=        ${RESTRICTED}
XNO_BIN_ON_FTP=          ${RESTRICTED}
X
XSUBST_CLASSES+=	paths
XSUBST_MESSAGE.paths=	Fixing hardcoded paths.
XSUBST_STAGE.paths=	post-patch
XSUBST_FILES.paths=	Makefile
XSUBST_SED.paths=	-e 's|/usr/local|${PREFIX}|g'
XSUBST_SED.paths+=	-e 's|/etc|${PKG_SYSCONFDIR}|g'
X
X# require maintainer signature for binary package distributions
X#SUBST_CLASSES+=signature
X#SUBST_MESSAGE.signature= Regist distributor information.
X#SUBST_STAGE.signature=	post-configure
X#SUBST_FILES.signature=	version.h
X#SUBST_SED.signature=	-e 's/\(distributor = \)NULL/\1"${MAINTAINER}"/'
X
Xpost-install:
X	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/fd
X	for i in ${DOCS}; do \
X		${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/fd/$$i.ja; \
X		${INSTALL_DATA} ${WRKSRC}/$$i.eng ${PREFIX}/share/doc/fd/$$i; \
X	done
X
X.include "../../mk/bsd.pkg.mk"
END-of-fd2/Makefile
echo x - fd2/PLIST
sed 's/^X//' >fd2/PLIST << 'END-of-fd2/PLIST'
X@comment $NetBSD$
Xbin/fd
Xbin/fdsh
Xbin/fd-unicd.tbl
Xman/man1/fd.1
Xman/man1/fdsh.1
Xshare/doc/fd/README.ja
Xshare/doc/fd/README
Xshare/doc/fd/FAQ.ja
Xshare/doc/fd/FAQ
Xshare/doc/fd/HISTORY.ja
Xshare/doc/fd/HISTORY
Xshare/doc/fd/ToAdmin.ja
Xshare/doc/fd/ToAdmin
Xshare/doc/fd/LICENSES.ja
Xshare/doc/fd/LICENSES
Xshare/doc/fd/TECHKNOW.ja
Xshare/doc/fd/TECHKNOW
END-of-fd2/PLIST
echo x - fd2/distinfo
sed 's/^X//' >fd2/distinfo << 'END-of-fd2/distinfo'
X$NetBSD$
X
XSHA1 (FD-2.08d.tar.gz) = 9439b6a36767ca95a93d399d79019786ffef6f35
XRMD160 (FD-2.08d.tar.gz) = 9dca54b2f462c1e731baa0454783c2b8dfd8b6d3
XSize (FD-2.08d.tar.gz) = 724064 bytes
XSHA1 (patch-aa) = 89969b67f900ffa43a4d1de3d708049a33e5447f
XSHA1 (patch-ab) = 8267da67c3b5c2004254db261a02f40dd13c21c9
XSHA1 (patch-ac) = 5befeeb148a4cda6b0caee0d93fb4415e9e0eaf0
XSHA1 (patch-ad) = 101769c35d2621437b60931621c88afdb15c44d0
END-of-fd2/distinfo
echo x - fd2/patches/patch-aa
sed 's/^X//' >fd2/patches/patch-aa << 'END-of-fd2/patches/patch-aa'
X$NetBSD$
X
X--- custom.c.orig	2006-06-13 00:00:00.000000000 +0900
X+++ custom.c	2006-07-22 00:14:35.000000000 +0900
X@@ -341,7 +341,7 @@
X int custno = -1;
X #endif
X 
X-static CONST envtable envlist[] = {
X+static envtable envlist[] = {
X 	{"FD_SORTTYPE", &sorttype, DEFVAL(SORTTYPE), STTP_E, T_SORT},
X 	{"FD_DISPLAYMODE", &displaymode, DEFVAL(DISPLAYMODE), DPMD_E, T_DISP},
X #ifndef	_NOTREE
X@@ -762,6 +762,31 @@
X }
X #endif	/* !_NOKANJIFCONV */
X 
X+#if	!MSDOS
X+VOID initenv(VOID_A)
X+{
X+	char *cp;
X+	int i, w;
X+
X+	if ((w = sizeof(char *) - sizeof(int)) <= 0) return;
X+	i = 0x5a;
X+	cp = (char *)(&i);
X+	if (*cp == 0x5a) return;
X+
X+	for (i = 0; i < ENVLISTSIZ; i++) switch (env_type(i)) {
X+		case T_CHARP:
X+		case T_PATH:
X+		case T_PATHS:
X+		case T_EDIT:
X+			break;
X+		default:
X+			cp = (char *)(&(envlist[i].def.num));
X+			memmove(cp, &(cp[w]), sizeof(int));
X+			break;
X+	}
X+}
X+#endif	/* !MSDOS */
X+
X static VOID NEAR evalheader(VOID_A)
X {
X #ifndef	_NOEXTRAWIN
END-of-fd2/patches/patch-aa
echo x - fd2/patches/patch-ab
sed 's/^X//' >fd2/patches/patch-ab << 'END-of-fd2/patches/patch-ab'
X$NetBSD$
X
X--- dosdisk.c.orig	2006-06-13 00:00:00.000000000 +0900
X+++ dosdisk.c	2006-07-22 00:14:35.000000000 +0900
X@@ -59,6 +59,7 @@
X #include <sys/ioctl.h>
X #define	D_SECSIZE(dl)	(dl).d_secsize
X # ifdef	BSD4
X+# define	OMIT_FSTYPENUMS		/* For NetBSD >=3.1 */
X # include <sys/disklabel.h>
X # else	/* !BSD4 */
X #  ifdef	SOLARIS
END-of-fd2/patches/patch-ab
echo x - fd2/patches/patch-ac
sed 's/^X//' >fd2/patches/patch-ac << 'END-of-fd2/patches/patch-ac'
X$NetBSD$
X
X--- func.h.orig	2006-06-13 00:00:00.000000000 +0900
X+++ func.h	2006-07-22 00:14:35.000000000 +0900
X@@ -677,6 +677,9 @@
X #endif
X 
X /* custom.c */
X+#if	!MSDOS
X+extern VOID initenv __P_((VOID_A));
X+#endif
X extern VOID evalenv __P_((VOID_A));
X #ifdef	DEBUG
X extern VOID freeenvpath __P_((VOID_A));
END-of-fd2/patches/patch-ac
echo x - fd2/patches/patch-ad
sed 's/^X//' >fd2/patches/patch-ad << 'END-of-fd2/patches/patch-ad'
X$NetBSD$
X
X--- main.c.orig	2006-06-13 00:00:00.000000000 +0900
X+++ main.c	2006-07-22 00:14:35.000000000 +0900
X@@ -1366,6 +1366,9 @@
X # endif
X #endif
X 
X+#if	!MSDOS
X+	initenv();
X+#endif
X #ifdef	_NOORIGSHELL
X 	inittty(0);
X 	getterment(NULL);
END-of-fd2/patches/patch-ad
exit

Follow-Ups:
- Re: misc/fd
  - From: OBATA Akio <obata@lins.jp>
- Re: misc/fd
  - From: Osamu OISHI <oishi@ims.ac.jp>

Prev by Date: Re: [patch] mail/smtpfeed
Next by Date: Re: misc/fd
Prev by thread: Re: [patch] mail/smtpfeed
Next by thread: Re: misc/fd
Index(es):
- Date
- Thread