audio/sdl_sound:

- USES=libtool. - Strip library. - Replace patch+reinplace with a single reinplace. - Remove a patch so we use the upstream library name again. Bump PORTREVISION on all dependent ports. games/alephone: - USES=gmake tar:bzip2. - Remove unneeded PKG_CONFIG variable. - Staging. - New LIB_DEPENDS syntax. games/asc: - USES=libtool. games/gltron: - New LIB_DEPENDS syntax. - USES=gmake. - Remove references to PTHREAD_CFLAGS and PTHREAD_LIBS. - Use option helpers. - Staging. lang/kroc: (still BROKEN due to use of "python" command) - New LIB_DEPENDS syntax. - USES=pathfix tar:bzip2. - Staging. - Replace patches with post-patch. - Replace MAKE with MAKE_CMD. lang/smalltalk: - USES=libtool tar:xz. - Use BROKEN_sparc64.
svn path=/head/; revision=352933
2024-11-21 00:25:50 +00:00 · 2014-05-03 18:58:57 +00:00 · 2014-05-03 18:58:57 +00:00 · ff57a36a58 · 2021-03-31 03:12:20 +00:00
commit ff57a36a58
parent dad068d84d
26 changed files with 76 additions and 180 deletions
--- a/audio/sdl_sound/Makefile
+++ b/audio/sdl_sound/Makefile
@ -3,20 +3,22 @@

 PORTNAME=	sdl_sound
 PORTVERSION=	1.0.3
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	audio
 MASTER_SITES=	http://offload1.icculus.org:9090/SDL_sound/downloads/ \
 		http://offload2.icculus.org:9090/SDL_sound/downloads/
 DISTNAME=	SDL_sound-${PORTVERSION}

 MAINTAINER=	mva@FreeBSD.org
-COMMENT=	A SDL audio library and player for some popular sound file formats
+COMMENT=	SDL audio library and player for some popular sound file formats

-USE_AUTOTOOLS=	libtool
+USES=		libtool
 USE_LDCONFIG=	yes
 USE_SDL=	sdl
+GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
+INSTALL_TARGET=	install-strip

 OPTIONS_DEFINE=		FLAC MIKMOD MIDI MODPLUG PHYSFS SMPEG SPEEX VORBIS
 OPTIONS_DEFAULT=	FLAC MIKMOD MIDI MODPLUG PHYSFS SMPEG SPEEX VORBIS
@ -25,7 +27,7 @@ MIDI_DESC=	Software MIDI music
 PHYSFS_DESC=	PhysicsFS support
 SMPEG_DESC=	MP3 audio format

-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MFLAC}
 LIB_DEPENDS+=	libFLAC.so:${PORTSDIR}/audio/flac
@ -85,6 +87,7 @@ pre-everything::
 .endif

 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/decoders/timidity/options.h
+	@${REINPLACE_CMD} 's|timidity.cfg|${PREFIX}/share/timidity/&|' \
+		${WRKSRC}/decoders/timidity/options.h

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/audio/sdl_sound/files/patch-Makefile.in
+++ b/audio/sdl_sound/files/patch-Makefile.in
@ -1,10 +0,0 @@
--- Makefile.in.orig	Tue Sep 12 19:18:15 2006
-+++ Makefile.in	Tue Sep 12 19:18:24 2006
-@@ -127,7 +127,6 @@
- @USE_MPGLIB_FALSE@MPGLIB_LIB = 
- 
- libSDL_sound_la_LDFLAGS = \
-	-release $(LT_RELEASE)	\
- 	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- 
- libSDL_sound_la_LIBADD = \
--- a/audio/sdl_sound/files/patch-decoders-timidity-options.h
+++ b/audio/sdl_sound/files/patch-decoders-timidity-options.h
@ -1,11 +0,0 @@
--- decoders/timidity/options.h.orig      2008-04-17 21:56:20.000000000 +0400
-+++ decoders/timidity/options.h    2012-12-04 01:38:58.000000000 +0400
-@@ -80,7 +80,7 @@
- #define MAX_AMPLIFICATION 800
- 
- /* The TiMidity configuration file */
-#define CONFIG_FILE "timidity.cfg"
-+#define CONFIG_FILE "%%PREFIX%%/share/timidity/timidity.cfg"
- 
- /* These affect general volume */
- #define GUARD_BITS 3
--- a/audio/sdl_sound/pkg-plist
+++ b/audio/sdl_sound/pkg-plist
@ -1,8 +1,7 @@
 bin/playsound
 bin/playsound_simple
 include/SDL/SDL_sound.h
