5 files changed, 31 insertions, 46 deletions

diff --git a/audio/snack/Makefile b/audio/snack/Makefile
index 1416c3e6170a..3b6bde3f446d 100644
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@@ -7,24 +7,33 @@
 #
 
 PORTNAME=	snack
-PORTVERSION=	2.2.3
+PORTVERSION=	2.2.4
 CATEGORIES=	audio tcl84 tk84
 MASTER_SITES=	http://www.speech.kth.se/~kare/
 DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	The Snack Sound Toolkit
+COMMENT=	A sound toolkit for scripting languages
 
 LIB_DEPENDS=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
+
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.4 \
-		--with-tk=${LOCALBASE}/lib/tk8.4 \
-		--prefix=${PREFIX}
+		--with-tk=${LOCALBASE}/lib/tk8.4
+MAKE_ENV=	prefix=${PREFIX} exec_prefix=${PREFIX}
+
+PLIST_SUB=	SNACK_VER=${PORTVERSION:R}
+
+CFLAGS+=	-I${LOCALBASE}/include/tcl8.4 -I${LOCALBASE}/include/tk8.4 \
+		-I${LOCALBASE}/include
 
-PLIST_SUB=	SNACK_VER=2.2
+OPTIONS=	VORBIS "Support for OGG/Vorbis Audio" off
+
+.include <bsd.port.pre.mk>
 
 .if defined(WITH_VORBIS)
 LIB_DEPENDS+=	vorbis.3:${PORTSDIR}/audio/libvorbis
@@ -36,21 +45,10 @@ PLIST_SUB+=	VORBIS=""
 PLIST_SUB+=	VORBIS="@comment "
 .endif
 
-pre-everything::
-.if !defined(WITH_VORBIS)
-	@${ECHO_MSG}
-	@${ECHO_MSG} 'Use "make WITH_VORBIS=yes" to build support for OGG Vorbis.'
-	@${ECHO_MSG}
-.endif
-
-post-patch:
-	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" \
-		-e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/Makefile.in
-
-.if !defined(NOPORTDOCS)
 post-install:
+.if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${CP} ${WRKSRC}/../doc/* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../doc/* ${DOCSDIR}
 .endif
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/audio/snack/distinfo b/audio/snack/distinfo
index 7e222be7bc2d..7a3453251849 100644
--- a/audio/snack/distinfo
+++ b/audio/snack/distinfo
@@ -1,2 +1,2 @@
-MD5 (snack2.2.3.tar.gz) = 91973ffd802d456e61b6a15adbbcb014
-SIZE (snack2.2.3.tar.gz) = 1686789
+MD5 (snack2.2.4.tar.gz) = 740140cad6a911cfa2a3583f829d033d
+SIZE (snack2.2.4.tar.gz) = 1702397
diff --git a/audio/snack/files/patch-Makefile.in b/audio/snack/files/patch-Makefile.in
deleted file mode 100644
index c9fd2b812005..000000000000
--- a/audio/snack/files/patch-Makefile.in
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	Sat Nov 24 13:05:13 2001
-+++ Makefile.in	Sat Nov 24 13:07:42 2001
-@@ -1,10 +1,10 @@
- # The path to the tcl.h header file
- 
--TCL_INCPATH = @TCL_SRC_DIR@/generic
-+TCL_INCPATH = %%LOCALBASE%%/include/tcl8.4/generic
- 
- # The path to the tk.h header file
- 
--TK_INCPATH  = @TK_SRC_DIR@/generic
-+TK_INCPATH  = %%LOCALBASE%%/include/tk8.4/generic
- 
- # The path to the X11 include files
-
-@@ -12,7 +12,7 @@
- 
- # Install SNACK package here
- 
--SNACK_INSTALL_PATH = @SNACK_INSTALL_PATH@
-+SNACK_INSTALL_PATH = %%PREFIX%%/lib
- SNACK_HINSTALL_PATH = @SNACK_HINSTALL_PATH@
- 
- # 
diff --git a/audio/snack/files/patch-configure b/audio/snack/files/patch-configure
new file mode 100644
index 000000000000..d29a71853b65
--- /dev/null
+++ b/audio/snack/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Feb 10 20:10:42 2004
++++ configure	Sun Feb 15 13:56:28 2004
+@@ -1418,7 +1418,7 @@
+ echo "$as_me: error: Tcl and Tk must be configured with the --enable-shared flag" >&2;}
+    { (exit 1); exit 1; }; }
+ fi
+-CFLAGS=$TCL_SHLIB_CFLAGS
++CFLAGS="$CFLAGS $TCL_SHLIB_CFLAGS"
+ LD_SEARCH_FLAGS=$TCL_LD_SEARCH_FLAGS
+ SHLIB_LD=$TCL_SHLIB_LD
+ SHLIB_SUFFIX=$TCL_SHLIB_SUFFIX
diff --git a/audio/snack/pkg-plist b/audio/snack/pkg-plist
index 936be0ac4587..8ce073a0a5f3 100644
--- a/audio/snack/pkg-plist
+++ b/audio/snack/pkg-plist
@@ -4,7 +4,6 @@ lib/snack%%SNACK_VER%%/libsound.so
 %%VORBIS%%lib/snack%%SNACK_VER%%/libsnackogg.so
 lib/snack%%SNACK_VER%%/pkgIndex.tcl
 lib/snack%%SNACK_VER%%/snack.tcl
-@dirrm lib/snack%%SNACK_VER%%
 %%PORTDOCS%%%%DOCSDIR%%/AddSubCmd.html
 %%PORTDOCS%%%%DOCSDIR%%/Callback.html
 %%PORTDOCS%%%%DOCSDIR%%/CreateFilter.html
@@ -19,3 +18,4 @@ lib/snack%%SNACK_VER%%/snack.tcl
 %%PORTDOCS%%%%DOCSDIR%%/python-man.html
 %%PORTDOCS%%%%DOCSDIR%%/tcl-man.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm lib/snack%%SNACK_VER%%