add rc.d script, bump pkgrevision

5 files changed, 41 insertions, 23 deletions

diff --git a/net/inadyn/Makefile b/net/inadyn/Makefile
index 0e5b10cc99e..76dd114e31d 100644
--- a/net/inadyn/Makefile
+++ b/net/inadyn/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.1.1.1 2008/06/22 04:52:39 dmcmahill Exp $
-#
+# $NetBSD: Makefile,v 1.2 2011/12/14 13:35:46 abs Exp $
 
 DISTNAME=	inadyn.v1.96.2
-PKGNAME=	inadyn-1.96.2
+PKGNAME=	${DISTNAME:C:.v:-:} # inadyn-1.96.2
+PKGREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	http://www.inatech.eu/inadyn/
 EXTRACT_SUFX=	.zip
@@ -10,37 +10,35 @@ EXTRACT_SUFX=	.zip
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.inatech.eu/inadyn/
 COMMENT=	Dynamic DNS client
+LICENSE=	gnu-gpl-v2
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 USE_TOOLS+=	gmake
+RCD_SCRIPTS=	inadyn
+RCD_SCRIPT_WRK.inadyn=	${WRKDIR}/inadyn.sh
 
 LIBS.SunOS=	-lsocket -lnsl
 MAKE_ENV+=	TARGET_ARCH=pkgsrc
 
 WRKSRC=		${WRKDIR}/inadyn
-MAKE_FILE?=	makefile
+MAKE_FILE=	makefile
 
-INSTALLATION_DIRS=      bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
+INSTALLATION_DIRS=	bin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
-# do the dos to unix thing before patching to make it easier to
-# try changes (don't need the dos2unix and unix2dos in the mix)
 pre-patch:
-	cd ${WRKSRC}; for file in man/inadyn.conf.5 man/inadyn.8 src/dyndns.h ; do \
-		${SED}  -e "s|/etc|${PKG_SYSCONFDIR}|g"                            \
-			$${file} > $${file}.orig;                                  \
-		${CP} -f $${file}.orig $${file};                                   \
-	done
-	cd ${WRKSRC}/src && for f in * ; do                                        \
-		if ${TEST} -f $$f ; then                                              \
-			mv $$f $$f.bak ; cat $$f.bak | ${TR} -d '\r' > $$f ;       \
-			rm $$f.bak ;                                               \
-		fi                                                                 \
+	set -e && cd ${WRKSRC} &&  \
+	for f in man/inadyn.conf.5 man/inadyn.8 src/dyndns.h ; do	\
+		${SED}	-e "s|/etc|${PKG_SYSCONFDIR}|g"			\
+			$${f} > $${f}.orig;			\
+		${CP} -f $${f}.orig $${f};			\
 	done
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bin/pkgsrc/inadyn ${DESTDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/inadyn.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
-	${INSTALL_MAN} ${WRKSRC}/man/inadyn.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+	${INSTALL_MAN} ${WRKSRC}/man/inadyn.conf.5 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
+	${INSTALL_MAN} ${WRKSRC}/man/inadyn.8 \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/inadyn/PLIST b/net/inadyn/PLIST
index debe0c35807..e88fbdf1c06 100644
--- a/net/inadyn/PLIST
+++ b/net/inadyn/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/06/22 04:52:39 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.2 2011/12/14 13:35:46 abs Exp $
 bin/inadyn
 ${PKGMANDIR}/man5/inadyn.conf.5
 ${PKGMANDIR}/man8/inadyn.8
+share/examples/rc.d/inadyn
diff --git a/net/inadyn/distinfo b/net/inadyn/distinfo
index c5de15eb9b5..5d1d3fb3229 100644
--- a/net/inadyn/distinfo
+++ b/net/inadyn/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/06/22 04:52:39 dmcmahill Exp $
+$NetBSD: distinfo,v 1.2 2011/12/14 13:35:46 abs Exp $
 
 SHA1 (inadyn.v1.96.2.zip) = d5fe03ee4cfbc8e702d38d80527264a29297b6cf
 RMD160 (inadyn.v1.96.2.zip) = f3c4d1009a2743032f28e6527aa58d6ecd0baf29
 Size (inadyn.v1.96.2.zip) = 110170 bytes
 SHA1 (patch-aa) = 399adaaaa990277b9b84175850ccdc6970c349cc
-SHA1 (patch-ab) = aed758e916a494d80da15a7d24c6244e364cfa5d
+SHA1 (patch-ab) = 1c76470bc2202e5ef26b2a136ce98e0ae2684ca7
diff --git a/net/inadyn/files/inadyn.sh b/net/inadyn/files/inadyn.sh
new file mode 100644
index 00000000000..b2b64f50f34
--- /dev/null
+++ b/net/inadyn/files/inadyn.sh
@@ -0,0 +1,17 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: inadyn.sh,v 1.1 2011/12/14 13:35:47 abs Exp $
+#
+
+# PROVIDE: inadyn
+# REQUIRE: NETWORK
+
+. /etc/rc.subr
+
+name="inadyn"
+rcvar=$name
+command="@PREFIX@/bin/${name}"
+required_files="@PKG_SYSCONFDIR@/inadyn.conf"
+
+load_rc_config $name
+run_rc_command "$1"
diff --git a/net/inadyn/patches/patch-ab b/net/inadyn/patches/patch-ab
index 39d838d3d3c..01eb11b6407 100644
--- a/net/inadyn/patches/patch-ab
+++ b/net/inadyn/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/06/22 04:52:39 dmcmahill Exp $
+$NetBSD: patch-ab,v 1.2 2011/12/14 13:35:47 abs Exp $
+
+usleep is not guaranteed to work for arguments >= 1,000,000
 
 --- src/os_unix.c.orig	2008-06-20 03:11:39.000000000 +0000
 +++ src/os_unix.c	2008-06-20 03:13:09.000000000 +0000