10 files changed, 114 insertions, 66 deletions

diff --git a/audio/midimountain/Makefile b/audio/midimountain/Makefile
index a55626c95d34..974339866e05 100644
--- a/audio/midimountain/Makefile
+++ b/audio/midimountain/Makefile
@@ -7,19 +7,24 @@
 #
 
 PORTNAME=	midimountain
-PORTVERSION=	0.2.1
+PORTVERSION=	0.3.0
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		http://www.music-community.ch/midimountain/download/
+MASTER_SITES=	http://www.midimountain.com/download/ \
+		${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
-
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_GMAKE=	yes
 
+post-patch:
+.for file in midimountain.conf main.cpp
+	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/midimountain/${file}
+.endfor
+.for dir in pixmaps languages
+	${PERL} -pi -e "s, ${dir}/, ${DATADIR}/${dir}/,g" ${WRKSRC}/midimountain/${dir}/Makefile.in
+.endfor
+
 .include <bsd.port.mk>
diff --git a/audio/midimountain/distinfo b/audio/midimountain/distinfo
index 21f655efe556..205cc8135d78 100644
--- a/audio/midimountain/distinfo
+++ b/audio/midimountain/distinfo
@@ -1 +1 @@
-MD5 (midimountain-0.2.1-src.tar.gz) = d5d4e3672855fd8253d350cf64a8b9fc
+MD5 (midimountain-0.3.0.tar.gz) = 324007cc0d5ba94e816ac2cc8a87a3a0
diff --git a/audio/midimountain/files/patch-midimountain::Makefile.in b/audio/midimountain/files/patch-midimountain::Makefile.in
index dac7a8102a44..0ea85fa5c53a 100644
--- a/audio/midimountain/files/patch-midimountain::Makefile.in
+++ b/audio/midimountain/files/patch-midimountain::Makefile.in
@@ -1,13 +1,13 @@
---- midimountain/Makefile.in.orig	Wed Apr 11 10:16:40 2001
-+++ midimountain/Makefile.in	Thu Apr 19 11:32:23 2001
+--- midimountain/Makefile.in.orig	Mon Oct 29 11:28:06 2001
++++ midimountain/Makefile.in	Sat Dec 15 14:11:48 2001
 @@ -69,7 +69,7 @@
  ####### kdevelop will overwrite this part!!! (end)############
  bin_PROGRAMS = midimountain
- midimountain_SOURCES = mcPlayback.cpp mvcMidiDeviceOptions.cpp stlini.cpp mvcUserSnapProperties.cpp mvcPianoRoll.cpp mvcHeader.cpp mvcKeySignatureProperties.cpp mvcKeySignatureList.cpp mvcTimeSignatureProperties.cpp mvcTimeSignatureList.cpp mvcMarkerProperties.cpp mvcMarkerList.cpp mvcTrackProperties.cpp mvcSongProperties.cpp mvcEventProperties.cpp mvcEventList.cpp mvcMessageBox.cpp mvcMainView.cpp mvcMain.cpp mvcBase.cpp glade_support.cpp glade_interface.cpp glade_callbacks.cpp mcIO.cpp mcTrack.cpp mcSequence.cpp mcEvent.cpp mcBase.cpp main.cpp 
+ midimountain_SOURCES = mvcInputBox.cpp mvcMapperProperties.cpp stlini.cpp mvcUserSnapProperties.cpp mvcPianoRoll.cpp mvcHeader.cpp mvcKeySignatureProperties.cpp mvcKeySignatureList.cpp mvcTimeSignatureProperties.cpp mvcTimeSignatureList.cpp mvcMarkerProperties.cpp mvcMarkerList.cpp mvcTrackProperties.cpp mvcSongProperties.cpp mvcEventProperties.cpp mvcEventList.cpp mvcMessageBox.cpp mvcMainView.cpp mvcMain.cpp mvcBase.cpp glade_support.cpp glade_interface.cpp glade_callbacks.cpp mcDevice.cpp mcMapper.cpp mcOSSIO.cpp mcIO.cpp mcPlayback.cpp mcList.cpp mcTrack.cpp mcSequence.cpp mcEvent.cpp mcBase.cpp main.cpp 
 -midimountain_LDADD = -lglib -lgtk -lgdk
 +midimountain_LDADD = `${GTK_CONFIG} --libs`
  
- SUBDIRS = docs 
+ SUBDIRS = docs pixmaps languages 
  
 @@ -80,7 +80,7 @@
  PROGRAMS =  $(bin_PROGRAMS)
@@ -18,3 +18,12 @@
  CPPFLAGS = @CPPFLAGS@
  LDFLAGS = @LDFLAGS@
  LIBS = @LIBS@
+@@ -486,7 +486,7 @@
+ 
+ install-data-local:
+ 	$(mkinstalldirs) 
+-	$(INSTALL_DATA) midimountain.conf midimountain.conf
++	$(INSTALL_DATA) midimountain.conf ${PREFIX}/etc/midimountain.conf
+ 
+ uninstall-local:
+ 	-rm -f midimountain.conf
diff --git a/audio/midimountain/files/patch-midimountain::glade_interface.cpp b/audio/midimountain/files/patch-midimountain::glade_interface.cpp
index b4d7799c75d0..82ca6045a576 100644
--- a/audio/midimountain/files/patch-midimountain::glade_interface.cpp
+++ b/audio/midimountain/files/patch-midimountain::glade_interface.cpp
@@ -1,5 +1,5 @@
---- midimountain/glade_interface.cpp.orig	Wed Apr 11 10:19:44 2001
-+++ midimountain/glade_interface.cpp	Thu Apr 19 11:27:30 2001
+--- midimountain/glade_interface.cpp.orig	Mon Oct 29 10:42:25 2001
++++ midimountain/glade_interface.cpp	Sat Dec 15 13:59:02 2001
 @@ -10,6 +10,7 @@
  #include <sys/stat.h>
  #include <unistd.h>
@@ -8,10 +8,11 @@
  
  #include <gdk/gdkkeysyms.h>
  #include <gtk/gtk.h>
-@@ -18,6 +19,22 @@
+@@ -17,6 +18,22 @@
+ #include "glade_callbacks.h"
  #include "glade_interface.h"
- #include "glade_support.h"
- 
+ #include "../midimountain/glade_support.h"
++
 +void    gtk_widget_add_accelerator	(GtkWidget           *widget,
 +					const gchar		*accel_signal,
 +					GtkAccelGroup		*accel_group,
@@ -27,48 +28,6 @@
 +				   accel_mods,
 +				   (GtkAccelFlags)accel_flags);
 +}