+lib/libSDL_sound-1.0.so.1
+lib/libSDL_sound-1.0.so.1.0.2
 lib/libSDL_sound.a
-lib/libSDL_sound.la
 lib/libSDL_sound.so
-lib/libSDL_sound.so.1
-@dirrmtry include/SDL
--- a/emulators/dosbox/Makefile
+++ b/emulators/dosbox/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	dosbox
 PORTVERSION=	0.74
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	emulators
 MASTER_SITES=	SF

--- a/games/alephone/Makefile
+++ b/games/alephone/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	alephone
 PORTVERSION=	20120514
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/marathon/Aleph%20One/2012-05-14
 DISTNAME=	AlephOne-${PORTVERSION}
@ -13,21 +13,14 @@ COMMENT=	The open source version of Bungie's Marathon game

 BUILD_DEPENDS+=	${LOCALBASE}/include/boost/function.hpp:${PORTSDIR}/devel/boost-libs

-USE_GMAKE=	yes
-
-USES=		pkgconfig
-USE_BZIP2=	yes
-USE_SDL+=	image net sdl sound
+USES=		gmake pkgconfig tar:bzip2
+USE_SDL=	image net sdl sound
 USE_GL=		yes
-PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--disable-alsa --disable-sndfile
-CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}"

 DATADIR=	${PREFIX}/share/AlephOne

-MAN6=		alephone.6
-
 OPTIONS_DEFINE=	MAD OGG SPEEX SMPEG TTF ZZIP
 SMPEG_DESC=	Use SMPEG for movie playback
 TTF_DESC=	Enable SDL_ttf font rendering
@ -35,29 +28,28 @@ ZZIP_DESC=	Enable zziplib support

 OPTIONS_DEFAULT=	MAD OGG SPEEX SMPEG TTF ZZIP

-NO_STAGE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MMAD}
-LIB_DEPEND+=	mad.2:${PORTSDIR}/audio/libmad
+LIB_DEPEND+=	libmad.so:${PORTSDIR}/audio/libmad
 .else
 CONFIGURE_ARGS+=--disable-mad
 .endif

 .if ${PORT_OPTIONS:MOGG}
-LIB_DEPEND+=	vorbisfile.6:${PORTSDIR}/audio/libvorbis
+LIB_DEPEND+=	libvorbisfile.so:${PORTSDIR}/audio/libvorbis
 .else
 CONFIGURE_ARGS+=--disable-vorbis
 .endif

 .if ${PORT_OPTIONS:MSPEEX}
-LIB_DEPENDS+=	speex.1:${PORTSDIR}/audio/speex
+LIB_DEPENDS+=	libspeex.so:${PORTSDIR}/audio/speex
 .else
 CONFIGURE_ARGS+=--disable-speex
 .endif

 .if ${PORT_OPTIONS:MSMPEG}
-LIB_DEPENDS+=	smpeg.1:${PORTSDIR}/multimedia/smpeg
+LIB_DEPENDS+=	libsmpeg.so:${PORTSDIR}/multimedia/smpeg
 .else
 CONFIGURE_ARGS+=--disable-smpeg
 .endif
@ -69,19 +61,16 @@ CONFIGURE_ARGS+=--disable-ttf
 .endif

 .if ${PORT_OPTIONS:MZZIP}
-LIB_DEPENDS+=	zzip.13:${PORTSDIR}/devel/zziplib
+LIB_DEPENDS+=	libzzip.so:${PORTSDIR}/devel/zziplib
 .else
 CONFIGURE_ARGS+=--disable-zzip
 .endif

 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} README ${DOCSDIR}
-	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${INSTALL_DATA} *.html ${STAGEDIR}${DOCSDIR}
 .endif
