Fix build with new glib.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13252 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 294 insertions, 0 deletions

diff --git a/audio/audacity-devel/Makefile b/audio/audacity-devel/Makefile
new file mode 100644
index 000000000..5fdb9a726
--- /dev/null
+++ b/audio/audacity-devel/Makefile
@@ -0,0 +1,107 @@
+# New ports collection makefile for:	audacity-devel
+# Date created:				14 Sep 2006
+# Whom:					Jackson Low <xxjack12xx@gmail.com>
+#
+# $FreeBSD: ports/audio/audacity-devel/Makefile,v 1.37 2009/10/22 08:36:03 wen Exp $
+
+PORTNAME=	audacity
+PORTVERSION=	1.3.9
+PORTREVISION=	2
+CATEGORIES=	audio
+MASTER_SITES=	${MASTER_SITE_GOOGLE_CODE} \
+		SF/${PORTNAME}/${PORTNAME}-unstable/${PORTVERSION}
+PKGNAMESUFFIX=	-devel
+DISTNAME=	${PORTNAME}-minsrc-${PORTVERSION}
+
+MAINTAINER=	xxjack12xx@gmail.com
+COMMENT=	Audacity is a GUI editor for digital audio waveforms
+
+LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
+
+CONFLICTS=	audacity-[0-9]*
+
+WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}
+
+GNU_CONFIGURE=	yes
+USE_GMAKE=	yes
+USE_GCC=	4.2+
+USE_GETTEXT=	yes
+USE_BZIP2=	yes
+USE_WX=		2.8
+MAKE_JOBS_SAFE=	yes
+WX_COMPS=	wx
+PORTDOCS=	README.txt LICENSE.txt
+
+MAN1=		audacity.1
+MANCOMPRESSED=	yes
+
+OPTIONS=	VORBIS		"Use libvorbis for Ogg Vorbis support"	on \
+		MAD		"Use libmad for mp2/3 decoding support"	on \
+		FLAC		"Use libFLAC for FLAC support" on \
+		ID3TAG		"Use libid3tag for mp3 id3 tag support" on \
+		SAMPLERATE	"Use libresample for sample rate conversion" on \
+		SBSMS		"Use libsbsms for pitch and tempo changing" on \
+		SOUNDTOUCH 	"Use libSoundTouch for pitch and tempo changing" on\
+		TWOLAME		"Use libtwolame for MP2 export support" on \
+		FFMPEG		"Use ffmpeg for import and export support" on \
+		MIDI		"Use portSMF for Midi support" on
+
+.include <bsd.port.pre.mk>
+
+.if ${ARCH} == "i386"
+SSE_CFLAGS=	-mno-sse -mno-sse2
+.endif
+
+CONFIGURE_ARG+=	--destdir=/
+CONFIGURE_ENV+=	LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
+		CPPFLAGS="${CPPFLAGS} -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
+		CFLAGS="${CFLAGS} -I${WRKSRC}/lib-src/portaudio-v19/include -I${LOCALBASE}/include ${SSE_CFLAGS} ${PTHREAD_CFLAGS}" \
+		WX_CONFIG=${WX_CONFIG}
+
+.if !defined(NOPORTDOCS)
+MAKE_ENV=	DOC=yes
+.endif
+
+CONFIGURE_ARGS+=	--enable-unicode=no
+
+.if defined(WITH_VORBIS)
+CONFIGURE_ARGS+=	--with-libvorbis
+.endif
+
+.if defined(WITH_MAD)
+CONFIGURE_ARGS+=	--with-libmad
+.endif
+
+.if defined(WITH_FLAC)
+CONFIGURE_ARGS+=	--with-libflac
+.endif
+
+.if defined(WITH_ID3TAG)
+CONFIGURE_ARGS+=	--with-libid3tag
+.endif
+
+.if defined(WITH_SAMPLERATE)
+CONFIGURE_ARGS+=	--with-libresample
+.endif
+
+.if defined(WITH_SBSMS)
+CONFIGURE_ARGS+=	--with-sbsms
+.endif
+
+.if defined(WITH_SOUNDTOUCH)
+CONFIGURE_ARGS+=	--with-soundtouch
+.endif
+
+.if defined(WITH_TWOLAME)
+CONFIGURE_ARGS+=	--with-libtwolame
+.endif
+
+.if defined(WITH_FFMPEG)
+CONFIGURE_ARGS+=	--with-ffmpeg
+.endif
+
+.if defined(WITH_MIDI)
+CONFIGURE_ARGS+=	--with-midi
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/audacity-devel/distinfo b/audio/audacity-devel/distinfo
new file mode 100644
index 000000000..6347a625b
--- /dev/null
+++ b/audio/audacity-devel/distinfo
@@ -0,0 +1,3 @@
+MD5 (audacity-minsrc-1.3.9.tar.bz2) = 0f2bc8971c6e2c4d39457c28aea16b5c
+SHA256 (audacity-minsrc-1.3.9.tar.bz2) = f47afe8dcf38165d3550160eb7e94694119f5da563674060a93c5bc66e2fa012
+SIZE (audacity-minsrc-1.3.9.tar.bz2) = 6719955
diff --git a/audio/audacity-devel/files/patch-Makefile.in b/audio/audacity-devel/files/patch-Makefile.in
new file mode 100644
index 000000000..095ebee8b
--- /dev/null
+++ b/audio/audacity-devel/files/patch-Makefile.in
@@ -0,0 +1,16 @@
+--- Makefile.in	2008-06-25 09:55:22.000000000 -0300
++++ Makefile.in.new	2008-06-25 09:58:26.000000000 -0300
+@@ -31,11 +31,12 @@
+ 	$(INSTALL) -m 755 audacity $(DESTDIR)$(BINDIR)/$(AUDACITY_NAME)
+ 
+ 	# install docs
++ifeq ($(DOC),yes)
+ 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)
+ 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
+ 	$(INSTALL) -m 644 README.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/README.txt
+ 	$(INSTALL) -m 644 LICENSE.txt $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)/LICENSE.txt
+-
++endif
+ 	# install manpage
+ 	$(INSTALL) -d $(DESTDIR)$(MANDIR)/man1
+ 	-test -f help/audacity.1.gz && \
diff --git a/audio/audacity-devel/files/patch-cext.h b/audio/audacity-devel/files/patch-cext.h
new file mode 100644
index 000000000..b6da23fd2
--- /dev/null
+++ b/audio/audacity-devel/files/patch-cext.h
@@ -0,0 +1,12 @@
+--- lib-src/libnyquist/nyquist/cmt/cext.h       2009-07-15 20:27:36.000000000 -0700
++++ lib-src/libnyquist/nyquist/cmt/cext.hcext.h 2009-07-19 00:37:45.000000000 -0700
+
+@@ -58,7 +58,7 @@
+ #include <malloc.h>
+ #endif
+
+-#if NEED_ULONG
++#if NEED_ULONG || __FreeBSD__
+ typedef unsigned long ulong;
+ #endif
+
diff --git a/audio/audacity-devel/files/patch-src_AudacityApp.cpp b/audio/audacity-devel/files/patch-src_AudacityApp.cpp
new file mode 100644
index 000000000..8026532a2
--- /dev/null
+++ b/audio/audacity-devel/files/patch-src_AudacityApp.cpp
@@ -0,0 +1,30 @@
+--- src/AudacityApp.cpp.orig	2009-11-27 00:27:29.000000000 +0100
++++ src/AudacityApp.cpp	2009-11-27 00:48:36.000000000 +0100
+@@ -23,6 +23,15 @@ It handles initialization and terminatio
+ 
+ #include "Audacity.h" // This should always be included first
+ 
++/*
++ * Get Gtk.h and Glib.h included and working around that glib got
++ * a GSocket class now 
++ */
++#include <dlfcn.h>
++#define GSocket GlibGSocket
++#include <gtk/gtk.h>
++#undef GSocket
++
+ #include <wx/defs.h>
+ #include <wx/app.h>
+ #include <wx/docview.h>
+@@ -328,8 +337,11 @@ void QuitAudacity()
+ // Most of this was taken from nsNativeAppSupportUnix.cpp from Mozilla.
+ ///////////////////////////////////////////////////////////////////////////////
+ 
++/* moved up so it doesn't undefs GSocket from wxgtk */
++/*
+ #include <dlfcn.h>
+ #include <gtk/gtk.h>
++*/
+ 
+ typedef struct _GnomeProgram GnomeProgram;
+ typedef struct _GnomeModuleInfo GnomeModuleInfo;
diff --git a/audio/audacity-devel/files/patch-xlisp.h b/audio/audacity-devel/files/patch-xlisp.h
new file mode 100644
index 000000000..08478e98a
--- /dev/null
+++ b/audio/audacity-devel/files/patch-xlisp.h
@@ -0,0 +1,19 @@
+--- lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-15 20:27:36.000000000 -0700
++++ lib-src/libnyquist/nyquist/xlisp/xlisp.h    2009-07-19 00:24:11.000000000 -0700
+@@ -152,6 +152,15 @@
+ #endif
+ #endif
+
++/* FreeBSD */
++#ifdef __FreeBSD__
++#if __BYTE_ORDER == __LITTLE_ENDIAN
++#define XL_LITTLE_ENDIAN
++#else
++#define XL_BIG_ENDIAN
++#endif
++#endif
++
+ /* Apple CC */
+ #ifdef __APPLE__
+ #define NNODES 2000
+
diff --git a/audio/audacity-devel/pkg-descr b/audio/audacity-devel/pkg-descr
new file mode 100644
index 000000000..db2bf8320
--- /dev/null
+++ b/audio/audacity-devel/pkg-descr
@@ -0,0 +1,12 @@
+Audacity is a program that lets you manipulate digital audio
+waveforms. In addition to letting you record sounds directly from
+within the program, it imports many sound file formats, including
+WAV, AIFF, AU, IRCAM, MP3, and Ogg Vorbis. It supports all
+common editing operations such as Cut, Copy, and Paste, plus it will
+mix tracks and let you apply plug-in effects to any part of a sound. It
+also has a built-in amplitude envelope editor, a customizable
+spectrogram mode and a frequency analysis window for audio
+analysis applications. 
+
+Author: Dominic Mazzoni dominic@minorninth.com
+WWW: http://audacity.sourceforge.net
diff --git a/audio/audacity-devel/pkg-plist b/audio/audacity-devel/pkg-plist
new file mode 100644
index 000000000..1de42bbd7
--- /dev/null
+++ b/audio/audacity-devel/pkg-plist
@@ -0,0 +1,95 @@
+bin/audacity
+share/applications/audacity.desktop
+%%DATADIR%%/audacity.xpm
+%%DATADIR%%/nyquist/bug.lsp
+%%DATADIR%%/nyquist/dspprims.lsp
+%%DATADIR%%/nyquist/envelopes.lsp
+%%DATADIR%%/nyquist/equalizer.lsp
+%%DATADIR%%/nyquist/evalenv.lsp
+%%DATADIR%%/nyquist/fileio.lsp
+%%DATADIR%%/nyquist/follow.lsp
+%%DATADIR%%/nyquist/init.lsp
+%%DATADIR%%/nyquist/misc.lsp
+%%DATADIR%%/nyquist/nyinit.lsp
+%%DATADIR%%/nyquist/nyqmisc.lsp
+%%DATADIR%%/nyquist/nyquist.lsp
+%%DATADIR%%/nyquist/printrec.lsp
+%%DATADIR%%/nyquist/profile.lsp
+%%DATADIR%%/nyquist/sal-parse.lsp
+%%DATADIR%%/nyquist/sal.lsp
+%%DATADIR%%/nyquist/seq.lsp
+%%DATADIR%%/nyquist/seqfnint.lsp
+%%DATADIR%%/nyquist/seqmidi.lsp
+%%DATADIR%%/nyquist/sndfnint.lsp
+%%DATADIR%%/nyquist/stk.lsp
+%%DATADIR%%/nyquist/system.lsp
+%%DATADIR%%/nyquist/xlinit.lsp
+%%DATADIR%%/nyquist/xm.lsp
+%%DATADIR%%/plug-ins/SilenceMarker.ny
+%%DATADIR%%/plug-ins/beat.ny
+%%DATADIR%%/plug-ins/clicktrack.ny
+%%DATADIR%%/plug-ins/clipfix.ny
+%%DATADIR%%/plug-ins/crossfadein.ny
+%%DATADIR%%/plug-ins/crossfadeout.ny
+%%DATADIR%%/plug-ins/delay.ny
+%%DATADIR%%/plug-ins/equalabel.ny
+%%DATADIR%%/plug-ins/highpass.ny
+%%DATADIR%%/plug-ins/lowpass.ny
+%%DATADIR%%/plug-ins/pluck.ny
+%%DATADIR%%/plug-ins/rissetdrum.ny
+%%DATADIR%%/plug-ins/tremolo.ny
+%%DATADIR%%/plug-ins/vocalremover.ny
+%%DATADIR%%/plug-ins/vocoder.ny
+share/locale/af/LC_MESSAGES/audacity.mo
+share/locale/ar/LC_MESSAGES/audacity.mo
+share/locale/bg/LC_MESSAGES/audacity.mo
+share/locale/bn/LC_MESSAGES/audacity.mo
+share/locale/bs/LC_MESSAGES/audacity.mo
+share/locale/ca/LC_MESSAGES/audacity.mo
+share/locale/ca@valencia/LC_MESSAGES/audacity.mo
+share/locale/cs/LC_MESSAGES/audacity.mo
+share/locale/cy/LC_MESSAGES/audacity.mo
+share/locale/da/LC_MESSAGES/audacity.mo
+share/locale/de/LC_MESSAGES/audacity.mo
+share/locale/el/LC_MESSAGES/audacity.mo
+share/locale/es/LC_MESSAGES/audacity.mo
+share/locale/eu/LC_MESSAGES/audacity.mo
+share/locale/fa/LC_MESSAGES/audacity.mo
+share/locale/fi/LC_MESSAGES/audacity.mo
+share/locale/fr/LC_MESSAGES/audacity.mo
+share/locale/ga/LC_MESSAGES/audacity.mo
+share/locale/gl/LC_MESSAGES/audacity.mo
+share/locale/he/LC_MESSAGES/audacity.mo
+share/locale/hu/LC_MESSAGES/audacity.mo
+share/locale/id/LC_MESSAGES/audacity.mo
+share/locale/it/LC_MESSAGES/audacity.mo
+share/locale/ja/LC_MESSAGES/audacity.mo
+share/locale/ka/LC_MESSAGES/audacity.mo
+share/locale/km/LC_MESSAGES/audacity.mo
+share/locale/ko/LC_MESSAGES/audacity.mo
+share/locale/lt/LC_MESSAGES/audacity.mo
+share/locale/mk/LC_MESSAGES/audacity.mo
+share/locale/nb/LC_MESSAGES/audacity.mo
+share/locale/nl/LC_MESSAGES/audacity.mo
+share/locale/oc/LC_MESSAGES/audacity.mo
+share/locale/pl/LC_MESSAGES/audacity.mo
+share/locale/pt/LC_MESSAGES/audacity.mo
+share/locale/pt_BR/LC_MESSAGES/audacity.mo
+share/locale/ro/LC_MESSAGES/audacity.mo
+share/locale/ru/LC_MESSAGES/audacity.mo
+share/locale/sk/LC_MESSAGES/audacity.mo
+share/locale/sl/LC_MESSAGES/audacity.mo
+share/locale/sv/LC_MESSAGES/audacity.mo
+share/locale/tg/LC_MESSAGES/audacity.mo
+share/locale/tr/LC_MESSAGES/audacity.mo
+share/locale/uk/LC_MESSAGES/audacity.mo
+share/locale/vi/LC_MESSAGES/audacity.mo
+share/locale/zh/LC_MESSAGES/audacity.mo
+share/locale/zh_TW/LC_MESSAGES/audacity.mo
+share/mime/packages/audacity.xml
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrm share/audacity/plug-ins
+@dirrm share/audacity/nyquist
+@dirrm share/audacity
+@dirrm share/applications