Fixed broken build with xmms dependiency installed on the system.

	Fixed broken build with xmms dependiency installed on the
	system.

PR:		ports/56679
Submitted by:	YazzY <yazzy@yazzy.org>

4 files changed, 95 insertions, 0 deletions

diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 81564a56c500..2929b346df5a 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	xmp
 PORTVERSION=	2.0.4
+PORTREVISION=	1
 CATEGORIES=	audio
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -36,6 +37,12 @@ CONFIGURE_ARGS+=	--enable-esd
 PKGNAMESUFFIX=	-esound
 .endif
 
+.if !defined(WITHOUT_XMMS)
+  LIB_DEPENDS+=   xmms.4:${PORTSDIR}/multimedia/xmms
+.else
+  CONFIGURE_ARGS+= --disable-xmms
+.endif
+
 MAN1=		xmp.1
 MLINKS=		xmp.1 xxmp.1
 
diff --git a/audio/xmp/files/patch-ai b/audio/xmp/files/patch-ai
new file mode 100644
index 000000000000..8a613ddcff26
--- /dev/null
+++ b/audio/xmp/files/patch-ai
@@ -0,0 +1,33 @@
+*** src/loaders/it_load.c.orig	Wed Sep 10 12:13:18 2003
+--- src/loaders/it_load.c	Wed Sep 10 12:11:36 2003
+***************
+*** 327,340 ****
+  
+  #define BUILD_ENV(X) { \
+  	    fread (&env, 1, sizeof (env), f); \
+! 	    xxih[i].##X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
+! 	    xxih[i].##X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
+! 	    xxih[i].##X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
+! 	    xxih[i].##X##ei.npt = env.num; \
+! 	    xxih[i].##X##ei.sus = env.slb; \
+! 	    xxih[i].##X##ei.sue = env.sle; \
+! 	    xxih[i].##X##ei.lps = env.lpb; \
+! 	    xxih[i].##X##ei.lpe = env.lpe; \
+  	    if (env.num) xx##X##e[i] = calloc (4, env.num); \
+  	    for (j = 0; j < env.num; j++) { \
+  		L_ENDIAN16 (env.node[j].x); \
+--- 327,340 ----
+  
+  #define BUILD_ENV(X) { \
+  	    fread (&env, 1, sizeof (env), f); \
+! 	    xxih[i].X##ei.flg = env.flg & IT_ENV_ON ? XXM_ENV_ON : 0; \
+! 	    xxih[i].X##ei.flg |= env.flg & IT_ENV_LOOP ? XXM_ENV_LOOP : 0; \
+! 	    xxih[i].X##ei.flg |= env.flg & IT_ENV_SLOOP ? XXM_ENV_SUS : 0; \
+! 	    xxih[i].X##ei.npt = env.num; \
+! 	    xxih[i].X##ei.sus = env.slb; \
+! 	    xxih[i].X##ei.sue = env.sle; \
+! 	    xxih[i].X##ei.lps = env.lpb; \
+! 	    xxih[i].X##ei.lpe = env.lpe; \
+  	    if (env.num) xx##X##e[i] = calloc (4, env.num); \
+  	    for (j = 0; j < env.num; j++) { \
+  		L_ENDIAN16 (env.node[j].x); \
diff --git a/audio/xmp/files/patch-aj b/audio/xmp/files/patch-aj
new file mode 100644
index 000000000000..d1a7f1c609f0
--- /dev/null
+++ b/audio/xmp/files/patch-aj
@@ -0,0 +1,19 @@
+*** src/xmms/plugin.c.orig	Sun Jan  7 01:53:15 2001
+--- src/xmms/plugin.c	Wed Sep 10 12:17:16 2003
+***************
+*** 228,234 ****
+  	xmp_cfg.filter = TRUE;
+  	xmp_cfg.pan_amplitude = 80;
+  
+! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.##x)
+  
+  	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
+  	if ((cfg = xmms_cfg_open_file(filename))) {
+--- 228,234 ----
+  	xmp_cfg.filter = TRUE;
+  	xmp_cfg.pan_amplitude = 80;
+  
+! #define CFGREADINT(x) xmms_cfg_read_int (cfg, "XMP", #x, &xmp_cfg.x)
+  
+  	filename = g_strconcat(g_get_home_dir(), "/.xmms/config", NULL);
+  	if ((cfg = xmms_cfg_open_file(filename))) {
diff --git a/audio/xmp/files/patch-ak b/audio/xmp/files/patch-ak
new file mode 100644
index 000000000000..49565494d920
--- /dev/null
+++ b/audio/xmp/files/patch-ak
@@ -0,0 +1,36 @@
+*** src/xmms/plugin.c.orig	Wed Sep 10 14:13:18 2003
+--- src/xmms/plugin.c	Wed Sep 10 14:13:31 2003
+***************
+*** 558,564 ****
+  	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w);	\
+  	gtk_widget_show(w);						\
+  	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0);		\
+! 	if (xmp_cfg.##o == 1)						\
+  		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
+  }
+  
+--- 558,564 ----
+  	gtk_object_set_data(GTK_OBJECT(xmp_conf_window), #w, w);	\
+  	gtk_widget_show(w);						\
+  	gtk_box_pack_start(GTK_BOX(vbox6), w, TRUE, TRUE, 0);		\
+! 	if (xmp_cfg.o == 1)						\
+  		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE); \
+  }
+  
+***************
+*** 658,664 ****
+  	if (!cfg)
+  		cfg = xmms_cfg_new();
+  
+! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.##x)
+  
+  	CFGWRITEINT (mixing_freq);
+  	CFGWRITEINT (force8bit);
+--- 658,664 ----
+  	if (!cfg)
+  		cfg = xmms_cfg_new();
+  
+! #define CFGWRITEINT(x) xmms_cfg_write_int (cfg, "XMP", #x, xmp_cfg.x)
+  
+  	CFGWRITEINT (mixing_freq);
+  	CFGWRITEINT (force8bit);