4 files changed, 48 insertions, 37 deletions

diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index 0b43652aa423..be76fba9ea0c 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -6,36 +6,64 @@
 #
 
 PORTNAME=	fkiss
-PORTVERSION=	0.32
+PORTVERSION=	0.33a
 CATEGORIES=	games
 MASTER_SITES=	http://www.oersted.co.jp/~yav/soft/fkiss/
-DISTNAME=	${PORTNAME}-${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/a//}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		${PORTNAME}-${PORTVERSION}-patch${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Freely enjoy childlike KISS, French-KISS!
 
 RUN_DEPENDS=	lha:${PORTSDIR}/archivers/lha
 
+NOT_FOR_ARCHS=	alpha
+
 USE_XLIB=	yes
+WANT_GNOME=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
+MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOHEADER="${TRUE}" \
+		AUTOMAKE="${TRUE}"
 
-NOT_FOR_ARCHS=	alpha
-
-WRKSRC=		${WRKDIR}/${DISTNAME}
 MAN1=		fkiss.1
+PLIST_FILES=	bin/fkiss %%EXAMPLESDIR%%/frkismi4.lzh
+PLIST_DIRS=	%%EXAMPLESDIR%%
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+CPPFLAGS+=	`pkg-config --cflags-only-I esound`
+LDFLAGS+=	`pkg-config --libs-only-L esound `
+.endif
+
+.if !defined(NOPORTDOCS)
+PORTDOCS=	README README.ja_JP.eucJP
+.endif
+
+pre-patch:
+	@cd ${WRKSRC} && ${CAT} ../${PORTNAME}-${PORTVERSION}.diff \
+		| ${PATCH} ${PATCH_ARGS}
 
-INSTALL_TARGET=	install
+post-patch:
+	@${REINPLACE_CMD} -e 's|= @X_LIBS@|= @LDFLAGS@ @X_LIBS@|g' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|machine/soundcard|sys/soundcard|g' \
+		${WRKSRC}/sound.c
 
-post-install:
-	${INSTALL_MAN} ${WRKSRC}/fkiss.man ${PREFIX}/man/man1/fkiss.1
-	${MKDIR} ${PREFIX}/share/examples/fkiss
-	${INSTALL_DATA} ${WRKSRC}/frkismi4.lzh ${PREFIX}/share/examples/fkiss
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${PREFIX}/bin/fkiss
+	${INSTALL_MAN} ${WRKSRC}/fkiss.man ${MANPREFIX}/man/man1/fkiss.1
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/frkismi4.lzh ${EXAMPLESDIR}/frkismi4.lzh
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/fkiss
-	${MKDIR} ${PREFIX}/share/doc/ja/fkiss
-	${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/fkiss
-	${INSTALL_MAN} ${WRKSRC}/README.euc ${PREFIX}/share/doc/ja/fkiss
-	${INSTALL_MAN} ${WRKSRC}/README.sjis ${PREFIX}/share/doc/ja/fkiss
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README
+	${INSTALL_DATA} ${WRKSRC}/README.euc ${DOCSDIR}/README.ja_JP.eucJP
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/games/fkiss/distinfo b/games/fkiss/distinfo
index 763978d9337b..f6b2076a9efa 100644
--- a/games/fkiss/distinfo
+++ b/games/fkiss/distinfo
@@ -1,2 +1,4 @@
-MD5 (fkiss-0.32.tar.gz) = c2a0a568e72aeef78e6c66c3bd379459
-SIZE (fkiss-0.32.tar.gz) = 160128
+MD5 (fkiss-0.33.tar.gz) = 7798769bdf70838dfb2f069a9d195f35
+SIZE (fkiss-0.33.tar.gz) = 164697
+MD5 (fkiss-0.33a-patch.tar.gz) = 11a2020961fbd305bfaeb6c014aa26ae
+SIZE (fkiss-0.33a-patch.tar.gz) = 2660
diff --git a/games/fkiss/files/patch-aa b/games/fkiss/files/patch-aa
deleted file mode 100644
index d2e6186a5fc8..000000000000
--- a/games/fkiss/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- sound.c.orig	Sat Sep  7 16:49:25 2002
-+++ sound.c	Sat Sep  7 16:49:46 2002
-@@ -40,7 +40,7 @@
- #ifdef __FreeBSD__
- # define USE_DSP
- # define DEV_SOUND	"/dev/dsp"
--# include <machine/soundcard.h>
-+# include <sys/soundcard.h>
- #endif
- 
- #ifndef DEV_SOUND
diff --git a/games/fkiss/pkg-plist b/games/fkiss/pkg-plist
deleted file mode 100644
index 6d39ec0593d8..000000000000
--- a/games/fkiss/pkg-plist
+++ /dev/null
@@ -1,8 +0,0 @@
-bin/fkiss
-share/examples/fkiss/frkismi4.lzh
-share/doc/fkiss/README
-share/doc/ja/fkiss/README.euc
-share/doc/ja/fkiss/README.sjis
-@dirrm share/examples/fkiss
-@dirrm share/doc/fkiss
-@dirrm share/doc/ja/fkiss