Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 23 Jan 2014 11:15:01 +0000 (UTC)
From:      Pietro Cerutti <gahr@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r340823 - head/audio/snack
Message-ID:  <201401231115.s0NBF1nf097453@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gahr
Date: Thu Jan 23 11:15:00 2014
New Revision: 340823
URL: http://svnweb.freebsd.org/changeset/ports/340823
QAT: https://qat.redports.org/buildarchive/r340823/

Log:
  - Convert to USES=tk
  - STAGE-clean

Modified:
  head/audio/snack/Makefile

Modified: head/audio/snack/Makefile
==============================================================================
--- head/audio/snack/Makefile	Thu Jan 23 11:10:46 2014	(r340822)
+++ head/audio/snack/Makefile	Thu Jan 23 11:15:00 2014	(r340823)
@@ -13,42 +13,30 @@ COMMENT=	A sound toolkit for scripting l
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 
-USE_TK=		84+
-NO_STAGE=	yes
-
 OPTIONS_DEFINE=	VORBIS DOCS
+OPTIONS_SUB=	yes
 
+USES=		tk
+USE_LDCONFIG=	${PREFIX}/lib/snack${PORTVERSION:R}
 GNU_CONFIGURE=	yes
-
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MDOCS}
-PORTDOCS=	*
-.endif
-
-PLIST_SUB=	SNACK_VER=${PORTVERSION:R}
-
 CONFIGURE_ARGS=	--with-tcl=${TCL_LIBDIR} \
 		--with-tk=${TK_LIBDIR}
 MAKE_ENV=	prefix=${PREFIX} exec_prefix=${PREFIX}
 
-CFLAGS+=	-I${TCL_INCLUDEDIR} -I${TK_INCLUDEDIR} \
-		-I${LOCALBASE}/include
+PLIST_SUB=	SNACK_VER=${PORTVERSION:R}
+PORTDOCS=	*
+
+.include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MVORBIS}
 LIB_DEPENDS+=	libvorbis.so:${PORTSDIR}/audio/libvorbis
-CONFIGURE_ARGS+=	--with-ogg-include=${LOCALBASE}/include \
-			--with-ogg-lib=${LOCALBASE}/lib
+CONFIGURE_ARGS+=--with-ogg-include=${LOCALBASE}/include \
+		--with-ogg-lib=${LOCALBASE}/lib
 ALL_TARGET=	all libsnackogg.so
-PLIST_SUB+=	VORBIS=""
-.else
-PLIST_SUB+=	VORBIS="@comment "
 .endif
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201401231115.s0NBF1nf097453>