From 9d1287c682f9dbd37327de1ea9c2a4dd3776c53d Mon Sep 17 00:00:00 2001 From: Baptiste Daroussin Date: Sun, 13 Sep 2015 13:42:26 +0000 Subject: Use proper options to check for esound --- games/fkiss/Makefile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'games/fkiss') diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile index 79d9379a259e..f971e825c784 100644 --- a/games/fkiss/Makefile +++ b/games/fkiss/Makefile @@ -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.gz PORTDOCS= * PORTEXAMPLES= * -OPTIONS_DEFINE= DOCS EXAMPLES +OPTIONS_DEFINE= DOCS EXAMPLES ESOUND -.include - -# 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 +.include -- cgit