Clean up. Use ${X11BASE}, ${MOTIFLIB}, XawClientLibs, xmkmf -a,

correctly reference compressed man pages, and define REQUIRES_MOTIF.

5 files changed, 7 insertions, 7 deletions

diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index 1a2e1cc6c1ff..878300c9157e 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -5,7 +5,7 @@
 #
 # WARNING WARNING: Requires Motif to compile & link
 #
-# $Id: Makefile,v 1.1.1.1 1995/10/30 17:29:07 pst Exp $
+# $Id: Makefile,v 1.2 1995/11/27 04:10:12 asami Exp $
 #
 
 DISTNAME=	ashe-1.1.2
@@ -15,6 +15,7 @@ MASTER_SITES=	ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/src/ \
 		ftp://ftp.cs.rpi.edu/pub/puninj/ASHE/ASHE-1.1.2/libhtmlw/
 DISTFILES=	ashe_cci.tar.Z cci.tar.Z libhtmlw.tar.Z
 
+REQUIRES_MOTIF=	yes
 NO_WRKSUBDIR=	yes
 USE_X11=	yes
 
diff --git a/www/ashe/files/patch-aa b/www/ashe/files/patch-aa
index e686cbac3899..adcc005b5b9e 100644
--- a/www/ashe/files/patch-aa
+++ b/www/ashe/files/patch-aa
@@ -13,7 +13,7 @@
   all: $(LIBTARGET)
 --- 1,5 ----
   LIBTARGET = libhtmlw.a
-! CFLAGS+=-I/usr/X11R6/include -DMOTIF1_2
+! CFLAGS+=-I${X11BASE}/include -DMOTIF1_2
   RANLIB=ranlib
   
   all: $(LIBTARGET)
diff --git a/www/ashe/files/patch-ac b/www/ashe/files/patch-ac
index 6515ce324bcf..72be72b9633d 100644
--- a/www/ashe/files/patch-ac
+++ b/www/ashe/files/patch-ac
@@ -52,7 +52,7 @@
   
 - 
 - #EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXt -lXext -lX11
-  EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11
+- EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11
   
 ! #
 ! # This is what is built when you say 'make all'
@@ -79,7 +79,7 @@
    */
 ! INCLUDES = -I../libhtmlw-src -I../libcci
   
-  EXTRA_LIBRARIES =  -lcci -lhtmlw -lXm -lXaw -lXmu -lXt -lXext -lX11
++ EXTRA_LIBRARIES =  -lcci -lhtmlw ${MOTIFLIB} XawClientLibs
   
 ! ComplexProgramTarget(xhtml)
 ! InstallNonExecFile(help.html,$(LIBDIR)/xhtml)
diff --git a/www/ashe/files/patch-ad b/www/ashe/files/patch-ad
index 9ef846b91048..1fadd0c76bf6 100644
--- a/www/ashe/files/patch-ad
+++ b/www/ashe/files/patch-ad
@@ -11,4 +11,4 @@
   
   ! Very Important : Change this directory to the directory of help.html
   
-! xhtml*htmldir: /usr/X11R6/lib/X11/xhtml
+! xhtml*htmldir: ${X11BASE}/lib/X11/xhtml
diff --git a/www/ashe/pkg-plist b/www/ashe/pkg-plist
index 0f7d6be19dc0..896071cde0c7 100644
--- a/www/ashe/pkg-plist
+++ b/www/ashe/pkg-plist
@@ -1,5 +1,4 @@
-@cwd /usr/X11R6
 bin/xhtml
 lib/X11/xhtml/help.html
 lib/X11/app-defaults/XHTML.ad
-man/man1/xhtml.1
+man/man1/xhtml.1.gz