-	@${ECHO_CMD}
-	@${CAT} ${PKGMESSAGE}
-	@${ECHO_CMD}

 .include <bsd.port.mk>
--- a/games/alephone/pkg-plist
+++ b/games/alephone/pkg-plist
@ -1,4 +1,5 @@
 bin/alephone
+man/man6/alephone.6.gz
 %%DATADIR%%/Fonts
 %%DATADIR%%/MML/Interface_Rects.mml
 %%DATADIR%%/MML/Transparent_Liquids.mml
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	asc
 PORTVERSION=	2.6.0.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}-hq/ASC%20Source/${PORTVERSION:R} \
 		http://www.asc-hq.org/music/:music
@ -27,7 +27,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 OPTIONS_DEFINE=	MUSIC XVID
 MUSIC_DESC=	Install extra music files

-USES=		gmake perl5 pkgconfig tar:bzip2
+USES=		gmake libtool perl5 pkgconfig tar:bzip2
 USE_SDL=	image mixer sound sdl
 USE_WX=		3.0
 WX_UNICODE=	yes
--- a/games/avoision/Makefile
+++ b/games/avoision/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	avoision
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	games
 MASTER_SITES=	SF/avsn/

--- a/games/cretan-hubris/Makefile
+++ b/games/cretan-hubris/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	cretan-hubris
 PORTVERSION=	0.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/radius-engine/egp/

--- a/games/f1spirit-remake/Makefile
+++ b/games/f1spirit-remake/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	f1spirit-remake
 PORTVERSION=	1.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	games
 # Original braingames site is really slow
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
--- a/games/fbg2/Makefile
+++ b/games/fbg2/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	fbg2
 PORTVERSION=	0.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
 MASTER_SITES=	SF/fbg/

--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@ -3,27 +3,29 @@

 PORTNAME=	gltron
 PORTVERSION=	0.70
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-source/${PORTVERSION}
 EXTRACT_SUFX=	-source.tar.gz

 MAINTAINER=	lx@FreeBSD.org
-COMMENT=	A 3D worm game for two players for X Window System
+COMMENT=	3D worm game for two players for X Window System

-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png

+USES=		gmake
 USE_GL=		gl
 USE_SDL=	sdl sound
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-warn

-CPPFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_CFLAGS}
-LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib

 OPTIONS_DEFINE=	SDL_NET
 SDL_NET_DESC=	Network Support
+SDL_NET_USE=	SDL=net
+SLD_NET_CONFIGURE_ENABLE=	network

 DESKTOP_ENTRIES=	"GLtron" \
 	"3D lightcycle game" \
@ -32,14 +34,6 @@ DESKTOP_ENTRIES=	"GLtron" \
 	"Game;ArcadeGame;" \
 	false

-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MSDL_NET}
-USE_SDL+=	net
-CONFIGURE_ARGS+=	--enable-network
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|CFLAGS="-D|CFLAGS="$$CFLAGS -D|g ; \
 		 s|-O$$enable_optimize||g' ${WRKSRC}/configure
@ -49,11 +43,9 @@ post-patch:
 		 s|-ansi -pedantic||g'

 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for file in ChangeLog README
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif

 .include <bsd.port.mk>
--- a/games/qtads/Makefile
+++ b/games/qtads/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	qtads
 PORTVERSION=	2.1.6
+PORTREVISION=	1
 CATEGORIES=	games
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-2.x/${PORTVERSION}

@ -11,8 +12,7 @@ COMMENT=	Cross-platform multimedia interpreter for TADS games

 LICENSE=	GPLv2

-USES=		gmake pkgconfig qmake
-USE_BZIP2=	yes
+USES=		gmake pkgconfig qmake tar:bzip2
 USE_QT4=	gui moc_build network rcc_build uic_build
 USE_SDL=	sdl mixer sound

