1 files changed, 45 insertions, 66 deletions
diff --git a/sysutils/wminet/files/patch-aa b/sysutils/wminet/files/patch-aa
index 8155284b370..fb302a6487b 100644
--- a/sysutils/wminet/files/patch-aa
+++ b/sysutils/wminet/files/patch-aa
@@ -1,66 +1,45 @@
-*** Makefile.orig	Sat Dec 12 12:15:44 1998
---- Makefile	Sat Aug 12 00:34:24 2000
-***************
-*** 1,19 ****
-! LIBDIR = -L/usr/X11R6/lib
-! LIBS   = -lXpm -lXext -lX11
-! FLAGS = -O2
-  OBJS =	wminet.o \
-  		../wmgeneral/wmgeneral.o \
-  		../wmgeneral/misc.o \
-  		../wmgeneral/list.o
-  
-  
-  .c.o:
-! 	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
-  
-! wminet: $(OBJS)
-! 	cc $(FLAGS) -o wminet $^ -lXext $(LIBDIR) $(LIBS)
-  
-! all:: wminet
-  
-  clean::
-  	for i in $(OBJS) ; do \
---- 1,22 ----
-! LIBDIR = -L${X11BASE}/lib
-! LIBS   = -lXpm -lXext -lX11 -lkvm
-! CFLAGS ?= -O2
-! CFLAGS += -I${X11BASE}/include
-! CFLAGS += -DDEFAULT_WMINETRC="\"${PREFIX}/etc/wminetrc\""
-  OBJS =	wminet.o \
-  		../wmgeneral/wmgeneral.o \
-  		../wmgeneral/misc.o \
-  		../wmgeneral/list.o
-+ PROG = wminet
-  
-  
-  .c.o:
-! 	${CC} $(CFLAGS) -c $< -o $@
-  
-! $(PROG): $(OBJS)
-! 	${CC} $(CFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
-  
-! all:: $(PROG)
-  
-  clean::
-  	for i in $(OBJS) ; do \
-***************
-*** 23,33 ****
-  	rm -f *~
-  
-  install:: wminet
-! 	cp -f wminet /usr/local/bin/
-! 	chmod 755 /usr/local/bin/wminet
-! 	chown root:root /usr/local/bin/wminet
-! 	cp wminetrc $(HOME)/.wminetrc
-! 	chmod 600 $(HOME)/.wminetrc
-! 	cp wminetrc /etc/wminetrc
-! 	chmod 644 /etc/wminetrc
-! 	@echo "WMiNET Installation finished..."
---- 26,31 ----
-  	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
-! 
+--- Makefile.orig	Fri Dec 11 22:15:44 1998
++++ Makefile	Thu Aug 16 10:06:13 2001
+@@ -1,19 +1,21 @@
+-LIBDIR = -L/usr/X11R6/lib
+-LIBS   = -lXpm -lXext -lX11
+-FLAGS = -O2
++LIBDIR = -L${X11BASE}/lib
++LIBS   = -lXpm -lXext -lX11 -lkvm
++CFLAGS += -I${X11BASE}/include
++CFLAGS += -DDEFAULT_WMINETRC="\"${PREFIX}/etc/wminetrc\""
+ OBJS =	wminet.o \
+ 		../wmgeneral/wmgeneral.o \
+ 		../wmgeneral/misc.o \
+ 		../wmgeneral/list.o
++PROG = wminet
+ 
+ 
+ .c.o:
+-	cc -I/usr/X11R6/share/include $(FLAGS) -c -Wall $< -o $*.o
++	${CC} $(CFLAGS) -c $< -o $@
+ 
+-wminet: $(OBJS)
+-	cc $(FLAGS) -o wminet $^ -lXext $(LIBDIR) $(LIBS)
++$(PROG): $(OBJS)
++	${CC} $(CFLAGS) -o $@ $(OBJS) $(LIBDIR) $(LIBS)
+ 
+-all:: wminet
++all:: $(PROG)
+ 
+ clean::
+ 	for i in $(OBJS) ; do \
+@@ -23,11 +25,5 @@
+ 	rm -f *~
+ 
+ install:: wminet
+-	cp -f wminet /usr/local/bin/
+-	chmod 755 /usr/local/bin/wminet
+-	chown root:root /usr/local/bin/wminet
+-	cp wminetrc $(HOME)/.wminetrc
+-	chmod 600 $(HOME)/.wminetrc
+-	cp wminetrc /etc/wminetrc
+-	chmod 644 /etc/wminetrc
+-	@echo "WMiNET Installation finished..."
++	${INSTALL} -c -s -g kmem -m 2755 -o root $(PROG) ${PREFIX}/bin
++	${INSTALL} -c -g wheel -m 644 -o root wminetrc ${PREFIX}/etc/wminetrc