From owner-freebsd-ports  Fri Aug 11 17: 0:41 2000
Delivered-To: freebsd-ports@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.ORG [204.216.27.21])
	by hub.freebsd.org (Postfix) with ESMTP id E512537BD02
	for <freebsd-ports@FreeBSD.org>; Fri, 11 Aug 2000 17:00:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.9.3/8.9.2) id RAA17199;
	Fri, 11 Aug 2000 17:00:02 -0700 (PDT)
	(envelope-from gnats@FreeBSD.org)
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 66E2937BC56; Fri, 11 Aug 2000 16:55:03 -0700 (PDT)
Message-Id: <20000811235503.66E2937BC56@hub.freebsd.org>
Date: Fri, 11 Aug 2000 16:55:03 -0700 (PDT)
From: tkato@prontomail.ne.jp
To: freebsd-gnats-submit@FreeBSD.org
X-Send-Pr-Version: www-1.0
Subject: ports/20550: Update port: sysutils/wminet
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>Number:         20550
>Category:       ports
>Synopsis:       Update port: sysutils/wminet
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 11 17:00:02 PDT 2000
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.1-RELEASE i386
>Organization:
>Environment:
>Description:
- Support X11BASE properly
- WindowMaker -> Window Maker

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/sysutils/wminet/Makefile sysutils/wminet/Makefile
--- /usr/ports/sysutils/wminet/Makefile	Thu Aug  3 21:31:16 2000
+++ sysutils/wminet/Makefile	Sat Aug 12 00:31:24 2000
@@ -12,14 +12,14 @@
 
 MAINTAINER=	sk-ports@vegamuse.org
 
+WRKSRC=		${WRKDIR}/wminet.app/wminet
+
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
-WRKSRC=		${WRKDIR}/wminet.app/wminet
-
-.if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/wminet
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${PREFIX}/share/doc/wminet
 	${INSTALL_MAN} ${WRKSRC}/../HINTS ${PREFIX}/share/doc/wminet
 .endif
 
diff -urN /usr/ports/sysutils/wminet/patches/patch-aa sysutils/wminet/patches/patch-aa
--- /usr/ports/sysutils/wminet/patches/patch-aa	Fri Jun 11 09:05:45 1999
+++ sysutils/wminet/patches/patch-aa	Sat Aug 12 00:35:36 2000
@@ -1,8 +1,8 @@
-*** ../../wminet.app/wminet/Makefile.orig	Fri Dec 11 22:15:44 1998
---- ../../wminet.app/wminet/Makefile		Sun May 23 14:15:19 1999
+*** Makefile.orig	Sat Dec 12 12:15:44 1998
+--- Makefile	Sat Aug 12 00:34:24 2000
 ***************
 *** 1,19 ****
-  LIBDIR = -L/usr/X11R6/lib
+! LIBDIR = -L/usr/X11R6/lib
 ! LIBS   = -lXpm -lXext -lX11
 ! FLAGS = -O2
   OBJS =	wminet.o \
@@ -22,10 +22,10 @@
   clean::
   	for i in $(OBJS) ; do \
 --- 1,22 ----
-  LIBDIR = -L/usr/X11R6/lib
+! LIBDIR = -L${X11BASE}/lib
 ! LIBS   = -lXpm -lXext -lX11 -lkvm
 ! CFLAGS ?= -O2
-! CFLAGS += -I/usr/X11R6/include
+! CFLAGS += -I${X11BASE}/include
 ! CFLAGS += -DDEFAULT_WMINETRC="\"${PREFIX}/etc/wminetrc\""
   OBJS =	wminet.o \
   		../wmgeneral/wmgeneral.o \
@@ -35,10 +35,10 @@
   
   
   .c.o:
-! 	${CC} -I/usr/X11R6/share/include $(CFLAGS) -c -Wall $< -o $*.o
+! 	${CC} $(CFLAGS) -c $< -o $@
   
 ! $(PROG): $(OBJS)
-! 	${CC} $(CFLAGS) -o $@ $(OBJS) -lXext $(LIBDIR) $(LIBS)
+! 	${CC} $(CFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
   
 ! all:: $(PROG)
   
@@ -61,6 +61,6 @@
   	rm -f *~
   
   install:: wminet
-! 	install -c -g kmem -m 2755 -o root $(PROG) ${PREFIX}/bin
-! 	install -c -g wheel -m 644 -o root wminetrc ${PREFIX}/etc/wminetrc
+! 	${INSTALL} -c -g kmem -m 2755 -o root $(PROG) ${PREFIX}/bin
+! 	${INSTALL} -c -g wheel -m 644 -o root wminetrc ${PREFIX}/etc/wminetrc
 ! 
diff -urN /usr/ports/sysutils/wminet/pkg/COMMENT sysutils/wminet/pkg/COMMENT
--- /usr/ports/sysutils/wminet/pkg/COMMENT	Sun Jun 27 03:52:34 1999
+++ sysutils/wminet/pkg/COMMENT	Sat Aug 12 00:35:44 2000
@@ -1 +1 @@
-WindowMaker dockable inetd monitor
+Window Maker dockable inetd monitor
diff -urN /usr/ports/sysutils/wminet/pkg/DESCR sysutils/wminet/pkg/DESCR
--- /usr/ports/sysutils/wminet/pkg/DESCR	Wed Mar  1 16:38:04 2000
+++ sysutils/wminet/pkg/DESCR	Sat Aug 12 00:36:00 2000
@@ -1,5 +1,5 @@
 WMiNET is a complete inetd monitoring dock.app, it's mainly
-designed for usage in WindowMaker's dock and gives you some
+designed for usage in Window Maker's dock and gives you some
 nice & nifty features like:
 
         * Monitors number of processes, users, ftp users,


>Release-Note:
>Audit-Trail:
>Unformatted:


To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message