--- a/games/stransball2/Makefile
+++ b/games/stransball2/Makefile
@ -3,14 +3,14 @@

 PORTNAME=	stransball2
 PORTVERSION=	1.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
 MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/ \
 		http://braingames.bugreport.nl/stransball2/
 DISTNAME=	${PORTNAME}-v${PORTVERSION:C/\.//}-linux

 MAINTAINER=	amdmi3@FreeBSD.org
-COMMENT=	A sequel to Transball and Transball 2 THRUST-type games
+COMMENT=	Sequel to Transball and Transball 2 THRUST-type games

 LIB_DEPENDS=	libSGE.so:${PORTSDIR}/devel/sdl_sge

--- a/games/thegrind/Makefile
+++ b/games/thegrind/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	thegrind
 PORTVERSION=	0.1.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	games
 MASTER_SITES=	SF/radius-engine/ld21/

--- a/graphics/radius-engine/Makefile
+++ b/graphics/radius-engine/Makefile
@ -3,6 +3,7 @@

 PORTNAME=	radius-engine
 PORTVERSION=	1.1
+PORTREVISION=	1
 CATEGORIES=	graphics devel
 MASTER_SITES=	SF/${PORTNAME}/

--- a/lang/kroc/Makefile
+++ b/lang/kroc/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	kroc
 PORTVERSION=	1.5.r6372
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	lang
 MASTER_SITES=	http://ftp.i-scream.org/pub/kroc/ \
 		ftp://ftp.i-scream.org/pub/kroc/
@ -15,12 +15,13 @@ COMMENT=	The Kent Retargetable occam-pi Compiler
 BROKEN=		Fails to build

 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash
-LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
+LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png
 RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash

 ONLY_FOR_ARCHS=	i386

-USE_BZIP2=	yes
+USES=		pathfix pkgconfig tar:bzip2
+PATHFIX_MAKEFILEIN=	Makefile.am
 USE_LDCONFIG=	yes
 USE_GL=		yes
 USE_MYSQL=	yes
@ -30,26 +31,16 @@ USE_GNOME=	libxslt
 USE_AUTOTOOLS=	autoconf:env automake:env
 USE_XORG=	xmu xi
 GNU_CONFIGURE=	yes
-USES=		pkgconfig

-MAN1=		kmakef.1 kroc.1 mkoccdeps.1 occ21.1 occamdoc.1
-MAN3=		libconvert-inmos.3 libcourse-cycles.3 libcourse-nets.3 \
-		libcourse-utils.3 libfile.3 libhostio-inmos.3 libmath-inmos.3 \
-		libproc.3 libsock.3 libstreamio-inmos.3 libstring-inmos.3
-
-NO_STAGE=	yes
-
-# Fix pkgconfig location
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.am" -type f | \
-		${XARGS} ${REINPLACE_CMD} -e \
-		's|[(]libdir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g'
+	@${FIND} ${WRKSRC} -type f -name configure.ac | \
+		${XARGS} ${REINPLACE_CMD} '/AM_C_PROTOTYPES/d'

 pre-configure:
 	@(cd ${CONFIGURE_WRKSRC} && ${SETENV} ${AUTOTOOLS_ENV} \
 		${AUTORECONF} -f -i)

 regression-test:
-	@cd ${WRKSRC} && ${MAKE} check
+	@(cd ${WRKSRC} && ${MAKE_CMD} check)

 .include <bsd.port.mk>
--- a/lang/kroc/files/patch-runtimelibkrocifconfigure.ac
+++ b/lang/kroc/files/patch-runtimelibkrocifconfigure.ac
@ -1,10 +0,0 @@
--- ./runtime/libkrocif/configure.ac.orig	2012-08-25 14:22:17.000000000 +0100
-+++ ./runtime/libkrocif/configure.ac	2012-08-25 14:22:26.000000000 +0100
-@@ -12,7 +12,6 @@
- AC_PROG_MAKE_SET
- AC_CHECK_TOOL(LD,ld)
- 
-AM_C_PROTOTYPES
- AC_CHECK_HEADERS(stdlib.h string.h strings.h sys/ioctl.h sys/time.h sys/types.h sys/uio.h time.h unistd.h)
- 
- AC_ARG_ENABLE([mobiles], AS_HELP_STRING([--disable-mobiles],[disable MOBILE data types (default enabled)]), [enable_mobiles=$enableval], [enable_mobiles=yes])
--- a/lang/kroc/files/patch-toolsilibrconfigure.ac
+++ b/lang/kroc/files/patch-toolsilibrconfigure.ac
@ -1,11 +0,0 @@
--- ./tools/ilibr/configure.ac.orig	2012-08-25 14:22:26.000000000 +0100
-+++ ./tools/ilibr/configure.ac	2012-08-25 14:22:30.000000000 +0100
-@@ -10,8 +10,6 @@
- AC_PROG_MAKE_SET
- AC_PROG_RANLIB
- 
-AM_C_PROTOTYPES
-
- AC_DEFINE(HOST_OS_IS_UNIX,1,[define if host OS is UNIX])
- 
- dnl Checks for header files.
--- a/lang/kroc/files/patch-toolsmkoccdepsconfigure.ac
+++ b/lang/kroc/files/patch-toolsmkoccdepsconfigure.ac
@ -1,11 +0,0 @@
--- ./tools/mkoccdeps/configure.ac.orig	2012-08-25 14:22:34.000000000 +0100
-+++ ./tools/mkoccdeps/configure.ac	2012-08-25 14:22:38.000000000 +0100
-@@ -9,8 +9,6 @@
- AM_PROG_CC_STDC
- AC_PROG_MAKE_SET
- 
-AM_C_PROTOTYPES
-
- dnl Checks for libraries.
- 
- dnl Checks for header files.
--- a/lang/kroc/files/patch-toolsocc21configure.ac
+++ b/lang/kroc/files/patch-toolsocc21configure.ac
@ -1,12 +0,0 @@
--- ./tools/occ21/configure.ac.orig	2012-08-25 14:22:30.000000000 +0100
-+++ ./tools/occ21/configure.ac	2012-08-25 14:22:34.000000000 +0100
-@@ -13,9 +13,6 @@
- dnl AC_PROG_RANLIB
- AC_CHECK_TOOL(RANLIB,ranlib,:)
- 
-
-AM_C_PROTOTYPES
-
- target_cpu_=target_cpu_`echo $target_cpu | tr -d _.`
- ARCH_DEFS="-D${target_cpu_}"
- 
--- a/lang/kroc/files/patch-toolstranx86configure.ac
+++ b/lang/kroc/files/patch-toolstranx86configure.ac
@ -1,11 +0,0 @@
--- ./tools/tranx86/configure.ac.orig	2012-08-25 14:22:38.000000000 +0100
-+++ ./tools/tranx86/configure.ac	2012-08-25 14:22:45.000000000 +0100
-@@ -149,8 +149,6 @@
-  AC_DEFINE_UNQUOTED([GNUASFLAGS],"$GNUASFLAGS",[extra flags for GNU assembler])
- fi
- 
-AM_C_PROTOTYPES
-
- dnl Checks for libraries.
- 
- dnl Checks for header files.
--- a/lang/kroc/pkg-plist
+++ b/lang/kroc/pkg-plist
@ -306,6 +306,22 @@ lib/liboccam_ttyutil.so
 lib/liboccam_useful.a
 lib/liboccam_useful.so
 libdata/pkgconfig/ccsp-1.6.pc
+man/man1/kmakef.1.gz
+man/man1/kroc.1.gz 
+man/man1/mkoccdeps.1.gz 
+man/man1/occ21.1.gz 
+man/man1/occamdoc.1.gz 
+man/man3/libconvert-inmos.3.gz
+man/man3/libcourse-cycles.3.gz
+man/man3/libcourse-nets.3.gz
+man/man3/libcourse-utils.3.gz
+man/man3/libfile.3.gz
+man/man3/libhostio-inmos.3.gz
+man/man3/libmath-inmos.3.gz
+man/man3/libproc.3.gz
+man/man3/libsock.3.gz
+man/man3/libstreamio-inmos.3.gz
+man/man3/libstring-inmos.3.gz
 share/aclocal/kroc.m4
 share/aclocal/occam-mysql.m4
 share/aclocal/occam-opengl.m4
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@ -3,7 +3,7 @@

 PORTNAME=	smalltalk
 PORTVERSION=	3.2.5
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	lang
 MASTER_SITES=	GNU

@ -24,11 +24,9 @@ TK_CONFIGURE_WITH=tcl=${LOCALBASE}/lib/tcl8.4 tk=${LOCALBASE}/lib/tk8.4
 PGSQL_USE=	PGSQL=yes
 SDL_USE=	SDL=image,mixer,sdl,sound,ttf

-USE_AUTOTOOLS=	libtool
+USES=		gmake iconv libtool pkgconfig shebangfix tar:xz
 USE_GNOME=	pango
-USES=		shebangfix pkgconfig iconv gmake
 USE_SQLITE=	yes
-USE_XZ=		yes
 USE_XORG=	ice xi xmu
 USE_GL=		gl glut
 GNU_CONFIGURE=	yes
@ -51,18 +49,11 @@ INFO=		gst gst-base gst-libs
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib

-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Fails to install on sparc64
-.endif
+BROKEN_sparc64=	Fails to install on sparc64

 post-patch:
-	@${REINPLACE_CMD} -e 's|echo aout|echo elf|g' \
-		-e 's/ia64-\*-\* /&|amd64-*-* /' \
+	@${REINPLACE_CMD} -e 's/ia64-\*-\* /&|amd64-*-* /' \
 		${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's/x86_64-\*-freebsd\* /&| amd64-*-freebsd* / ' \
-		${WRKSRC}/libffi/configure
 	@${REINPLACE_CMD} -e 's/lrintl (truncl/lroundl (truncl/' \
 		${WRKSRC}/libgst/prims.def \
 		${WRKSRC}/libgst/prims.inl
@ -80,4 +71,4 @@ post-install:
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/smalltalk/*.so
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst.so

-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
--- a/lang/smalltalk/pkg-plist
+++ b/lang/smalltalk/pkg-plist
@ -13,52 +13,41 @@ bin/gst-sunit
 include/gst.h
 include/gstpub.h
 lib/libgst.a
-lib/libgst.la
 lib/libgst.so
-lib/libgst.so.8
+lib/libgst.so.7
+lib/libgst.so.7.1.3
 %%TK%%lib/smalltalk/blox-tk-%%VERSION%%.so
 %%TK%%lib/smalltalk/blox-tk.a
-%%TK%%lib/smalltalk/blox-tk.la
 %%TK%%lib/smalltalk/blox-tk.so
 lib/smalltalk/dbd-sqlite3-%%VERSION%%.so
 lib/smalltalk/dbd-sqlite3.a
-lib/smalltalk/dbd-sqlite3.la
 lib/smalltalk/dbd-sqlite3.so
 lib/smalltalk/digest-%%VERSION%%.so
 lib/smalltalk/digest.a
-lib/smalltalk/digest.la
 lib/smalltalk/digest.so
 lib/smalltalk/expat-%%VERSION%%.so
 lib/smalltalk/expat.a
-lib/smalltalk/expat.la
 lib/smalltalk/expat.so
 lib/smalltalk/gdbm-%%VERSION%%.so
 lib/smalltalk/gdbm.a
-lib/smalltalk/gdbm.la
 lib/smalltalk/gdbm.so
 lib/smalltalk/gstglut-%%VERSION%%.so
 lib/smalltalk/gstglut.a
-lib/smalltalk/gstglut.la
 lib/smalltalk/gstglut.so
 lib/smalltalk/gstopengl-%%VERSION%%.so
 lib/smalltalk/gstopengl.a
-lib/smalltalk/gstopengl.la
 lib/smalltalk/gstopengl.so
 lib/smalltalk/i18n-%%VERSION%%.so
 lib/smalltalk/i18n.a
-lib/smalltalk/i18n.la
 lib/smalltalk/i18n.so
 lib/smalltalk/iconv-%%VERSION%%.so
 lib/smalltalk/iconv.a
-lib/smalltalk/iconv.la
 lib/smalltalk/iconv.so
 lib/smalltalk/sdl-%%VERSION%%.so
 lib/smalltalk/sdl.a
-lib/smalltalk/sdl.la
 lib/smalltalk/sdl.so
 lib/smalltalk/zlib-%%VERSION%%.so
 lib/smalltalk/zlib.a
-lib/smalltalk/zlib.la
 lib/smalltalk/zlib.so
 libexec/smalltalk/gnutls-wrapper
 libexec/smalltalk/vfs/deb