Use NetBSD build system and WARNSify program.

4 files changed, 50 insertions, 22 deletions

diff --git a/net/wakeup/Makefile b/net/wakeup/Makefile
index 4153b0ee292..d5ff374bb5f 100644
--- a/net/wakeup/Makefile
+++ b/net/wakeup/Makefile
@@ -1,26 +1,19 @@
-# $NetBSD: Makefile,v 1.3 1999/11/20 11:38:24 tron Exp $
+# $NetBSD: Makefile,v 1.4 1999/11/20 11:54:44 tron Exp $
 #
 
-DISTNAME=	hpwake.c.gz
+DISTNAME=	hpwake
 PKGNAME=	wakeup-1.0
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://server7.ik.mb.uni-siegen.de/wol/
-EXTRACT_SUFX=	# empty
+EXTRACT_SUFX=	.c.gz
 
 MAINTAINER=	hubertf@netbsd.org
 HOMEPAGE=	http://www.berens-partner.de/wann/computer/wol.html
 
-NO_WRKSUBDIR=	yes
-
 do-extract:
 	${MKDIR} ${WRKSRC}
-	${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME}
-	${GUNZIP_CMD} ${WRKSRC}/${DISTNAME}
-
-do-build:
-	(cd ${WRKSRC} ; ${CC} ${CFLAGS} -o ${DISTNAME:C/.c.gz//} ${DISTNAME:C/.gz//} )
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME:C/.c.gz//} ${PREFIX}/bin/${PKGNAME:C/-.*$//}
+	${CP} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} ${WRKSRC}
+	${GUNZIP_CMD} ${WRKSRC}/${DISTNAME}${EXTRACT_SUFX}
+	${LN} -fs ${FILESDIR}/Makefile ${WRKSRC}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/wakeup/files/Makefile b/net/wakeup/files/Makefile
new file mode 100644
index 00000000000..e080501f7c5
--- /dev/null
+++ b/net/wakeup/files/Makefile
@@ -0,0 +1,9 @@
+#	$NetBSD: Makefile,v 1.1 1999/11/20 11:54:45 tron Exp $
+
+PROG=	wakeup
+SRCS=	hpwake.c
+
+NOMAN=	yes
+WARNS=	1
+
+.include <bsd.prog.mk>
diff --git a/net/wakeup/files/patch-sum b/net/wakeup/files/patch-sum
index 78dd9109686..3c45a714816 100644
--- a/net/wakeup/files/patch-sum
+++ b/net/wakeup/files/patch-sum
@@ -1,3 +1,3 @@
-$NetBSD: patch-sum,v 1.1.1.1 1999/11/18 22:28:16 hubertf Exp $
+$NetBSD: patch-sum,v 1.2 1999/11/20 11:54:45 tron Exp $
 
-MD5 (patch-aa) = 71c42bd6d5efd8006ccc193e5d435026
+MD5 (patch-aa) = 1b07ae3807557d4167aa0fbd97c1e7fc
diff --git a/net/wakeup/patches/patch-aa b/net/wakeup/patches/patch-aa
index 165bb807d82..8a4b1ce2f98 100644
--- a/net/wakeup/patches/patch-aa
+++ b/net/wakeup/patches/patch-aa
@@ -1,8 +1,25 @@
-$NetBSD: patch-aa,v 1.1.1.1 1999/11/18 22:28:16 hubertf Exp $
+$NetBSD: patch-aa,v 1.2 1999/11/20 11:54:45 tron Exp $
 
---- hpwake.c.orig	Thu Nov 18 23:18:47 1999
-+++ hpwake.c	Thu Nov 18 23:21:54 1999
-@@ -42,7 +42,7 @@
+--- hpwake.c.orig	Sat Nov 20 12:48:37 1999
++++ hpwake.c	Sat Nov 20 12:49:38 1999
+@@ -16,6 +16,7 @@
+    email: wann@server7.ik.mb.uni-siegen.de
+ */
+ 
++#include <ctype.h>
+ #include <stdio.h>
+ #include <string.h>
+ #include <unistd.h>
+@@ -26,6 +27,8 @@
+ 
+ u_char magicpacket[500];
+ 
++int get_magicpacket(unsigned char *,char *);
++int main(int,char *[]);
+ 
+ int get_magicpacket(packet,arg)
+ 
+@@ -42,7 +45,7 @@
  
          for (a = arg; *a; a++)
                  if (*a != ':' && !isxdigit(*a)) {
@@ -11,7 +28,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/18 22:28:16 hubertf Exp $
                          exit(2);
                  }
  
-@@ -50,7 +50,7 @@
+@@ -50,7 +53,7 @@
                  &dstaddr[0], &dstaddr[1], &dstaddr[2], &dstaddr[3], &dstaddr[4], &dstaddr[5]);
          
          if (k != 6) {
@@ -20,7 +37,16 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/18 22:28:16 hubertf Exp $
                  exit(2);
          }
                     
-@@ -98,6 +98,11 @@
+@@ -85,7 +88,7 @@
+ 
+ 
+ 
+-main(argc,argv)
++int main(argc,argv)
+ 
+ int argc;
+ char *argv[];
+@@ -98,6 +101,11 @@
          int s;
          int i;
  
@@ -32,7 +58,7 @@ $NetBSD: patch-aa,v 1.1.1.1 1999/11/18 22:28:16 hubertf Exp $
          packetsize = get_magicpacket(magicpacket, argv[1]);
          
          if ((s = socket(AF_INET, SOCK_DGRAM, 0)) < 0)
-@@ -111,7 +116,7 @@
+@@ -111,7 +119,7 @@
          server.sin_addr.s_addr = INADDR_ANY;
          
          client.sin_family = AF_INET;