Update to 0.4.1

Reviewed by:	maintainer
Approved by:	maintainer

9 files changed, 33 insertions, 275 deletions

diff --git a/net/wmnd/Makefile b/net/wmnd/Makefile
index e5a0ab9fe7a7..a060649edf3e 100644
--- a/net/wmnd/Makefile
+++ b/net/wmnd/Makefile
@@ -6,33 +6,29 @@
 #
 
 PORTNAME=	wmnd
-PORTVERSION=	0.3.3
+PORTVERSION=	0.4.1
 CATEGORIES=	net
-MASTER_SITES=	http://www.wingeer.org/wmnd/pkg/
-DISTNAME=	wmnd_${PORTVERSION}
+MASTER_SITES=	http://www.hydra.ubiest.com/wmnd/releases/
 
 MAINTAINER=	flag@gufi.org
 
-WRKSRC= 	${WRKDIR}/wmnd
+BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14
+
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
 USE_XPM=	yes
+USE_GMAKE=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--datadir=${EXAMPLESDIR}
 
 MAN1=		wmnd.1
 
-do-install:
-	@${MKDIR} ${PREFIX}/share/examples/${PORTNAME}
-	@${INSTALL_PROGRAM} ${WRKSRC}/wmnd ${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/man/wmnd.1 ${PREFIX}/man/man1
-	@${INSTALL_DATA} ${WRKSRC}/wmndrc \
-		${PREFIX}/share/examples/${PORTNAME}
-
-post-install:
-.if !defined(NOPORTDOCS)
-.for docs in CHANGELOGS DISPLAY HINTS README
-	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${docs} ${DOCSDIR}
+pre-patch:
+.for m in Makefile.in doc/Makefile.in examples/Makefile.in src/Makefile.in
+	@${PERL} -pi -e 's|\@program_transform_name\@||' ${WRKSRC}/${m}
+.endfor
+.for files in install-sh config.sub mkinstalldirs
+	@${LN} -sf ${LOCALBASE}/share/automake14/automake/${files} \
+		${WRKSRC}/${files}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/net/wmnd/distinfo b/net/wmnd/distinfo
index 84d075f05d5e..c7710de7c4ca 100644
--- a/net/wmnd/distinfo
+++ b/net/wmnd/distinfo
@@ -1 +1 @@
-MD5 (wmnd_0.3.3.tar.gz) = eadd01d602e8d9ef4c5aec8125e10a49
+MD5 (wmnd-0.4.1.tar.gz) = ee1e769359cdb59f6baebe9e7b9fbcd0
diff --git a/net/wmnd/files/patch-Makefile b/net/wmnd/files/patch-Makefile
deleted file mode 100644
index d1fcf3f59d0b..000000000000
--- a/net/wmnd/files/patch-Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	Tue May 22 07:30:58 2001
-+++ Makefile	Thu Nov 29 16:11:31 2001
-@@ -6,7 +6,6 @@
- VERSION = `sed -n "s/\#define WMND_VERSION \"\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)\"/\1\\.\2\\.\\3/p" src/wmnd.h`
- PRE =
- 
--prefix  = /usr/local/
- bindir  = $(prefix)/bin/
- mandir  = $(prefix)/man/
- datadir = $(prefix)/share/
-@@ -14,13 +13,13 @@
- 
- # X11 headers location may vary on some systems
- # XFree (linux etc):
--X11CFLAGS = -I/usr/X11R6/include
--X11LDFLAGS = -L/usr/X11R6/lib -lXpm -lXext -lX11
-+X11CFLAGS = -I${X11BASE}/include
-+X11LDFLAGS = -L${X11BASE}/lib -lXpm -lXext -lX11
- # OpenWindows (solaris, sco unixware etc):
- #   X11CFLAGS = -I/usr/openwin/include
- #   X11LDFLAGS = -L/usr/openwin/lib -lXpm -lXext -lX11 -lsocket -lnsl
- # Solaris specific (for use with kstat)
--LDFLAGS = -lkstat -lsocket -lnsl
-+# LDFLAGS = -lkstat -lsocket -lnsl
- 
- ##################
- # compiler flags #
-@@ -32,7 +31,7 @@
- VPATH = $(SRC):$(MAN)
- 
- # Optimizing
--CFLAGS = -Wall -O3 -fomit-frame-pointer -fstrict-aliasing -pipe
-+# CFLAGS = -Wall -O -fomit-frame-pointer -fstrict-aliasing -pipe
- 
- # Profiling
- # CFLAGS = -Wall -ansi -pg -g -O3 -pipe -D_GNU_SOURCE -DPRO
diff --git a/net/wmnd/files/patch-src::config.h b/net/wmnd/files/patch-src::config.h
deleted file mode 100644
index ace6c9dd51fe..000000000000
--- a/net/wmnd/files/patch-src::config.h
+++ /dev/null
@@ -1,25 +0,0 @@
---- src/config.h.orig	Fri May 18 14:06:47 2001
-+++ src/config.h	Thu Nov 29 16:26:26 2001
-@@ -11,16 +11,19 @@
- /* define below if you're on a big endian architecture */
- /* #define WORDS_BIGENDIAN */
- 
-+/*FreeBSD dev driver*/
-+#define USE_FREEBSD_SYSCTL
-+
- /* linux /proc/net/dev driver */
- /* #define USE_LINUX_PROC */
- 
- /* free pppd for Solaris 2.x and compatible streams ppp devices */
--#define USE_SOLARIS_FPPPD
-+//#define USE_SOLARIS_FPPPD
- 
- /* solaris kstat driver, also works on kstat compatible OSs */
--#define USE_SOLARIS_KSTAT
-+//#define USE_SOLARIS_KSTAT
- 
- /* dummy driver for testing purposes, it's safe to leave it defined */
--#define USE_TESTING_DUMMY
-+//#define USE_TESTING_DUMMY
- 
- #endif
diff --git a/net/wmnd/files/patch-src::drivers.c b/net/wmnd/files/patch-src::drivers.c
index e2bf6e9155ec..203181e37f3e 100644
--- a/net/wmnd/files/patch-src::drivers.c
+++ b/net/wmnd/files/patch-src::drivers.c
@@ -1,120 +1,19 @@
---- src/drivers.c.orig	Tue May 22 11:11:25 2001
-+++ src/drivers.c	Thu Nov 29 16:29:44 2001
-@@ -17,6 +17,117 @@
-  * *_term: deallocate name, eventually drvdata and close fds
-  */
+--- src/drivers.c.orig	Sat May 18 11:48:47 2002
++++ src/drivers.c	Sat May 18 11:50:28 2002
+@@ -554,7 +554,6 @@
+     if(!devname || (devname && !strcmp(devname, tempndata.ifmd_name))) {
+       ndev = malloc(sizeof(struct Devices));
+       ndev->devstart = 0;
+-      ndev->if_index = i;
+       ndev->name = strdup(tempndata.ifmd_name);
+       ndata = malloc(sizeof(struct ifmibdata));
+       bcopy (&tempndata, ndata, sizeof(struct ifmibdata));
+@@ -596,7 +595,7 @@
+   datamib[4] = 1; /* fill in later */
+   datamib[5] = IFDATA_GENERAL;
  
-+#ifdef USE_FREEBSD_SYSCTL
-+
-+/* functions prototypes */
-+int freebsd_dev_list(const char *devname, struct Devices *list) {
-+    char *devn;
-+    struct Devices *ndev;
-+    int mib[5], len;
-+  int i;
-+  struct ifmibdata ifmd; 
-+  
-+  mib[0]=CTL_NET;
-+  mib[1]=PF_LINK;
-+  mib[2]=NETLINK_GENERIC;
-+  mib[3]=IFMIB_SYSTEM;
-+  mib[4]=IFMIB_IFCOUNT;
-+
-+  len=sizeof(int);
-+
-+  if (sysctl(mib, 5, &freebsd_interface_count, &len ,NULL, 0)==-1) {perror("systcl failed");exit(-1);}
-+  printf("freebsd_interface_count: %d\n",freebsd_interface_count);
-+
-+    printf("devname: %s\n", devname);  
-+    if (devname != NULL) {
-+ 	// fill in the Devices structure
-+	ndev=malloc(sizeof(struct Devices));
-+	list->next=ndev;
-+	// name of device
-+	devn=strdup(devname);
-+	ndev->name=devn;
-+	// next Devices field used to create the chain
-+	ndev->next=NULL;  
-+	// internale driver data
-+	ndev->drvdata=NULL;
-+	// driver number
-+	ndev->drvnum=0;
-+	// status indicator (0 online, 1 offline)
-+	ndev->online=0;
-+	// device activity start
-+	ndev->devstart=time(NULL);
-+	// end of initialization
-+	printf("freebsd_dev_list finished ok!!!\n");
-+	return 1;
-+    }
-+    else { // we don't have a specific interface to monitor, so we must first retrieve the name of all available interfaces
-+printf("any interface defined!\n");	
-+  
-+  len=sizeof(ifmd);
-+  
-+  for(i=1;i<=freebsd_interface_count;i++) {
-+
-+  
-+    if (get_ifmib_general(i, &ifmd)==-1) {perror("sysctl2");exit(-1);}
-+
-+ 	// fill in the Devices structure
-+	ndev=malloc(sizeof(struct Devices));
-+	list->next=ndev;
-+	// name of device
-+	devn=strdup(ifmd.ifmd_name);
-+	ndev->name=devn;
-+	// next Devices field used to create the chain
-+	ndev->next=NULL;  
-+	// internale driver data
-+	ndev->drvdata=NULL;
-+	// driver number
-+	ndev->drvnum=0;
-+	// status indicator (0 online, 1 offline)
-+	ndev->online=0;
-+	// device activity start
-+	ndev->devstart=time(NULL);
-+	//update the list pointer
-+	list=ndev;
-+	// end of initialization
-+  
-+}
-+	
-+	return 1;
-+    }
-+}
-+
-+int freebsd_dev_init(struct Devices *dev) {
-+  printf("nothing to do here!\n");
-+    return 0;
-+}
-+
-+int freebsd_dev_get(struct Devices *dev, unsigned long *ip, unsigned long *op, unsigned long *ib, unsigned long *ob) {
-+  struct ifmibdata ifmd;
-+  int i;
-+for(i=1;i<=freebsd_interface_count;i++) {
-+  if(get_ifmib_general(i, &ifmd)==-1) {perror("systcl3");exit(-1);}
-+  //printf("comparing devname: %s with ifmdname: %s\n",dev->name, ifmd.ifmd_name);
-+  if(strcmp(dev->name,ifmd.ifmd_name)==0) {
-+    //printf("interface name: %s\n",ifmd.ifmd_name);
-+    //printf("ipacktes: %ld opackets: %ld\n",ifmd.ifmd_data.ifi_ipackets,ifmd.ifmd_data.ifi_opackets);
-+    //printf("ibytes: %ld obytes: %ld\n",ifmd.ifmd_data.ifi_ibytes,ifmd.ifmd_data.ifi_obytes);  
-+    //printf("\n");
-+    *ip=ifmd.ifmd_data.ifi_ipackets; *op=ifmd.ifmd_data.ifi_opackets;
-+    *ib=ifmd.ifmd_data.ifi_ibytes; *ob=ifmd.ifmd_data.ifi_obytes;
-+    return 0;
-+  }
-+} printf("interface %s not found!\n",dev->name); exit(-1); 
-+    
-+  return 0;
-+}
-+
-+void freebsd_dev_term(struct Devices *dev) {
-+      printf("freebsd_dev_term: %s\n",dev->name); 
-+      //free(dev);
-+}
-+
-+#endif /*USE_FREESD_SYSCTL*/
-+
- #ifdef USE_SOLARIS_FPPPD
+-  datamib[4] = dev->if_index;
++  datamib[4] = IFMIB_IFCOUNT;
+ 
+   len = sizeof(struct ifmibdata); 
  
- /* strioclt is a support function, not previously declared */
diff --git a/net/wmnd/files/patch-src::drivers.h b/net/wmnd/files/patch-src::drivers.h
deleted file mode 100644
index 0dc9a46f26a2..000000000000
--- a/net/wmnd/files/patch-src::drivers.h
+++ /dev/null
@@ -1,31 +0,0 @@
---- src/drivers.h.orig	Sun May 20 10:19:01 2001
-+++ src/drivers.h	Thu Nov 29 16:33:19 2001
-@@ -32,6 +32,18 @@
- typedef void (*p_term_drv) (struct Devices * dev);
- 
- /* driver vars */
-+#ifdef USE_FREEBSD_SYSCTL
-+
-+
-+/* functions prototypes */
-+int freebsd_dev_list(const char *devname, struct Devices *list);
-+int freebsd_dev_init(struct Devices *dev);
-+int freebsd_dev_get(struct Devices *dev, unsigned long *ip, unsigned long *op,
-+		      unsigned long *ib, unsigned long *ob);
-+void freebsd_dev_term(struct Devices *dev);
-+
-+#endif /*USE_FREESD_SYSCTL*/
-+
- #ifdef USE_SOLARIS_FPPPD
- 
- #include <sys/stropts.h>
-@@ -133,6 +145,9 @@
- #endif
- #ifdef USE_TESTING_DUMMY
-     {"testing_dummy", testing_dummy_list, testing_dummy_init, testing_dummy_get, testing_dummy_term},
-+#endif
-+#ifdef USE_FREEBSD_SYSCTL
-+    {"FreeBSD_sysctl", freebsd_dev_list, freebsd_dev_init, freebsd_dev_get, freebsd_dev_term},
- #endif
-     {NULL, NULL, NULL, NULL, NULL}
-   };
diff --git a/net/wmnd/files/patch-src::wmnd.h b/net/wmnd/files/patch-src::wmnd.h
deleted file mode 100644
index 2942e843488b..000000000000
--- a/net/wmnd/files/patch-src::wmnd.h
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/wmnd.h.orig	Tue May 22 05:06:36 2001
-+++ src/wmnd.h	Thu Nov 29 16:08:01 2001
-@@ -24,6 +24,37 @@
- #include <X11/xpm.h>
- #include <X11/extensions/shape.h>
- 
-+#ifdef USE_FREEBSD_SYSCTL
-+
-+#include <sys/types.h>
-+#include <sys/socket.h>
-+#include <sys/sysctl.h>
-+#include <sys/time.h>
-+#include <net/if.h>
-+#include <net/if_mib.h>
-+
-+/* internal structure used for freebsd-systcl */
-+
-+int freebsd_interface_count=0;
-+
-+int get_ifmib_general(int row, struct ifmibdata *ifmd) {
-+
-+  int name[6], len;
-+
-+  len=sizeof(struct ifmibdata);
-+
-+  name[0] = CTL_NET;
-+    name[1] = PF_LINK;
-+    name[2] = NETLINK_GENERIC;
-+    name[3] = IFMIB_IFDATA;
-+    name[4] = row;
-+    name[5] = IFDATA_GENERAL;  
-+
-+    return sysctl(name, 6, ifmd, &len, NULL, 0);
-+}
-+
-+#endif
-+
- /*
-  * Wmnd version number, do not modify line layout or sed will not find
-  * the main version number
diff --git a/net/wmnd/pkg-descr b/net/wmnd/pkg-descr
index 234f0a204406..d564840a0155 100644
--- a/net/wmnd/pkg-descr
+++ b/net/wmnd/pkg-descr
@@ -3,7 +3,7 @@ dock app improved and based on WMiFS 1.3b.  The version 0.2 of
 wmnd is almost totally written by Timecop, given the optimization
 and flexibility. Enjoy!
 
-WWW: http://www.wingeer.org/wmnd/
+WWW: http://www.hydra.ubiest.com/wmnd/
 
 - Paolo
 flag@gufi.org
diff --git a/net/wmnd/pkg-plist b/net/wmnd/pkg-plist
index 44b92e843f5f..353e097a15d0 100644
--- a/net/wmnd/pkg-plist
+++ b/net/wmnd/pkg-plist
@@ -1,8 +1,3 @@
 bin/wmnd
-%%PORTDOCS%%share/doc/wmnd/CHANGELOGS
-%%PORTDOCS%%share/doc/wmnd/DISPLAY
-%%PORTDOCS%%share/doc/wmnd/HINTS
-%%PORTDOCS%%share/doc/wmnd/README
 share/examples/wmnd/wmndrc
 @dirrm share/examples/wmnd
-%%PORTDOCS%%@dirrm share/doc/wmnd