4 files changed, 35 insertions, 31 deletions

diff --git a/sysutils/wmcube/Makefile b/sysutils/wmcube/Makefile
index 74a9bc822475..c6551f0aa7c0 100644
--- a/sysutils/wmcube/Makefile
+++ b/sysutils/wmcube/Makefile
@@ -14,13 +14,13 @@ MAINTAINER=	pat@databits.net
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/${PORTNAME}
 USE_X_PREFIX=	yes
-USE_GMAKE=	yes
 USE_XPM=	yes
+MAKEFILE=	Makefile.FREEBSD
 
-do-configure:
-	@${SED} -e "s|/usr/X11R6/|${X11BASE}/|" \
-		${WRKSRC}/Makefile.FREEBSD > \
-		${WRKSRC}/Makefile
+do-install:
+	@${INSTALL_PROGRAM} ${WRKSRC}/wmcube ${PREFIX}/bin
+	@${CHMOD} g+s ${PREFIX}/bin/wmcube
+	@${CHOWN} root:kmem ${PREFIX}/bin/wmcube
 
 post-install:
 .for file in *.wmc
@@ -35,10 +35,10 @@ post-install:
 	@${ECHO} "===>   Please Read pkg-descr and README for usage information"
 	@${INSTALL} -d -o ${SHAREOWN} -g ${SHAREGRP} -m 555 \
 		${PREFIX}/share/doc/${PORTNAME}
-.for file in CHANGES COPYING README TODO
+.for file in CHANGES README TODO
 	@${INSTALL_DATA} ${WRKSRC}/../${file} ${PREFIX}/share/doc/${PORTNAME}
 .endfor
 .endif # !NOPORTDOCS
-	@${SED} -e "s|/usr/X11R6|${PREFIX}|" ${PKGMESSAGE}
+	@${SED} -e "s|%%PREFIX%%|${PREFIX}|" ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/sysutils/wmcube/files/patch-Makefile.FREEBSD b/sysutils/wmcube/files/patch-Makefile.FREEBSD
index 7d123fdf23b0..1fea419acbba 100644
--- a/sysutils/wmcube/files/patch-Makefile.FREEBSD
+++ b/sysutils/wmcube/files/patch-Makefile.FREEBSD
@@ -1,6 +1,16 @@
---- Makefile.FREEBSD.orig	Tue May 29 15:20:30 2001
-+++ Makefile.FREEBSD	Tue May 29 15:22:08 2001
-@@ -9,7 +9,7 @@
+--- Makefile.FREEBSD.orig	Thu Aug 16 14:22:12 2001
++++ Makefile.FREEBSD	Thu Aug 16 14:21:42 2001
+@@ -1,15 +1,13 @@
+-CC = gcc
+ OS = -DFREEBSD
+ 
+-LIBDIR = -L/usr/X11R6/lib
+-LIBDIR = -L/usr/X11R6/lib
+-INCDIR = -I/usr/X11R6/include
++LIBDIR = -L${X11BASE}/lib -L${LOCALBASE}/lib
++INCDIR = -I${X11BASE}/include
+ 
+ # Edit OSLIBS as appropriate to include OS specific libraries.
  
  OSLIBS = -lkvm
  LIBS   = -lXpm -lXext -lX11 -lm $(OSLIBS)
@@ -9,14 +19,12 @@
  
  OBJS =	wmcube.o \
  	../wmgeneral/wmgeneral.o \
-@@ -32,7 +32,7 @@
- 	rm -f *~
+@@ -20,7 +18,7 @@
+ 	$(CC) $(CFLAGS) $(INCDIR) -c $< -o $*.o
+ 
+ wmcube: $(OBJS)
+-	$(CC) -o wmcube $(OBJS) -lXext $(LIBDIR) $(LIBS)
++	$(CC) -o wmcube $(OBJS) $(LIBDIR) $(LIBS)
+ 
+ all:: wmcube
  
- install:: wmcube
--	cp -f wmcube /usr/local/bin/
--	chmod g+s /usr/local/bin/wmcube
--	chown root.kmem /usr/local/bin/wmcube
-+	$(BSD_INSTALL_PROGRAM) wmcube $(PREFIX)/bin/
-+	chown root:kmem $(PREFIX)/bin/wmcube
-+	chmod g+s $(PREFIX)/bin/wmcube
- 	@echo "wmCube installation finished..."
diff --git a/sysutils/wmcube/pkg-message b/sysutils/wmcube/pkg-message
index ab4588324d20..785ca4fb3a4e 100644
--- a/sysutils/wmcube/pkg-message
+++ b/sysutils/wmcube/pkg-message
@@ -1,10 +1,7 @@
+-------------------------------------------
 The extra 3d objects are located in:
-        /usr/X11R6/share/wmcube
+	%%PREFIX%%/share/wmcube
 
 To run wmcube type:
-        wmcube -o /usr/X11R6/share/wmcube &
-
-Do not forget to replace /usr/X11R6 with your appropriate installation
-prefix if you do not use the port's system default.
-
-(default: /usr/X11R6/)
+	wmcube -o %%PREFIX%%/share/wmcube &
+-------------------------------------------
diff --git a/sysutils/wmcube/pkg-plist b/sysutils/wmcube/pkg-plist
index 8da4b94a74be..8fe57838a876 100644
--- a/sysutils/wmcube/pkg-plist
+++ b/sysutils/wmcube/pkg-plist
@@ -1,4 +1,7 @@
 bin/wmcube
+%%PORTDOCS%%share/doc/wmcube/CHANGES
+%%PORTDOCS%%share/doc/wmcube/README
+%%PORTDOCS%%share/doc/wmcube/TODO
 share/wmcube/2planes-solid.wmc
 share/wmcube/4d.wmc
 share/wmcube/8star-small.wmc
@@ -33,9 +36,5 @@ share/wmcube/spiral.wmc
 share/wmcube/star.wmc
 share/wmcube/starcube.wmc
 share/wmcube/wmlogo.wmc
-%%PORTDOCS%%share/doc/wmcube/CHANGES
-%%PORTDOCS%%share/doc/wmcube/COPYING
-%%PORTDOCS%%share/doc/wmcube/README
-%%PORTDOCS%%share/doc/wmcube/TODO
 @dirrm share/wmcube
 %%PORTDOCS%%@dirrm share/doc/wmcube