3 files changed, 27 insertions, 99 deletions

diff --git a/audio/soundtracker/Makefile b/audio/soundtracker/Makefile
index 00b842b1ffac..3c536d1418e7 100644
--- a/audio/soundtracker/Makefile
+++ b/audio/soundtracker/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	soundtracker
 PORTVERSION=	0.6.8
+PORTREVISION=	1
 CATEGORIES=	audio gnome
 MASTER_SITES=	http://www.soundtracker.org/dl/%SUBDIR%/
 MASTER_SITE_SUBDIR=	v${PORTVERSION:R}
@@ -17,22 +18,30 @@ COMMENT=	Mod player/tracking tool which supports XM and MOD formats
 LIB_DEPENDS=	sndfile.1:${PORTSDIR}/audio/libsndfile
 
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
 USE_GNOME=	esound gdkpixbuf gnomehack gnometarget
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+OPTIONS=	GNOME "use GNOME 1.x (enables envelope editors)" off \
+		I386_ASM "i386 asm optimizations (potentially unstable)" off \
+		JACK "JACK support" off \
+		SDL "SDL support" off
+
+DESKTOP_ENTRIES="SoundTracker" \
+		"Compose music" \
+		"soundtracker.xpm" \
+		"soundtracker" \
+		"" \
+		false
+
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "i386" || defined(WITHOUT_X86_ASM)
-CONFIGURE_ARGS+=	--disable-asm
-.else
+.if ${ARCH} == "i386" && defined(WITH_I386_ASM)
 CONFIGURE_ARGS+=	--enable-asm
 .endif
 
-.if ${HAVE_GNOME:Mgnomelibs}!=""
-PKGNAMESUFFIX=	-gnome
+.if defined(WITH_GNOME)
 USE_GNOME+=	gnomelibs gnomeprefix
 CONFIGURE_ARGS+=	--enable-gnome
 DATADIR=	${PREFIX}/share/gnome/${PORTNAME}
