5 files changed, 27 insertions, 63 deletions

diff --git a/x11-toolkits/slingshot/Makefile b/x11-toolkits/slingshot/Makefile
index c85f4bd1fe51..ce11913acf17 100644
--- a/x11-toolkits/slingshot/Makefile
+++ b/x11-toolkits/slingshot/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	slingshot
 PORTVERSION=	2.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	ftp://ftp.x.org/R5contrib/
 DISTNAME=	SlingShot${PORTVERSION}
@@ -24,20 +24,12 @@ INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	OPENWINHOME=${X11BASE}
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-BROKEN=		"Does not compile on amd64 or ia64 (missing -fPIC)"
-.endif
-
-pre-patch:
-	${CP} ${WRKSRC}/config.sunos4x ${WRKSRC}/config.fbsd
-
 post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${PREFIX}/share/doc/SlingShot
-	${INSTALL_DATA} ${WRKSRC}/README  ${PREFIX}/share/doc/SlingShot
-	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${PREFIX}/share/doc/SlingShot
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/*.ps ${DOCSDIR}
+	${GZIP_CMD} ${DOCSDIR}/README ${DOCSDIR}/*.ps
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/slingshot/files/patch-aa b/x11-toolkits/slingshot/files/patch-aa
index 000cbc1fa313..7902fdc3c825 100644
--- a/x11-toolkits/slingshot/files/patch-aa
+++ b/x11-toolkits/slingshot/files/patch-aa
@@ -49,18 +49,6 @@
   #
   # Make.config has things that are needed to build on various platforms.
 ***************
-*** 35,40 ****
---- 35,43 ----
-  	@ if [ -s /vmunix ]; then  \
-  		echo cp config.sunos4x Make.config ; \
-  		cp config.sunos4x Make.config ; \
-+ 	elif [ -s /kernel ]; then  \
-+ 		echo cp config.fbsd Make.config ; \
-+ 		cp config.fbsd Make.config ; \
-  	else  \
-  		echo cp config.svr4 Make.config ; \
-  		cp config.svr4 Make.config ; \
-***************
 *** 45,58 ****
   
   clean:
diff --git a/x11-toolkits/slingshot/files/patch-ab b/x11-toolkits/slingshot/files/patch-ab
deleted file mode 100644
index a9a029eb08d1..000000000000
--- a/x11-toolkits/slingshot/files/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-*** config.fbsd.orig	Sun May  2 16:19:57 1999
---- config.fbsd	Sun May  2 16:30:41 1999
-***************
-*** 1,11 ****
-  
-! #	@(#) config.sunos4x 1.6 92/10/27 
-  
-! CONFIGPIC		= -pic
-! CONFIGSHAREDLIBLD	= ld -o $@ -assert pure-text $?
-  
-! SHAREDLIB	= $(LIBDIR)/libsspkg.so.1.0
-! SHAREDLIBDATA	= $(LIBDIR)/libsspkg.sa.1.0
-  
-  CONFIGTARGETS	= $(SHAREDLIB) $(SHAREDLIBDATA)
-  
---- 1,11 ----
-  
-! #	@(#) config.FreeBSD-ELF 1.6 99/10/27 
-  
-! CONFIGPIC		= -fpic
-! CONFIGSHAREDLIBLD	= ld -G -o $@ -h libsspkg.so.1 $? -lm -lc
-  
-! SHAREDLIB	= $(LIBDIR)/libsspkg.so.1
-! SHAREDLIBDATA	= $(LIBDIR)/libsspkg.sa.1
-  
-  CONFIGTARGETS	= $(SHAREDLIB) $(SHAREDLIBDATA)
-  
diff --git a/x11-toolkits/slingshot/files/patch-config.svr4 b/x11-toolkits/slingshot/files/patch-config.svr4
new file mode 100644
index 000000000000..9b225e4de75f
--- /dev/null
+++ b/x11-toolkits/slingshot/files/patch-config.svr4
@@ -0,0 +1,11 @@
+--- config.svr4.orig	Wed May 17 11:15:53 2006
++++ config.svr4	Wed May 17 11:19:04 2006
+@@ -1,7 +1,7 @@
+ 
+ #	@(#) config.svr4 1.7 92/10/27 
+ 
+-CONFIGPIC		= -Kpic
++CONFIGPIC		= -fPIC
+ CONFIGSHAREDLIBLD	= ld -G -o $@ -h libsspkg.so.1 $? -lm -lc;
+ 
+ SHAREDLIB		= $(LIBDIR)/libsspkg.so.1
diff --git a/x11-toolkits/slingshot/pkg-plist b/x11-toolkits/slingshot/pkg-plist
index 817821e6e7a9..d65041f3d432 100644
--- a/x11-toolkits/slingshot/pkg-plist
+++ b/x11-toolkits/slingshot/pkg-plist
@@ -11,14 +11,14 @@ include/sspkg/tree.h
 lib/libsspkg.a
 lib/libsspkg.so
 lib/libsspkg.so.1
-%%PORTDOCS%%share/doc/SlingShot/README
-%%PORTDOCS%%share/doc/SlingShot/appA.ps
-%%PORTDOCS%%share/doc/SlingShot/appB.ps
-%%PORTDOCS%%share/doc/SlingShot/appC.ps
-%%PORTDOCS%%share/doc/SlingShot/appD.ps
-%%PORTDOCS%%share/doc/SlingShot/appE.ps
-%%PORTDOCS%%share/doc/SlingShot/ch1.ps
-%%PORTDOCS%%share/doc/SlingShot/ch2.ps
-%%PORTDOCS%%share/doc/SlingShot/ch3.ps
-%%PORTDOCS%%@dirrm share/doc/SlingShot
+%%PORTDOCS%%%%DOCSDIR%%/README.gz
+%%PORTDOCS%%%%DOCSDIR%%/appA.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/appB.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/appC.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/appD.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/appE.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ch1.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ch2.ps.gz
+%%PORTDOCS%%%%DOCSDIR%%/ch3.ps.gz
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm include/sspkg