5 files changed, 25 insertions, 89 deletions

diff --git a/games/libshhcards/Makefile b/games/libshhcards/Makefile
index 98f53fe420f9..063f58d440db 100644
--- a/games/libshhcards/Makefile
+++ b/games/libshhcards/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	libshhcards
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.5
 CATEGORIES=	games
 MASTER_SITES=	http://shh.thathost.com/pub-unix/files/
 DISTNAME=	shhcards-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
-USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+MAKEFILE=	${FILESDIR}/Makefile.lib
 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} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/CREDITS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/games/libshhcards/distinfo b/games/libshhcards/distinfo
index cd32a54ab40d..136bf8fd9c6a 100644
--- a/games/libshhcards/distinfo
+++ b/games/libshhcards/distinfo
@@ -1 +1 @@
-MD5 (shhcards-1.0.4.tar.gz) = 1882a80484d883a78b9b7ce94ab0afa6
+MD5 (shhcards-1.0.5.tar.gz) = b8695cfe75aeac17d022af14370d48d6
diff --git a/games/libshhcards/files/Makefile.lib b/games/libshhcards/files/Makefile.lib
new file mode 100644
index 000000000000..1b4a135d0c2b
--- /dev/null
+++ b/games/libshhcards/files/Makefile.lib
@@ -0,0 +1,18 @@
+PREFIX?=	/usr/X11R6
+SHLIB_VER?=	1
+
+LIB=	shhcards
+LIBDIR=	${PREFIX}/lib
+SHLIB_MAJOR=	${SHLIB_VER}
+SHLIB_MINOR=	0
+NOPROFILE=	yes
+NOOBJ=	yes
+
+INCS=	shhcards.h
+INCDIR=	${PREFIX}/include
+
+CFLAGS+=	-I${X11BASE}/include
+
+SRCS=	shhcards.c
+
+.include <bsd.lib.mk>
diff --git a/games/libshhcards/files/patch-aa b/games/libshhcards/files/patch-aa
deleted file mode 100644
index 098d95429562..000000000000
--- a/games/libshhcards/files/patch-aa
+++ /dev/null
@@ -1,83 +0,0 @@
---- 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
--#SHARED		= 1
-+SHARED		= 1
- 
- ifeq ($(SHARED),1)
- LIBTARGET	= lib$(DIST).so.$(VERSION)
-@@ -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
-+#CC		= gcc
- OPTIM		= -O2
- 
- ###########################################################################
-@@ -36,8 +36,8 @@
- # Where are Xpm and X11?
- 
- # 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
--ifeq ($(HOSTTYPE),alpha)
--INCDIR		= -I. -I/usr/include/X11 -I/usr/local/X11R5/include
--LIBDIR		= -L. -L/usr/lib/X11 -L/usr/local/X11R5/lib
--endif
-+#ifeq ($(HOSTTYPE),alpha)
-+#INCDIR		= -I. -I/usr/include/X11 -I/usr/local/X11R5/include
-+#LIBDIR		= -L. -L/usr/lib/X11 -L/usr/local/X11R5/lib
-+#endif
- 
- ###########################################################################
- 
--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)
-+	$(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-plist b/games/libshhcards/pkg-plist
index e136cc7d38de..5960967c3b13 100644
--- a/games/libshhcards/pkg-plist
+++ b/games/libshhcards/pkg-plist
@@ -1,4 +1,5 @@
 include/shhcards.h
+lib/libshhcards.a
 lib/libshhcards.so
 lib/libshhcards.so.1
 %%PORTDOCS%%share/doc/libshhcards/CREDITS