4 files changed, 26 insertions, 37 deletions

diff --git a/audio/ghostess/Makefile b/audio/ghostess/Makefile
index abf69e87df74..f05016bbf770 100644
--- a/audio/ghostess/Makefile
+++ b/audio/ghostess/Makefile
@@ -6,30 +6,37 @@
 #
 
 PORTNAME=	ghostess
-PORTVERSION=	20081213
-PORTREVISION=	4
+PORTVERSION=	20100923
 CATEGORIES=	audio
 MASTER_SITES=	http://www.smbolton.com/linux/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Graphical DSSI host with JACK MIDI support
 
-LIB_DEPENDS=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \
-		lo.7:${PORTSDIR}/audio/liblo \
-		jack.0:${PORTSDIR}/audio/jack
 BUILD_DEPENDS=	${LOCALBASE}/include/dssi.h:${PORTSDIR}/audio/dssi \
+		${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa \
 		jackit>=0.109.2:${PORTSDIR}/audio/jack
-
 # Between 0.109.0 and earlier versions there was an api change in JACK.
 # However, the library version number was not changed.  The line above
 # is supposed to work around that.
+LIB_DEPENDS=	dssialsacompat.0:${PORTSDIR}/audio/libdssialsacompat \
+		lo.7:${PORTSDIR}/audio/liblo \
+		jack.0:${PORTSDIR}/audio/jack
+
+LICENSE=	GPLv2 BSD
+LICENSE_COMB=	multi
 
+USE_BZIP2=	yes
+USE_GNOME=	gtk20
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	LDFLAGS="${LDFLAGS}"
 CONFIGURE_ARGS=	--with-jackmidi
-USE_GMAKE=	yes
-USE_GNOME=	gtk20
-USE_BZIP2=	yes
 
+MAN1=		ghostess.1
 PLIST_FILES=	bin/ghostess bin/ghostess_universal_gui
 
+CPPFLAGS=	-I${LOCALBASE}/include
+LDFLAGS=	-L${LOCALBASE}/lib
+
 .include <bsd.port.mk>
diff --git a/audio/ghostess/distinfo b/audio/ghostess/distinfo
index 397992fb26b0..0e92558d98fe 100644
--- a/audio/ghostess/distinfo
+++ b/audio/ghostess/distinfo
@@ -1,2 +1,2 @@
-SHA256 (ghostess-20081213.tar.bz2) = a9ab39710e00a1ff691b3d4fd070fa231081a1b449685e899d81ac4105593956
-SIZE (ghostess-20081213.tar.bz2) = 264977
+SHA256 (ghostess-20100923.tar.bz2) = b0d0fcdee7c865f7bc40b95ad2d10c8e472e77bdecd52142d8c4bc520f317814
+SIZE (ghostess-20100923.tar.bz2) = 297777
diff --git a/audio/ghostess/files/patch-configure b/audio/ghostess/files/patch-configure
index c817f0f836fa..9c43c59d92c6 100644
--- a/audio/ghostess/files/patch-configure
+++ b/audio/ghostess/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2008-12-14 01:50:58.000000000 +0100
-+++ configure	2009-01-11 15:27:38.000000000 +0100
-@@ -11766,15 +11766,9 @@
+--- configure.orig	2010-09-24 02:36:53.000000000 +0900
++++ configure	2011-03-14 08:06:46.000000000 +0900
+@@ -10932,10 +10932,10 @@
  
  
  case "${host_os}" in
@@ -8,12 +8,8 @@
 +darwin* | freebsd*)
    darwin=yes
  
--cat >>confdefs.h <<\_ACEOF
--#define MIDI_COREMIDI 1
--_ACEOF
--
--
--
- if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
- 	if test -n "$ac_tool_prefix"; then
-   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
+-$as_echo "#define MIDI_COREMIDI 1" >>confdefs.h
++
+ 
+ 
+ 
diff --git a/audio/ghostess/files/patch-src-universal_gui.c b/audio/ghostess/files/patch-src-universal_gui.c
deleted file mode 100644
index 73e12c46f212..000000000000
--- a/audio/ghostess/files/patch-src-universal_gui.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/universal_gui.c.orig	2009-01-11 15:40:04.000000000 +0100
-+++ src/universal_gui.c	2009-01-11 15:42:28.000000000 +0100
-@@ -610,8 +610,9 @@
-                                             (gpointer)port);
- 
-         /* update bounds */
--        gtk_adjustment_set_lower(GTK_ADJUSTMENT(port_data[port].adjustment), plb);
--        gtk_adjustment_set_upper(GTK_ADJUSTMENT(port_data[port].adjustment), pub);
-+        GTK_ADJUSTMENT(port_data[port].adjustment)->lower = plb;
-+        GTK_ADJUSTMENT(port_data[port].adjustment)->upper = pub;
-+        gtk_adjustment_changed(GTK_ADJUSTMENT(port_data[port].adjustment));
- 
-         /* update labels */
-         if (port_data[port].bounded) {