-+
+ 
  GtkWidget*
  create_wndMain (void)
- {
-@@ -1788,7 +1805,7 @@
-   gtk_box_pack_start (GTK_BOX (hboMainViewHeader), scrMainViewHeader, TRUE, TRUE, 0);
-   gtk_widget_set_usize (scrMainViewHeader, 500, -2);
-   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrMainViewHeader), GTK_POLICY_NEVER, GTK_POLICY_NEVER);
--  gtk_range_set_update_policy (GTK_RANGE (GTK_SCROLLED_WINDOW (scrMainViewHeader)->hscrollbar), GTK_POLICY_AUTOMATIC);
-+  gtk_range_set_update_policy (GTK_RANGE (GTK_SCROLLED_WINDOW (scrMainViewHeader)->hscrollbar), GtkUpdateType(GTK_POLICY_AUTOMATIC));
- 
-   vpoMainViewHeader = gtk_viewport_new (NULL, NULL);
-   gtk_widget_set_name (vpoMainViewHeader, "vpoMainViewHeader");
-@@ -2545,7 +2562,7 @@
-   gtk_box_pack_end (GTK_BOX (hboViewController), cboPianoRollController, FALSE, FALSE, 0);
-   gtk_widget_set_usize (cboPianoRollController, 230, -2);
-   gtk_combo_set_value_in_list (GTK_COMBO (cboPianoRollController), TRUE, TRUE);
--  cboPianoRollController_items = g_list_append (cboPianoRollController_items, "");
-+  cboPianoRollController_items = g_list_append (cboPianoRollController_items, (void*)"");
-   gtk_combo_set_popdown_strings (GTK_COMBO (cboPianoRollController), cboPianoRollController_items);
-   g_list_free (cboPianoRollController_items);
- 
-@@ -5534,14 +5551,14 @@
-                     (GtkAttachOptions) (GTK_EXPAND | GTK_FILL),
-                     (GtkAttachOptions) (0), 0, 0);
-   gtk_combo_set_use_arrows_always (GTK_COMBO (cboDenominator), TRUE);
--  cboDenominator_items = g_list_append (cboDenominator_items, "1");
--  cboDenominator_items = g_list_append (cboDenominator_items, "2");
--  cboDenominator_items = g_list_append (cboDenominator_items, "4");
--  cboDenominator_items = g_list_append (cboDenominator_items, "8");
--  cboDenominator_items = g_list_append (cboDenominator_items, "16");
--  cboDenominator_items = g_list_append (cboDenominator_items, "32");
--  cboDenominator_items = g_list_append (cboDenominator_items, "64");
--  cboDenominator_items = g_list_append (cboDenominator_items, "128");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"1");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"2");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"4");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"8");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"16");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"32");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"64");
-+  cboDenominator_items = g_list_append (cboDenominator_items, (void*)"128");
-   gtk_combo_set_popdown_strings (GTK_COMBO (cboDenominator), cboDenominator_items);
-   g_list_free (cboDenominator_items);
- 
diff --git a/audio/midimountain/files/patch-midimountain::main.cpp b/audio/midimountain/files/patch-midimountain::main.cpp
new file mode 100644
index 000000000000..8ed794a1d6c6
--- /dev/null
+++ b/audio/midimountain/files/patch-midimountain::main.cpp
@@ -0,0 +1,16 @@
+--- midimountain/main.cpp.orig	Sat Dec 15 14:45:48 2001
++++ midimountain/main.cpp	Sat Dec 15 14:46:50 2001
+@@ -30,11 +30,11 @@
+   }
+   else
+   {
+-    fp = fopen( "./midimountain.conf", "r");
++    fp = fopen( "%%PREFIX%%/etc/midimountain.conf", "r");
+     if ( fp != 0 )
+     {
+       fclose( fp );
+-    	mvcMain = new TMvcMain( "./midimountain.conf" );
++    	mvcMain = new TMvcMain( "%%PREFIX%%/etc/midimountain.conf" );
+     }
+     else
+     {
diff --git a/audio/midimountain/files/patch-midimountain::mcIO.cpp b/audio/midimountain/files/patch-midimountain::mcIO.cpp
index 5266b4eaf4a0..a50e6a7b080e 100644
--- a/audio/midimountain/files/patch-midimountain::mcIO.cpp
+++ b/audio/midimountain/files/patch-midimountain::mcIO.cpp
@@ -9,9 +9,3 @@
  #include <unistd.h>
  #include <sys/ioctl.h>
  #include <fcntl.h>
-@@ -626,4 +626,4 @@
-    }
- 
-    ::write(getFd(), synth_write_message, sizeof(synth_write_message));
--}
-+}
diff --git a/audio/midimountain/files/patch-midimountain::mcOSSIO.cpp b/audio/midimountain/files/patch-midimountain::mcOSSIO.cpp
new file mode 100644
index 000000000000..812107ac5e51
--- /dev/null
+++ b/audio/midimountain/files/patch-midimountain::mcOSSIO.cpp
@@ -0,0 +1,11 @@
+--- midimountain/mcOSSIO.cpp.orig	Sat Dec 15 14:03:49 2001
++++ midimountain/mcOSSIO.cpp	Sat Dec 15 14:03:56 2001
+@@ -1,7 +1,7 @@
+ //=============================================================================
+ // implementation class midi IO
+ //=============================================================================
+-#include <linux/soundcard.h>
++#include <sys/soundcard.h>
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
diff --git a/audio/midimountain/files/patch-midimountain::midimountain.conf b/audio/midimountain/files/patch-midimountain::midimountain.conf
new file mode 100644
index 000000000000..22cb43d5f914
--- /dev/null
+++ b/audio/midimountain/files/patch-midimountain::midimountain.conf
@@ -0,0 +1,12 @@
+--- midimountain/midimountain.conf.orig	Sat Dec 15 14:26:54 2001
++++ midimountain/midimountain.conf	Sat Dec 15 14:28:30 2001
+@@ -1,7 +1,7 @@
+ 
+ [General]
+-Languages=./languages
+-Pixmaps=./pixmaps
++Languages=%%PREFIX%%/share/midimountain/languages
++Pixmaps=%%PREFIX%%/share/midimountain/pixmaps
+ 
+ [Device Mapping]
+ PresetCount=0
diff --git a/audio/midimountain/pkg-descr b/audio/midimountain/pkg-descr
index 2f369f504745..b9e2f8f3591e 100644
--- a/audio/midimountain/pkg-descr
+++ b/audio/midimountain/pkg-descr
@@ -7,4 +7,4 @@ protocol.
 From easy piano roll editing to changing binary system exclusive messages,
 MidiMountain is complete and usable for every midi user.
 