@@ -61,14 +70,21 @@ PLIST_SUB+=	NLS=""
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's| install-exec-local||g'
-	@${REINPLACE_CMD} -e 's|asm_support=yes|asm_support=$$enableval|g ; \
-		 s|-pthread -ldl||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|soundtracker.desktop||' \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's| install-exec-local||' \
+		${WRKSRC}/app/Makefile.in
+	@${REINPLACE_CMD} -e 's|-ldl||' \
+		${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|PREFIX"/share/soundtracker|DATADIR"|' \
+		${WRKSRC}/app/gui.c
 
 pre-build:
 .if !defined(WITHOUT_NLS)
 	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -c -o ja.gmo ja.po
 .endif
 
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/sharp.xpm ${PREFIX}/share/pixmaps/soundtracker.xpm
+
 .include <bsd.port.post.mk>
diff --git a/audio/soundtracker/files/patch-app::gui.c b/audio/soundtracker/files/patch-app::gui.c
deleted file mode 100644
index 0d5d9f192fbe..000000000000
--- a/audio/soundtracker/files/patch-app::gui.c
+++ /dev/null
@@ -1,88 +0,0 @@
---- app/gui.c.orig	Sun Jan 11 22:46:26 2004
-+++ app/gui.c	Thu Jan 29 19:29:45 2004
-@@ -1724,7 +1724,7 @@
-     /* Show splash screen if enabled and image available. */
- 
- #ifndef NO_GDK_PIXBUF
--    gui_splash_logo = gdk_pixbuf_new_from_file(PREFIX"/share/soundtracker/soundtracker_splash.png");
-+    gui_splash_logo = gdk_pixbuf_new_from_file(DATADIR"/soundtracker_splash.png");
-     if(gui_splash_logo) {
- 	thing = gtk_hseparator_new();
- 	gtk_widget_show(thing);
-@@ -1925,7 +1925,7 @@
- 
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/play.xpm");
-+	DATADIR"/play.xpm");
-     pmw = gtk_pixmap_new(pm, mask);
-     pbutton = thing = gtk_button_new();
-     gtk_container_add(GTK_CONTAINER(thing), pmw);
-@@ -1937,7 +1937,7 @@
- 
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/play_cur.xpm");
-+	DATADIR"/play_cur.xpm");
-     pmw = gtk_pixmap_new(pm, mask);
-     thing = gtk_button_new();
-     gtk_container_add(GTK_CONTAINER(thing), pmw);
-@@ -1949,7 +1949,7 @@
- 
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/stop.xpm");
-+	DATADIR"/stop.xpm");
-     pmw = gtk_pixmap_new(pm, mask);
-     thing = gtk_button_new();
-     gtk_container_add(GTK_CONTAINER(thing), pmw);
-@@ -1975,7 +1975,7 @@
- 		       
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/lock.xpm");
-+	DATADIR"/lock.xpm");
-     pmw = gtk_pixmap_new(pm, mask);
-     toggle_lock_editpat = thing = gtk_toggle_button_new();
-     gtk_container_add(GTK_CONTAINER(thing), pmw);
-@@ -2033,13 +2033,13 @@
-     vbox = gtk_vbox_new(FALSE, 0);
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/sharp.xpm");
-+	DATADIR"/sharp.xpm");
-     alt[0] = gtk_pixmap_new(pm, mask);
-     gtk_box_pack_start(GTK_BOX(vbox), alt[0], FALSE, FALSE, 0);
-     
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/flat.xpm");
-+	DATADIR"/flat.xpm");
-     alt[1] = gtk_pixmap_new(pm, mask);
-     gtk_widget_show(alt[gui_settings.sharp ? 0 : 1]);
-     gtk_box_pack_start(GTK_BOX(vbox), alt[1], FALSE, FALSE, 0);
-@@ -2102,13 +2102,13 @@
-     vbox = gtk_vbox_new(FALSE, 0);
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/downarrow.xpm");
-+	DATADIR"/downarrow.xpm");
-     arrow[0] = gtk_pixmap_new(pm, mask);
-     gtk_box_pack_start(GTK_BOX(vbox), arrow[0], FALSE, FALSE, 0);
-     
-     pm = gdk_pixmap_create_from_xpm(mainwindow->window,
- 	&mask, &style->bg[GTK_STATE_NORMAL],
--	PREFIX"/share/soundtracker/rightarrow.xpm");
-+	DATADIR"/rightarrow.xpm");
-     arrow[1] = gtk_pixmap_new(pm, mask);
-     gtk_box_pack_start(GTK_BOX(vbox), arrow[1], FALSE, FALSE, 0);
-     gtk_widget_show(arrow[gui_settings.advance_cursor_in_fx_columns ? 1 : 0]);
-@@ -2129,7 +2129,7 @@
-     gtk_widget_show(thing);
- 
- #ifndef NO_GDK_PIXBUF
--    scopegroup = SCOPE_GROUP(scope_group_new(gdk_pixbuf_new_from_file(PREFIX"/share/soundtracker/muted.png")));
-+    scopegroup = SCOPE_GROUP(scope_group_new(gdk_pixbuf_new_from_file(DATADIR"/muted.png")));
- #else
-     scopegroup = SCOPE_GROUP(scope_group_new());
- #endif
diff --git a/audio/soundtracker/pkg-plist b/audio/soundtracker/pkg-plist
index bdd244cd1042..e02d36fa83fa 100644
--- a/audio/soundtracker/pkg-plist
+++ b/audio/soundtracker/pkg-plist
@@ -1,5 +1,5 @@
 bin/soundtracker
-%%GNOME:%%share/gnome/apps/Multimedia/soundtracker.desktop
+share/pixmaps/soundtracker.xpm
 %%NLS%%share/locale/da/LC_MESSAGES/soundtracker.mo
 %%NLS%%share/locale/de/LC_MESSAGES/soundtracker.mo
 %%NLS%%share/locale/en@boldquot/LC_MESSAGES/soundtracker.mo