* buildlink1 -> buildlink2

* include ossaudio.buildlink2.mk since fkiss links against libossaudio.*
* remove dependency on autoconf/automake.

4 files changed, 17 insertions, 44 deletions

diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index f47ca6e7196..4ce29b362c1 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/08/13 01:51:25 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2002/09/21 12:55:07 jlam Exp $
 #
 
 DISTNAME=		fkiss-0.32
@@ -9,19 +9,14 @@ MAINTAINER=		collver@linuxfreemail.com
 HOMEPAGE=		http://www.oersted.co.jp/~yav/soft/indexe.html#fkiss
 COMMENT=		kisekae viewer
 
-BUILD_DEPENDS+=		autoconf>=2.13:../../devel/autoconf
-BUILD_DEPENDS+=		automake>=1.4:../../devel/automake
-DEPENDS+=		lha-*:../../archivers/lha
+DEPENDS+=		lha-[0-9]*:../../archivers/lha
 
+USE_BUILDLINK2=		yes
+USE_X11=		yes
 USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CFLAGS+=		-DUSE_STDARG -DHAVE_STDARG_H
 
-pre-configure:
-	cd ${WRKSRC} && \
-		automake && \
-		autoreconf --force
-
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/fkiss.man ${PREFIX}/man/man6/fkiss.6
@@ -35,5 +30,5 @@ do-install:
 			>${PREFIX}/share/doc/fkiss/`${BASENAME} $$i`; \
 	done
 
-.include "../../mk/x11.buildlink.mk"
+.include "../../mk/ossaudio.buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/fkiss/distinfo b/games/fkiss/distinfo
index 8e0a01bf53c..2d839502ad7 100644
--- a/games/fkiss/distinfo
+++ b/games/fkiss/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $
+$NetBSD: distinfo,v 1.2 2002/09/21 12:55:07 jlam Exp $
 
 SHA1 (fkiss-0.32.tar.gz) = 401cfddfbe117de15c1ff36de404a2c360f17d97
 Size (fkiss-0.32.tar.gz) = 160128 bytes
-SHA1 (patch-aa) = 26979b546521153704e6b62332998f57242858d3
-SHA1 (patch-ab) = 28a7a8e2c600caea086a8e6163c52e4e4df700c5
+SHA1 (patch-ab) = 4b387d82c310bb3d256fff9b1ba7e8f90cc610a8
 SHA1 (patch-ac) = 40e190d4d40dd3bcbc7f803e1f0e0c8155e69bf1
 SHA1 (patch-ad) = d22771c05d3eea81c95d003e89e4b9dffae70fef
 SHA1 (patch-ae) = 517086e4a5273725b6e4c0928b8bb01804e33b55
diff --git a/games/fkiss/patches/patch-aa b/games/fkiss/patches/patch-aa
deleted file mode 100644
index 954344c2ffe..00000000000
--- a/games/fkiss/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/07/14 09:40:31 rh Exp $
-
---- configure.in.orig	Mon Oct 16 22:10:10 2000
-+++ configure.in
-@@ -8,8 +8,6 @@
- AC_PROG_CC
- 
- dnl Checks for libraries.
--dnl Replace `main' with a function in -lesd:
--AC_CHECK_LIB(esd, esd_open_sound)
- 
- dnl Checks for header files.
- AC_HEADER_DIRENT
-@@ -18,7 +16,7 @@
- 
- dnl AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h)
- AC_CHECK_HEADERS(fcntl.h strings.h sys/ioctl.h unistd.h\
-- sys/stat.h stat.h signal.h esd.h)
-+ sys/stat.h stat.h signal.h)
- 
- dnl Checks for X.
- AC_PATH_X
diff --git a/games/fkiss/patches/patch-ab b/games/fkiss/patches/patch-ab
index dcacd8028a9..838a0ae77b1 100644
--- a/games/fkiss/patches/patch-ab
+++ b/games/fkiss/patches/patch-ab
@@ -1,14 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/07/14 09:40:30 rh Exp $
+$NetBSD: patch-ab,v 1.2 2002/09/21 12:55:08 jlam Exp $
 
---- Makefile.am.orig	Mon Oct 16 22:22:57 2000
-+++ Makefile.am
-@@ -6,8 +6,7 @@
-  extern.h fkiss.h headers.h kiss.h timer.h ulaw.h version.h work.h\
-  grip0.xbm grip1.xbm hand0.xbm hand1.xbm icon.xbm\
-  coptions
+--- Makefile.in.orig	Mon Oct 16 22:34:46 2000
++++ Makefile.in
+@@ -68,8 +68,8 @@ x_libraries = @x_libraries@
+ bin_PROGRAMS = fkiss
+ fkiss_SOURCES =   fkiss.c menu.c selcnf.c cursor.c dir.c sound.c kisscnf.c sub.c  color.c kisseve.c comment.c bg.c timer.c  codeconv.c jiscode.c work.c message.c  extern.h fkiss.h headers.h kiss.h timer.h ulaw.h version.h work.h  grip0.xbm grip1.xbm hand0.xbm hand1.xbm icon.xbm  coptions
+ 
 -LDFLAGS = @X_LIBS@
 -LDADD = -lX11
-+LDADD = -lX11 -lossaudio @X_LIBS@
++LDFLAGS = @LDFLAGS@ @X_LIBS@
++LDADD = -lX11 $(LIBOSSAUDIO)
  INCLUDES = -I@x_includes@
  
- EXTRA_DIST = fkiss.man fkissrc.smp\
+ EXTRA_DIST = fkiss.man fkissrc.smp  english.sed japanese.sed README.euc README.sjis  kissgs.doc fkissex.doc fkissex1.doc fkissex2.doc fkissex3.doc  frkismi4.lzh