-WWW: http://www.music-community.ch/midimountain/
+WWW: http://www.midimountain.com/
diff --git a/audio/midimountain/pkg-plist b/audio/midimountain/pkg-plist
index 8a44e3514b5c..64bf3c0009ac 100644
--- a/audio/midimountain/pkg-plist
+++ b/audio/midimountain/pkg-plist
@@ -1 +1,43 @@
 bin/midimountain
+etc/midimountain.conf
+share/midimountain/languages/midimountain_de.lang
+share/midimountain/languages/midimountain_en.lang
+share/midimountain/languages/midimountain_fr.lang
+share/midimountain/pixmaps/EditAdd.xpm
+share/midimountain/pixmaps/EditCheck.xpm
+share/midimountain/pixmaps/EditCopy.xpm
+share/midimountain/pixmaps/EditCut.xpm
+share/midimountain/pixmaps/EditDelete.xpm
+share/midimountain/pixmaps/EditPaste.xpm
+share/midimountain/pixmaps/EditProperties.xpm
+share/midimountain/pixmaps/EditRedo.xpm
+share/midimountain/pixmaps/EditSearch.xpm
+share/midimountain/pixmaps/EditUndo.xpm
+share/midimountain/pixmaps/FileClose.xpm
+share/midimountain/pixmaps/FileExit.xpm
+share/midimountain/pixmaps/FileNew.xpm
+share/midimountain/pixmaps/FileOpen.xpm
+share/midimountain/pixmaps/FilePrint.xpm
+share/midimountain/pixmaps/FileSave.xpm
+share/midimountain/pixmaps/MenuController.xpm
+share/midimountain/pixmaps/MenuEventList.xpm
+share/midimountain/pixmaps/MenuMain.xpm
+share/midimountain/pixmaps/MenuPianoRoll.xpm
+share/midimountain/pixmaps/MenuSequence.xpm
+share/midimountain/pixmaps/MenuStaff.xpm
+share/midimountain/pixmaps/MenuVelocity.xpm
+share/midimountain/pixmaps/PlayEnd.xpm
+share/midimountain/pixmaps/PlayRecord.xpm
+share/midimountain/pixmaps/PlayStart.xpm
+share/midimountain/pixmaps/PlayStop.xpm
+share/midimountain/pixmaps/PlayTop.xpm
+share/midimountain/pixmaps/midimountain.xpm
+share/midimountain/pixmaps/note_1_1.xpm
+share/midimountain/pixmaps/note_1_16.xpm
+share/midimountain/pixmaps/note_1_2.xpm
+share/midimountain/pixmaps/note_1_32.xpm
+share/midimountain/pixmaps/note_1_4.xpm
+share/midimountain/pixmaps/note_1_8.xpm
+@dirrm share/midimountain/languages
+@dirrm share/midimountain/pixmaps
+@dirrm share/midimountain