From owner-svn-ports-head@freebsd.org  Sun Sep 13 13:42:27 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id A8CAFA03FFC;
 Sun, 13 Sep 2015 13:42:27 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 7CF001383;
 Sun, 13 Sep 2015 13:42:27 +0000 (UTC)
 (envelope-from bapt@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t8DDgRKC073822;
 Sun, 13 Sep 2015 13:42:27 GMT (envelope-from bapt@FreeBSD.org)
Received: (from bapt@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t8DDgRSJ073821;
 Sun, 13 Sep 2015 13:42:27 GMT (envelope-from bapt@FreeBSD.org)
Message-Id: <201509131342.t8DDgRSJ073821@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: bapt set sender to
 bapt@FreeBSD.org using -f
From: Baptiste Daroussin <bapt@FreeBSD.org>
Date: Sun, 13 Sep 2015 13:42:27 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r396819 - head/games/fkiss
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 13 Sep 2015 13:42:27 -0000

Author: bapt
Date: Sun Sep 13 13:42:26 2015
New Revision: 396819
URL: https://svnweb.freebsd.org/changeset/ports/396819

Log:
  Use proper options to check for esound

Modified:
  head/games/fkiss/Makefile

Modified: head/games/fkiss/Makefile
==============================================================================
--- head/games/fkiss/Makefile	Sun Sep 13 13:41:09 2015	(r396818)
+++ head/games/fkiss/Makefile	Sun Sep 13 13:42:26 2015	(r396819)
@@ -3,7 +3,7 @@
 
 PORTNAME=	fkiss
 PORTVERSION=	0.33a
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	http://www2s.biglobe.ne.jp/~yav/soft/fkiss/
 DISTNAME=	${PORTNAME}-${PORTVERSION:S/a//}
@@ -30,17 +30,14 @@ PLIST_FILES=	bin/fkiss man/man1/fkiss.1.
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES ESOUND
 
-.include <bsd.port.pre.mk>
-
-# XXX should be converted to OptionsNG
-.if ${HAVE_GNOME:Mesound}
-USES+=		pkgconfig
-USE_GNOME+=	esound
-CPPFLAGS+=	`pkg-config --cflags-only-I esound`
-LDFLAGS+=	`pkg-config --libs-only-L esound `
-.endif
+ESOUND_USES=	pkgconfig
+ESOUND_USE=	GNOME=esound
+ESOUND_CPPFLAGS=	`pkgconf --cflags-only-I esound`
+ESOUND_LDFLAGS=		`pkgconf --libs-only-L esound `
+ESOUND_CONFIGURE_ENV_OFF=	ac_cv_lib_esd_esd_open_sound=no \
+				ac_cv_header_esd_h=no
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|= @X_LIBS@|= @LDFLAGS@ @X_LIBS@|g' \
@@ -52,12 +49,16 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/fkiss ${STAGEDIR}${PREFIX}/bin/fkiss
 	${INSTALL_MAN} ${WRKSRC}/fkiss.man \
 		${STAGEDIR}${MANPREFIX}/man/man1/fkiss.1
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README.euc \
 		${STAGEDIR}${DOCSDIR}/README.ja_JP.eucJP
+
+do-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/frkismi4.lzh \
 		${STAGEDIR}${EXAMPLESDIR}/frkismi4.lzh
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>