ports/111698: [patch] audio/xmp - cleanup non-supported FreeBSD versions

[Edwin Groothuis]

>Number:         111698
>Category:       ports
>Synopsis:       [patch] audio/xmp - cleanup non-supported FreeBSD versions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 16 02:50:01 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Edwin Groothuis
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
-
>Environment:
System: FreeBSD k7.mavetju 6.1-RELEASE FreeBSD 6.1-RELEASE #0: Sun May 7 04:42:56 UTC 2006 root at opus.cse.buffalo.edu:/usr/obj/usr/src/sys/SMP i386


>Description:
>How-To-Repeat:
>Fix:

Please note that PKGNAMESUFFIX has been removed from the Makefile.

Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/audio/xmp/Makefile,v
retrieving revision 1.32
diff -u -r1.32 Makefile
--- Makefile	3 May 2006 05:14:34 -0000	1.32
+++ Makefile	16 Apr 2007 02:43:22 -0000
@@ -17,37 +17,25 @@
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-WANT_GNOME=	yes
+USE_GNOME=	esound
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf:213
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--disable-alsa
+CONFIGURE_ARGS=	--disable-alsa --disable-oss --enable-esd
 
-CFLAGS+=	-fPIC
-
-.include <bsd.port.pre.mk>
+MAN1=		xmp.1
+MLINKS=		xmp.1 xxmp.1
 
-.if ${OSVERSION} > 500013 || ${MACHINE_ARCH} == "alpha"
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--disable-oss --enable-esd
-PKGNAMESUFFIX=	-esound
-.elif ${HAVE_GNOME:Mesound}!=""
-USE_GNOME+=	esound
-CONFIGURE_ARGS+=	--enable-esd
-PKGNAMESUFFIX=	-esound
-.endif
+CFLAGS+=	-fPIC
 
 .if !defined(WITHOUT_XMMS)
-  LIB_DEPENDS+=   xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
 .else
-  CONFIGURE_ARGS+= --disable-xmms
+CONFIGURE_ARGS+=--disable-xmms
 .endif
 
-MAN1=		xmp.1
-MLINKS=		xmp.1 xxmp.1
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
>Release-Note:
>Audit-Trail:
>Unformatted: