From fb792d1696e70d8500c886c89fa701c36b47a349 Mon Sep 17 00:00:00 2001 From: Charlie Date: Fri, 4 Jun 2010 12:45:19 -0700 Subject: [PATCH] update Fri Jun 4 12:37:00 PDT 2010 --- devel/Makefile | 5 +- devel/netbsd-iscsi-initiator/Makefile | 27 ---------- devel/netbsd-iscsi-initiator/PLIST | 3 -- devel/netbsd-iscsi-initiator/distinfo | 6 --- devel/netbsd-iscsi-initiator/patches/patch-aa | 17 ------- devel/netbsd-iscsi-lib/DESCR | 5 ++ devel/netbsd-iscsi-lib/Makefile | 14 ++++++ devel/netbsd-iscsi-lib/Makefile.common | 17 +++++++ devel/netbsd-iscsi-lib/PLIST | 4 ++ devel/netbsd-iscsi-lib/buildlink3.mk | 13 +++++ devel/netbsd-iscsi-lib/distinfo | 7 +++ devel/netbsd-iscsi-lib/patches/patch-ab | 22 +++++++++ devel/netbsd-iscsi-lib/patches/patch-ac | 20 ++++++++ devel/netbsd-iscsi-target/Makefile | 29 ----------- devel/netbsd-iscsi-target/PLIST | 5 -- devel/netbsd-iscsi-target/distinfo | 6 --- devel/netbsd-iscsi-target/patches/patch-aa | 17 ------- doc/CHANGES-2010 | 8 ++- net/Makefile | 4 +- {devel => net}/netbsd-iscsi-initiator/DESCR | 0 net/netbsd-iscsi-initiator/Makefile | 15 ++++++ net/netbsd-iscsi-initiator/PLIST | 3 ++ {devel => net}/netbsd-iscsi-target/DESCR | 0 net/netbsd-iscsi-target/Makefile | 15 ++++++ net/netbsd-iscsi-target/PLIST | 4 ++ time/emiclock/Makefile | 4 +- time/emiclock/distinfo | 5 +- time/emiclock/patches/patch-af | 13 +++++ time/emiclock/patches/patch-ag | 49 +++++++++++++++++++ time/emiclock/patches/patch-ah | 13 +++++ 30 files changed, 232 insertions(+), 118 deletions(-) delete mode 100644 devel/netbsd-iscsi-initiator/Makefile delete mode 100644 devel/netbsd-iscsi-initiator/PLIST delete mode 100644 devel/netbsd-iscsi-initiator/distinfo delete mode 100644 devel/netbsd-iscsi-initiator/patches/patch-aa create mode 100644 devel/netbsd-iscsi-lib/DESCR create mode 100644 devel/netbsd-iscsi-lib/Makefile create mode 100644 devel/netbsd-iscsi-lib/Makefile.common create mode 100644 devel/netbsd-iscsi-lib/PLIST create mode 100644 devel/netbsd-iscsi-lib/buildlink3.mk create mode 100644 devel/netbsd-iscsi-lib/distinfo create mode 100644 devel/netbsd-iscsi-lib/patches/patch-ab create mode 100644 devel/netbsd-iscsi-lib/patches/patch-ac delete mode 100644 devel/netbsd-iscsi-target/Makefile delete mode 100644 devel/netbsd-iscsi-target/PLIST delete mode 100644 devel/netbsd-iscsi-target/distinfo delete mode 100644 devel/netbsd-iscsi-target/patches/patch-aa rename {devel => net}/netbsd-iscsi-initiator/DESCR (100%) create mode 100644 net/netbsd-iscsi-initiator/Makefile create mode 100644 net/netbsd-iscsi-initiator/PLIST rename {devel => net}/netbsd-iscsi-target/DESCR (100%) create mode 100644 net/netbsd-iscsi-target/Makefile create mode 100644 net/netbsd-iscsi-target/PLIST create mode 100644 time/emiclock/patches/patch-af create mode 100644 time/emiclock/patches/patch-ag create mode 100644 time/emiclock/patches/patch-ah diff --git a/devel/Makefile b/devel/Makefile index 7dcb6c8de1fd..9fdab5695213 100644 --- a/devel/Makefile +++ b/devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1344 2010/06/03 05:06:25 jnemeth Exp $ +# $NetBSD: Makefile,v 1.1346 2010/06/04 16:16:39 sborrill Exp $ # COMMENT= Development utilities @@ -409,8 +409,7 @@ SUBDIR+= ncc SUBDIR+= ncurses SUBDIR+= ncursesw SUBDIR+= netbeans-ide -SUBDIR+= netbsd-iscsi-initiator -SUBDIR+= netbsd-iscsi-target +SUBDIR+= netbsd-iscsi-lib SUBDIR+= netcdf SUBDIR+= newfile SUBDIR+= newt diff --git a/devel/netbsd-iscsi-initiator/Makefile b/devel/netbsd-iscsi-initiator/Makefile deleted file mode 100644 index 316240526831..000000000000 --- a/devel/netbsd-iscsi-initiator/Makefile +++ /dev/null @@ -1,27 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2009/05/20 23:53:45 zafer Exp $ - -DISTNAME= netbsd-iscsi-20080207 -PKGNAME= ${DISTNAME:C/-iscsi/-iscsi-initiator/} -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_BACKUP} - -MAINTAINER= agc@NetBSD.org -HOMEPAGE= http://www.alistaircrooks.co.uk/software.html -COMMENT= NetBSD's iSCSI initiator (per iSCSI RFC 3720) - -GNU_CONFIGURE= yes -CONFIGURE_DIRS= src -BUILD_TARGET= all-initiator - -AUTO_MKDIRS= yes - -PKG_DESTDIR_SUPPORT= user-destdir - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/iscsifs ${DESTDIR}${PREFIX}/sbin/iscsifs - ${INSTALL_MAN} ${WRKSRC}/src/iscsifs.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/iscsifs.8 - -.include "../../mk/fuse.buildlink3.mk" -.include "../../mk/pthread.buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/netbsd-iscsi-initiator/PLIST b/devel/netbsd-iscsi-initiator/PLIST deleted file mode 100644 index 25c65c286986..000000000000 --- a/devel/netbsd-iscsi-initiator/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2007/11/14 20:33:47 agc Exp $ -man/man8/iscsifs.8 -sbin/iscsifs diff --git a/devel/netbsd-iscsi-initiator/distinfo b/devel/netbsd-iscsi-initiator/distinfo deleted file mode 100644 index 37bfd9f8adcc..000000000000 --- a/devel/netbsd-iscsi-initiator/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.9 2008/02/07 19:31:51 agc Exp $ - -SHA1 (netbsd-iscsi-20080207.tar.gz) = afe6ca2fdf46ce6dfed341dfd05aeb597584ae0f -RMD160 (netbsd-iscsi-20080207.tar.gz) = 62417a6c7bebf95257054f96990a7009f515c064 -Size (netbsd-iscsi-20080207.tar.gz) = 249607 bytes -SHA1 (patch-aa) = c97a1b97456cf2d11415ab22175c564baa9aae14 diff --git a/devel/netbsd-iscsi-initiator/patches/patch-aa b/devel/netbsd-iscsi-initiator/patches/patch-aa deleted file mode 100644 index d45bf5cef2e5..000000000000 --- a/devel/netbsd-iscsi-initiator/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.2 2007/12/18 11:38:44 agc Exp $ - ---- src/Makefile.in.orig 2006-06-03 00:39:22.000000000 +0000 -+++ src/Makefile.in -@@ -16,9 +16,9 @@ - SYSCONFDIR=@sysconfdir@ - - CC= @CC@ --PTHREAD_FLAGS= -pthread --PTHREAD_LDFLAGS= -pthread --PTHREAD_LIBS= -lpthread -+PTHREAD_FLAGS?= -pthread -+PTHREAD_LDFLAGS?= -pthread -+PTHREAD_LIBS?= -lpthread - GCC_CFLAGS= -Wall -Wstrict-prototypes -fno-strict-aliasing -fno-common -Wno-trigraphs - COMMON_CFLAGS += -DCONFIG_ISCSI_DEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE - COMMON_CFLAGS += -DHAVE_CONFIG_H diff --git a/devel/netbsd-iscsi-lib/DESCR b/devel/netbsd-iscsi-lib/DESCR new file mode 100644 index 000000000000..26f22cb6fee1 --- /dev/null +++ b/devel/netbsd-iscsi-lib/DESCR @@ -0,0 +1,5 @@ +iSCSI is an IETF standard (RFC 3720) for remote access to block-level +storage. It can be thought of as similar to NFS, except that an NFS +server exports files. + +This is the NetBSD libiscsi library use by both the target and initiator. diff --git a/devel/netbsd-iscsi-lib/Makefile b/devel/netbsd-iscsi-lib/Makefile new file mode 100644 index 000000000000..be05db36fffe --- /dev/null +++ b/devel/netbsd-iscsi-lib/Makefile @@ -0,0 +1,14 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $ + +PKGNAME= ${DISTNAME:C/-iscsi/-iscsi-lib/} +CATEGORIES= devel +COMMENT= NetBSD's iSCSI library (per iSCSI RFC 3720) + +BUILD_DIRS+= ${WRKSRC}/src/lib + +.include "Makefile.common" + +post-install: + ${INSTALL_DATA} ${WRKSRC}/include/iscsi.h ${DESTDIR}${PREFIX}/include + +.include "../../mk/bsd.pkg.mk" diff --git a/devel/netbsd-iscsi-lib/Makefile.common b/devel/netbsd-iscsi-lib/Makefile.common new file mode 100644 index 000000000000..cbbf394f9602 --- /dev/null +++ b/devel/netbsd-iscsi-lib/Makefile.common @@ -0,0 +1,17 @@ +# $NetBSD: Makefile.common,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $ +# Included by: +# net/netbsd-iscsi-target/Makefile +# net/netbsd-iscsi-initiator/Makefile + +DISTNAME= netbsd-iscsi-20100416 +MASTER_SITES= ${MASTER_SITE_BACKUP} + +MAINTAINER= agc@NetBSD.org +HOMEPAGE= http://www.alistaircrooks.co.uk/software.html +LICENSE= modified-bsd + +GNU_CONFIGURE= yes + +AUTO_MKDIRS= yes + +PKG_DESTDIR_SUPPORT= user-destdir diff --git a/devel/netbsd-iscsi-lib/PLIST b/devel/netbsd-iscsi-lib/PLIST new file mode 100644 index 000000000000..877352e59053 --- /dev/null +++ b/devel/netbsd-iscsi-lib/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $ +include/iscsi.h +lib/libiscsi.la +man/man3/libiscsi.3 diff --git a/devel/netbsd-iscsi-lib/buildlink3.mk b/devel/netbsd-iscsi-lib/buildlink3.mk new file mode 100644 index 000000000000..23a4a61ede27 --- /dev/null +++ b/devel/netbsd-iscsi-lib/buildlink3.mk @@ -0,0 +1,13 @@ +# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $ + +BUILDLINK_TREE+= netbsd-iscsi-lib + +.if !defined(NETBSD_ISCSI_LIB_BUILDLINK3_MK) +NETBSD_ISCSI_LIB_BUILDLINK3_MK:= + +BUILDLINK_API_DEPENDS.netbsd-iscsi-lib+= netbsd-iscsi-lib>=20100416 +BUILDLINK_ABI_DEPENDS.netbsd-iscsi-lib+= netbsd-iscsi-lib>=20100416 +BUILDLINK_PKGSRCDIR.netbsd-iscsi-lib?= ../../devel/netbsd-iscsi-lib +.endif # NETBSD_ISCSI_LIB_BUILDLINK3_MK + +BUILDLINK_TREE+= -netbsd-iscsi-lib diff --git a/devel/netbsd-iscsi-lib/distinfo b/devel/netbsd-iscsi-lib/distinfo new file mode 100644 index 000000000000..6e6d5480094a --- /dev/null +++ b/devel/netbsd-iscsi-lib/distinfo @@ -0,0 +1,7 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $ + +SHA1 (netbsd-iscsi-20100416.tar.gz) = ab8a94f26520f8a1ff7484efa80aa3c0ecfe1c40 +RMD160 (netbsd-iscsi-20100416.tar.gz) = 1bac1a7fdcc8d1df7dd3c32b8fb940933057ba61 +Size (netbsd-iscsi-20100416.tar.gz) = 539715 bytes +SHA1 (patch-ab) = d769048053104c03739a7ff3f77280ef1357e23c +SHA1 (patch-ac) = 6e2131c0e992c750aec272da5f88d7b99324898e diff --git a/devel/netbsd-iscsi-lib/patches/patch-ab b/devel/netbsd-iscsi-lib/patches/patch-ab new file mode 100644 index 000000000000..3c830ad7182d --- /dev/null +++ b/devel/netbsd-iscsi-lib/patches/patch-ab @@ -0,0 +1,22 @@ +$NetBSD: patch-ab,v 1.1.1.1 2010/06/04 16:14:44 sborrill Exp $ + +--- src/target/Makefile.in.orig 2010-04-16 20:16:12.000000000 +0100 ++++ src/target/Makefile.in 2010-04-16 20:16:32.000000000 +0100 +@@ -51,7 +51,7 @@ + PROGRAMS = $(bin_PROGRAMS) + am_iscsi_target_OBJECTS = iscsi_target-iscsi-target.$(OBJEXT) + iscsi_target_OBJECTS = $(am_iscsi_target_OBJECTS) +-iscsi_target_DEPENDENCIES = ../lib/libiscsi.la ++iscsi_target_DEPENDENCIES = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp + am__depfiles_maybe = depfiles +@@ -210,7 +210,7 @@ + AM_CFLAGS = $(WARNCFLAGS) -pthread + iscsi_target_SOURCES = iscsi-target.c + iscsi_target_CPPFLAGS = -I$(top_srcdir)/include +-iscsi_target_LDADD = ../lib/libiscsi.la -lpthread ++iscsi_target_LDADD = -liscsi -lpthread + man8_MANS = iscsi-target.8 + man5_MANS = targets.5 + dist_man_MANS = iscsi-target.8 targets.5 diff --git a/devel/netbsd-iscsi-lib/patches/patch-ac b/devel/netbsd-iscsi-lib/patches/patch-ac new file mode 100644 index 000000000000..2b3e4e39ab06 --- /dev/null +++ b/devel/netbsd-iscsi-lib/patches/patch-ac @@ -0,0 +1,20 @@ +--- src/initiator/Makefile.in.orig 2010-04-16 20:26:17.000000000 +0100 ++++ src/initiator/Makefile.in 2010-04-16 20:28:51.000000000 +0100 +@@ -53,7 +53,7 @@ + iscsi_initiator-libkmod.$(OBJEXT) \ + iscsi_initiator-virtdir.$(OBJEXT) + iscsi_initiator_OBJECTS = $(am_iscsi_initiator_OBJECTS) +-iscsi_initiator_DEPENDENCIES = ../lib/libiscsi.la ++iscsi_initiator_DEPENDENCIES = + DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/include + depcomp = $(SHELL) $(top_srcdir)/buildaux/depcomp + am__depfiles_maybe = depfiles +@@ -211,7 +211,7 @@ + AM_CFLAGS = $(WARNCFLAGS) + iscsi_initiator_SOURCES = iscsi-initiator.c libkmod.c virtdir.c + iscsi_initiator_CPPFLAGS = -I$(top_srcdir)/include +-iscsi_initiator_LDADD = ../lib/libiscsi.la -lrefuse ++iscsi_initiator_LDADD = -liscsi -lrefuse + man8_MANS = iscsi-initiator.8 + dist_man_MANS = iscsi-initiator.8 + all: all-am diff --git a/devel/netbsd-iscsi-target/Makefile b/devel/netbsd-iscsi-target/Makefile deleted file mode 100644 index edf339a51db3..000000000000 --- a/devel/netbsd-iscsi-target/Makefile +++ /dev/null @@ -1,29 +0,0 @@ -# $NetBSD: Makefile,v 1.10 2009/05/20 23:57:48 zafer Exp $ - -DISTNAME= netbsd-iscsi-20080207 -PKGNAME= ${DISTNAME:C/-iscsi/-iscsi-target/} -CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_BACKUP} - -MAINTAINER= agc@NetBSD.org -HOMEPAGE= http://www.alistaircrooks.co.uk/software.html -COMMENT= NetBSD's iSCSI target (per iSCSI RFC 3720) - -CONFLICTS+= netbsd-iscsi>0 - -GNU_CONFIGURE= yes -CONFIGURE_DIRS= src - -AUTO_MKDIRS= yes - -PKG_DESTDIR_SUPPORT= user-destdir - -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/iscsi-target ${DESTDIR}${PREFIX}/sbin/iscsi-target - ${INSTALL_DATA} ${WRKSRC}/doc/FAQ ${DESTDIR}${PREFIX}/share/doc/iscsi/FAQ - ${INSTALL_MAN} ${WRKSRC}/src/iscsi-target.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/iscsi-target.8 - ${INSTALL_MAN} ${WRKSRC}/src/targets.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/targets.5 - -.include "../../mk/pthread.buildlink3.mk" - -.include "../../mk/bsd.pkg.mk" diff --git a/devel/netbsd-iscsi-target/PLIST b/devel/netbsd-iscsi-target/PLIST deleted file mode 100644 index e33bd2680f4e..000000000000 --- a/devel/netbsd-iscsi-target/PLIST +++ /dev/null @@ -1,5 +0,0 @@ -@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:49:00 joerg Exp $ -man/man5/targets.5 -man/man8/iscsi-target.8 -sbin/iscsi-target -share/doc/iscsi/FAQ diff --git a/devel/netbsd-iscsi-target/distinfo b/devel/netbsd-iscsi-target/distinfo deleted file mode 100644 index 082964c7dff6..000000000000 --- a/devel/netbsd-iscsi-target/distinfo +++ /dev/null @@ -1,6 +0,0 @@ -$NetBSD: distinfo,v 1.10 2008/02/07 19:31:51 agc Exp $ - -SHA1 (netbsd-iscsi-20080207.tar.gz) = afe6ca2fdf46ce6dfed341dfd05aeb597584ae0f -RMD160 (netbsd-iscsi-20080207.tar.gz) = 62417a6c7bebf95257054f96990a7009f515c064 -Size (netbsd-iscsi-20080207.tar.gz) = 249607 bytes -SHA1 (patch-aa) = c97a1b97456cf2d11415ab22175c564baa9aae14 diff --git a/devel/netbsd-iscsi-target/patches/patch-aa b/devel/netbsd-iscsi-target/patches/patch-aa deleted file mode 100644 index a5992f62655d..000000000000 --- a/devel/netbsd-iscsi-target/patches/patch-aa +++ /dev/null @@ -1,17 +0,0 @@ -$NetBSD: patch-aa,v 1.3 2007/12/18 11:30:09 agc Exp $ - ---- src/Makefile.in.orig 2006-06-03 00:39:22.000000000 +0000 -+++ src/Makefile.in -@@ -16,9 +16,9 @@ - SYSCONFDIR=@sysconfdir@ - - CC= @CC@ --PTHREAD_FLAGS= -pthread --PTHREAD_LDFLAGS= -pthread --PTHREAD_LIBS= -lpthread -+PTHREAD_FLAGS?= -pthread -+PTHREAD_LDFLAGS?= -pthread -+PTHREAD_LIBS?= -lpthread - GCC_CFLAGS= -Wall -Wstrict-prototypes -fno-strict-aliasing -fno-common -Wno-trigraphs - COMMON_CFLAGS += -DCONFIG_ISCSI_DEBUG -D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE - COMMON_CFLAGS += -DHAVE_CONFIG_H diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010 index 5c26c6350c39..af2f96f557f7 100644 --- a/doc/CHANGES-2010 +++ b/doc/CHANGES-2010 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2010,v 1.2109 2010/06/04 13:23:16 obache Exp $ +$NetBSD: CHANGES-2010,v 1.2113 2010/06/04 16:24:55 sborrill Exp $ Changes to the packages collection and infrastructure in 2010: @@ -2834,3 +2834,9 @@ Changes to the packages collection and infrastructure in 2010: Updated pkgtools/x11-links to 0.50 [ghen 2010-06-04] Added print/p5-Net-CUPS version 0.61 [obache 2010-06-04] Updated devel/p5-POE-Test-Loops to 1.035 [obache 2010-06-04] + Updated time/emiclock to 2.0.2nb5 [tsutsui 2010-06-04] + Moved devel/netbsd-iscsi-initiator to net/netbsd-iscsi-initiator [sborrill 2010-06-04] + Moved devel/netbsd-iscsi-target to net/netbsd-iscsi-target [sborrill 2010-06-04] + Added devel/netbsd-iscsi-lib version 20100416 [sborrill 2010-06-04] + Updated net/netbsd-iscsi-initiator to 20100416 [sborrill 2010-06-04] + Updated net/netbsd-iscsi-target to 20100416 [sborrill 2010-06-04] diff --git a/net/Makefile b/net/Makefile index 01f931f39b5b..55f446500644 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.833 2010/06/03 09:24:04 obache Exp $ +# $NetBSD: Makefile,v 1.834 2010/06/04 16:10:24 sborrill Exp $ # COMMENT= Networking tools @@ -285,6 +285,8 @@ SUBDIR+= nemesis SUBDIR+= net-snmp SUBDIR+= net6 SUBDIR+= netatalk +SUBDIR+= netbsd-iscsi-initiator +SUBDIR+= netbsd-iscsi-target SUBDIR+= netcat SUBDIR+= netcat6 SUBDIR+= netdisco diff --git a/devel/netbsd-iscsi-initiator/DESCR b/net/netbsd-iscsi-initiator/DESCR similarity index 100% rename from devel/netbsd-iscsi-initiator/DESCR rename to net/netbsd-iscsi-initiator/DESCR diff --git a/net/netbsd-iscsi-initiator/Makefile b/net/netbsd-iscsi-initiator/Makefile new file mode 100644 index 000000000000..f7056979536d --- /dev/null +++ b/net/netbsd-iscsi-initiator/Makefile @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.2 2010/06/04 16:24:55 sborrill Exp $ + +PKGNAME= ${DISTNAME:C/-iscsi/-iscsi-initiator/} +CATEGORIES= net +COMMENT= NetBSD's iSCSI initiator (per iSCSI RFC 3720) + +BUILD_DIRS+= ${WRKSRC}/src/initiator +DISTINFO_FILE= ${.CURDIR}/../../devel/netbsd-iscsi-lib/distinfo +PATCHDIR= ${.CURDIR}/../../devel/netbsd-iscsi-lib/patches + +.include "../../devel/netbsd-iscsi-lib/Makefile.common" + +.include "../../devel/netbsd-iscsi-lib/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/netbsd-iscsi-initiator/PLIST b/net/netbsd-iscsi-initiator/PLIST new file mode 100644 index 000000000000..bd273e463e34 --- /dev/null +++ b/net/netbsd-iscsi-initiator/PLIST @@ -0,0 +1,3 @@ +@comment $NetBSD: PLIST,v 1.2 2010/06/04 16:24:55 sborrill Exp $ +bin/iscsi-initiator +man/man8/iscsi-initiator.8 diff --git a/devel/netbsd-iscsi-target/DESCR b/net/netbsd-iscsi-target/DESCR similarity index 100% rename from devel/netbsd-iscsi-target/DESCR rename to net/netbsd-iscsi-target/DESCR diff --git a/net/netbsd-iscsi-target/Makefile b/net/netbsd-iscsi-target/Makefile new file mode 100644 index 000000000000..13252189a338 --- /dev/null +++ b/net/netbsd-iscsi-target/Makefile @@ -0,0 +1,15 @@ +# $NetBSD: Makefile,v 1.2 2010/06/04 16:24:56 sborrill Exp $ + +PKGNAME= ${DISTNAME:C/-iscsi/-iscsi-target/} +CATEGORIES= net +COMMENT= NetBSD's iSCSI target (per iSCSI RFC 3720) + +BUILD_DIRS+= ${WRKSRC}/src/target +DISTINFO_FILE= ${.CURDIR}/../../devel/netbsd-iscsi-lib/distinfo +PATCHDIR= ${.CURDIR}/../../devel/netbsd-iscsi-lib/patches + +.include "../../devel/netbsd-iscsi-lib/Makefile.common" + +.include "../../devel/netbsd-iscsi-lib/buildlink3.mk" +.include "../../mk/pthread.buildlink3.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/netbsd-iscsi-target/PLIST b/net/netbsd-iscsi-target/PLIST new file mode 100644 index 000000000000..7cea71343b69 --- /dev/null +++ b/net/netbsd-iscsi-target/PLIST @@ -0,0 +1,4 @@ +@comment $NetBSD: PLIST,v 1.2 2010/06/04 16:24:56 sborrill Exp $ +bin/iscsi-target +man/man5/targets.5 +man/man8/iscsi-target.8 diff --git a/time/emiclock/Makefile b/time/emiclock/Makefile index ac6392f1d4f2..deb25b2dd10a 100644 --- a/time/emiclock/Makefile +++ b/time/emiclock/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2009/07/07 20:25:27 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2010/06/04 13:52:21 tsutsui Exp $ # DISTNAME= emiclock-2.0.2 -PKGREVISION= 4 +PKGREVISION= 5 CATEGORIES= x11 time MASTER_SITES= ${MASTER_SITE_FREEBSD} diff --git a/time/emiclock/distinfo b/time/emiclock/distinfo index ffb76b96afb1..176821d93804 100644 --- a/time/emiclock/distinfo +++ b/time/emiclock/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.7 2009/07/07 20:25:27 joerg Exp $ +$NetBSD: distinfo,v 1.8 2010/06/04 13:52:21 tsutsui Exp $ SHA1 (emiclock-2.0.2.tar.gz) = e1c042d600faf59ecdb11f1199f1793282db90c1 RMD160 (emiclock-2.0.2.tar.gz) = 25a753aaefbd9b8b57c16fbfe13678a002ab8179 @@ -8,3 +8,6 @@ SHA1 (patch-ab) = 8c83e056bd03b0f493f91afd33ce572ed673511b SHA1 (patch-ac) = 4b020ac03c958d1ca44968c17b7d657edda77690 SHA1 (patch-ad) = 47a12bfb61ed37f5ad9625f161e5e2a6c1d3e47f SHA1 (patch-ae) = 75250a553700eeacd5fcc6f71ed4477541cab6c0 +SHA1 (patch-af) = f5b6c40f42136ee8953bf259a78fa0d8be048503 +SHA1 (patch-ag) = 43c750de300cbda8cb89917894bbc73b18974c5d +SHA1 (patch-ah) = 227494794d7c28620d11800fa6087ab765dd5562 diff --git a/time/emiclock/patches/patch-af b/time/emiclock/patches/patch-af new file mode 100644 index 000000000000..c82651facb26 --- /dev/null +++ b/time/emiclock/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.1 2010/06/04 13:52:21 tsutsui Exp $ + +--- main.c 1999-09-27 01:18:18.000000000 +0900 ++++ main.c +@@ -185,7 +185,7 @@ + { + XtAppContext appContext; + Boolean isRcFile; +- long now; ++ time_t now; + struct tm *tm; + + static String trans = "#override\n\ diff --git a/time/emiclock/patches/patch-ag b/time/emiclock/patches/patch-ag new file mode 100644 index 000000000000..85c69ec88ca6 --- /dev/null +++ b/time/emiclock/patches/patch-ag @@ -0,0 +1,49 @@ +$NetBSD: patch-ag,v 1.1 2010/06/04 13:52:21 tsutsui Exp $ + +--- EmiClock.c 1999-09-27 01:18:18.000000000 +0900 ++++ EmiClock.c +@@ -509,7 +509,7 @@ + EmiClockRandomInit(w) + EmiClockWidget w; + { +- long now; ++ time_t now; + struct tm *tm; + + /* 時間を取り出す */ +@@ -567,7 +567,7 @@ + XSetWindowAttributes *attrs; + { + EmiClockWidget cw = (EmiClockWidget)w; +- long now; ++ time_t now; + struct tm *tm; + + XtCreateWindow(w, (unsigned)InputOutput, (Visual *)CopyFromParent, +@@ -951,7 +951,7 @@ + NewTime(w) + EmiClockWidget w; + { +- long now; ++ time_t now; + struct tm *tm; + int year; + +@@ -1066,7 +1066,7 @@ + /* 1000 milliseconds == 1 second */ + (XtTimerCallbackProc)NewTime, w); + } else { +- long now; ++ time_t now; + struct tm *tm; + + time(&now); +@@ -1426,7 +1426,7 @@ + GenPixmapAndDraw(w) + EmiClockWidget w; + { +- long now; ++ time_t now; + struct tm *tm; + + TimerBasePixmapGen(w, NULL); /* 下絵の作成 */ diff --git a/time/emiclock/patches/patch-ah b/time/emiclock/patches/patch-ah new file mode 100644 index 000000000000..77c5e43a5f8c --- /dev/null +++ b/time/emiclock/patches/patch-ah @@ -0,0 +1,13 @@ +$NetBSD: patch-ah,v 1.1 2010/06/04 13:52:21 tsutsui Exp $ + +--- rcfile.c 1999-09-02 23:33:49.000000000 +0900 ++++ rcfile.c +@@ -256,7 +256,7 @@ + int token; + char tokenStr[MAXPATHLEN]; + char buffer[MAXPATHLEN]; +- long now; ++ time_t now; + struct tm *tm; + + if ((rcFileName = GetRcFileName()) == NULL) { -- 2.41.0