summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKevin Lo <kevlo@FreeBSD.org>2000-08-12 08:00:10 +0000
committerKevin Lo <kevlo@FreeBSD.org>2000-08-12 08:00:10 +0000
commit59603a0f7feb92a51aaab694ad6b990a5d0a0974 (patch)
treeb75aea9a317256877523a783675aef5f164e329c
parent- Support X11BASE properly (diff)
- Support X11BASE properly
- WindowMaker -> Window Maker PR: 20550 Submitted by: Ports Fury
Notes
Notes: svn path=/head/; revision=31561
-rw-r--r--sysutils/wminet/Makefile8
-rw-r--r--sysutils/wminet/files/patch-aa18
-rw-r--r--sysutils/wminet/pkg-comment2
-rw-r--r--sysutils/wminet/pkg-descr2
4 files changed, 15 insertions, 15 deletions
diff --git a/sysutils/wminet/Makefile b/sysutils/wminet/Makefile
index a7f656a96b93..1831e6df9547 100644
--- a/sysutils/wminet/Makefile
+++ b/sysutils/wminet/Makefile
@@ -12,14 +12,14 @@ MASTER_SITES= http://www.neotokyo.org/illusion/
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 --git a/sysutils/wminet/files/patch-aa b/sysutils/wminet/files/patch-aa
index 89221a392556..8155284b370f 100644
--- a/sysutils/wminet/files/patch-aa
+++ b/sysutils/wminet/files/patch-aa
@@ -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 --git a/sysutils/wminet/pkg-comment b/sysutils/wminet/pkg-comment
index 6c7215f2ad55..d7b98d1422dc 100644
--- a/sysutils/wminet/pkg-comment
+++ b/sysutils/wminet/pkg-comment
@@ -1 +1 @@
-WindowMaker dockable inetd monitor
+Window Maker dockable inetd monitor
diff --git a/sysutils/wminet/pkg-descr b/sysutils/wminet/pkg-descr
index 8122689e3e53..c3ab5224dbb5 100644
--- a/sysutils/wminet/pkg-descr
+++ b/sysutils/wminet/pkg-descr
@@ -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,