4 files changed, 65 insertions, 60 deletions

diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index b43ccaf9f37e..0b2f33962309 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -5,42 +5,25 @@
 # $FreeBSD$
 #
 
-PORTNAME=		libshhcards
-PORTVERSION=		1.0.4
-CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_SUNSITE} \
-			http://home.sol.no/~sverrehu/pub-unix/files/ \
-			${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	libs/ui mph
-DISTNAME=		shhcards-${PORTVERSION}
+PORTNAME=	libshhcards
+PORTVERSION=	1.0.4
+CATEGORIES=	games
+MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
+DISTNAME=	shhcards-${PORTVERSION}
 
-MAINTAINER=		ports@FreeBSD.org
+MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=		Xpm.4:${PORTSDIR}/graphics/xpm
+LIB_DEPENDS=	Xpm.4:${PORTSDIR}/graphics/xpm
 
-USE_GMAKE=		yes
-USE_X_PREFIX=		yes
-INSTALLS_SHLIB=		yes
-SOLIB=			libshhcards.so
-
-.include <bsd.port.pre.mk>
-
-.if ${PORTOBJFORMAT} == "elf"
-SOVERSION=	1
-.else
-SOVERSION=	1.1
-.endif
-
-do-install:
-	@ ${INSTALL_DATA} ${WRKSRC}/shhcards.h ${PREFIX}/include
-	@ ${INSTALL_DATA} ${WRKSRC}/${SOLIB}.${SOVERSION} ${PREFIX}/lib
-	@ ${LN} -sf ${SOLIB}.${SOVERSION} ${PREFIX}/lib/${SOLIB}
+USE_GMAKE=	yes
+USE_X_PREFIX=	yes
+INSTALLS_SHLIB=	yes
 
 post-install:
 .if !defined(NOPORTDOCS)
-	@ ${MKDIR} ${PREFIX}/share/doc/libshhcards
-	@ ${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libshhcards
-	@ ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhcards
+	@${MKDIR} ${PREFIX}/share/doc/libshhcards
+	${INSTALL_DATA} ${WRKSRC}/CREDITS ${PREFIX}/share/doc/libshhcards
+	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/libshhcards
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/libshhcards/files/patch-aa b/games/libshhcards/files/patch-aa
index 898cd23991b5..098d95429562 100644
--- a/games/libshhcards/files/patch-aa
+++ b/games/libshhcards/files/patch-aa
@@ -1,19 +1,6 @@
---- Makefile.orig	Sun Jul  5 11:52:26 1998
-+++ Makefile	Sun May 30 21:07:36 1999
-@@ -1,14 +1,17 @@
- # $Id: Makefile,v 1.4 1998/07/05 16:52:26 sverrehu Exp $
- DIST		= shhcards
- VERMAJ		= 1
--VERMIN		= 0
--VERPAT		= 4
--VERSION		= $(VERMAJ).$(VERMIN).$(VERPAT)
-+VERMIN		= 1
-+ifeq ($(PORTOBJFORMAT),elf)
-+VERSION		= $(VERMAJ)
-+else
-+VERSION		= $(VERMAJ).$(VERMIN)
-+endif
- 
+--- Makefile.orig	Mon Jul  6 01:52:26 1998
++++ Makefile	Tue Jul  4 21:38:46 2000
+@@ -8,7 +8,7 @@
  ###########################################################################
  
  # Define SHARED as 1 for Linux shared ELF library
@@ -22,18 +9,36 @@
  
  ifeq ($(SHARED),1)
  LIBTARGET	= lib$(DIST).so.$(VERSION)
-@@ -28,8 +31,8 @@
- INSTALL		= install -m 644
- MKDIRP		= install -d -m 755
+@@ -22,13 +22,13 @@
+ LIBHEAD		= $(DIST).h
+ TARGETS		= $(LIBTARGET)
+ 
+-INSTBASEDIR	= /usr/local
++INSTBASEDIR	= ${PREFIX}
+ INSTLIBDIR	= $(INSTBASEDIR)/lib
+ INSTINCDIR	= $(INSTBASEDIR)/include
+-INSTALL		= install -m 644
+-MKDIRP		= install -d -m 755
++INSTALL		= ${BSD_INSTALL_DATA}
++MKDIRP		= mkdir -p
  
 -CC		= gcc
--OPTIM		= -O2
 +#CC		= gcc
-+OPTIM		= $(CFLAGS)
+ OPTIM		= -O2
  
  ###########################################################################
+@@ -36,8 +36,8 @@
+ # Where are Xpm and X11?
  
-@@ -68,10 +71,10 @@
+ # GNU/Linux at home
+-INCDIR		= -I. -I/usr/local/include -I/usr/X11R6/include
+-LIBDIR		= -L. -L/usr/local/lib -L/usr/X11R6/lib -L/usr/local/lib/X11
++INCDIR		= -I. -I${X11BASE}/include
++LIBDIR		= -L. -L${X11BASE}/lib
+ EXTRA_LD_OPT	= 
+ EXTRA_LIBS	= 
+ 
+@@ -68,14 +68,14 @@
  endif
  
  # Alpha at USIT
@@ -48,16 +53,31 @@
  
  ###########################################################################
  
-@@ -87,7 +90,11 @@
+-CCOPT		= -Wall $(OPTIM) $(INCDIR) $(CFLAGS)
++CCOPT		= $(INCDIR) $(CFLAGS)
+ LDOPT		= $(LIBDIR) $(LDFLAGS)
+ 
+ # Object files to store in the library
+@@ -87,7 +87,7 @@
  
  $(LIBTARGET): $(LIBOBJS)
  ifeq ($(SHARED),1)
 -	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGET) $(LIBOBJS)
-+ifeq ($(PORTOBJFORMAT),elf)
-+	$(CC) -shared -Wl,-soname,$(LIBTARGET) -o $(LIBTARGET) $(LIBOBJS)
-+else
-+	$(CC) -shared -o $(LIBTARGET) $(LIBOBJS)
-+endif
++	$(CC) -shared -Wl,-soname,$(LIBTARGETSOMAJ) -o $(LIBTARGETSOMAJ) $(LIBOBJS)
  else
  	ar rcs $(LIBTARGET) $(LIBOBJS)
  endif
+@@ -106,12 +106,10 @@
+ 
+ install: $(LIBTARGET)
+ 	$(MKDIRP) $(INSTLIBDIR) $(INSTINCDIR)
+-	$(INSTALL) $(LIBTARGET) $(INSTLIBDIR)
++	$(INSTALL) $(LIBTARGETSOMAJ) $(INSTLIBDIR)
+ 	$(INSTALL) $(LIBHEAD) $(INSTINCDIR)
+ ifeq ($(SHARED),1)
+-	ln -sf $(LIBTARGET) $(INSTLIBDIR)/$(LIBTARGETSOMAJ)
+ 	ln -sf $(LIBTARGETSOMAJ) $(INSTLIBDIR)/$(LIBTARGETSO)
+-	echo "If you use GNU/Linux, remember to run ldconfig"
+ endif
+ 
+ depend dep:
diff --git a/games/libshhcards/pkg-descr b/games/libshhcards/pkg-descr
index bad9f3ddf99c..7c53f15445ae 100644
--- a/games/libshhcards/pkg-descr
+++ b/games/libshhcards/pkg-descr
@@ -1,3 +1,5 @@
 shhcards is a library for displaying game cards on X11.
 It provides pixmaps for card games, and functions for
 using the cards in X11 programs.
+
+WWW: http://shh.thathost.com/pub-unix/#shhcards
diff --git a/games/libshhcards/pkg-plist b/games/libshhcards/pkg-plist
index c82eff08934c..2664179c4faf 100644
--- a/games/libshhcards/pkg-plist
+++ b/games/libshhcards/pkg-plist
@@ -1,6 +1,6 @@
 include/shhcards.h
 lib/libshhcards.so
-lib/libshhcards.so.1.1
+lib/libshhcards.so.1
 share/doc/libshhcards/CREDITS
 share/doc/libshhcards/README
 @dirrm share/doc/libshhcards