From edwin@mavetju.org  Mon Apr 16 02:44:00 2007
Return-Path: <edwin@mavetju.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 4304316A401
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Apr 2007 02:44:00 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: from mail4out.barnet.com.au (mail4.barnet.com.au [202.83.178.125])
	by mx1.freebsd.org (Postfix) with ESMTP id F392713C44B
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Apr 2007 02:43:59 +0000 (UTC)
	(envelope-from edwin@mavetju.org)
Received: by mail4out.barnet.com.au (Postfix, from userid 1001)
	id 425E437BB2C; Mon, 16 Apr 2007 12:43:59 +1000 (EST)
Received: from mail4auth.barnet.com.au (mail4.barnet.com.au [202.83.178.125])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client did not present a certificate)
	by mail4.barnet.com.au (Postfix) with ESMTP id 155DD422155
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Apr 2007 12:43:59 +1000 (EST)
Received: from k7.mavetju (k7.mavetju.org [10.251.1.18])
	by mail4auth.barnet.com.au (Postfix) with ESMTP id C2AE937BA2A
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 16 Apr 2007 12:43:58 +1000 (EST)
Received: by k7.mavetju (Postfix, from userid 1001)
	id A1694D6; Mon, 16 Apr 2007 12:43:58 +1000 (EST)
Message-Id: <20070416024358.A1694D6@k7.mavetju>
Date: Mon, 16 Apr 2007 12:43:58 +1000 (EST)
From: Edwin Groothuis <edwin@mavetju.org>
Reply-To: Edwin Groothuis <edwin@mavetju.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [patch] audio/xmp - cleanup non-supported FreeBSD versions
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         111698
>Category:       ports
>Synopsis:       [patch] audio/xmp - cleanup non-supported FreeBSD versions
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    anders
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 16 02:50:01 GMT 2007
>Closed-Date:    Wed May 02 08:06:00 GMT 2007
>Last-Modified:  Wed May  2 08:10:39 GMT 2007
>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@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:
Responsible-Changed-From-To: freebsd-ports-bugs->anders 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Apr 16 02:50:27 UTC 2007 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111698 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111661 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111669 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111676 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111683 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111685 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111686 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111696 
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Wed May 2 08:05:09 UTC 2007 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=111698 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/111698: commit references a PR
Date: Wed,  2 May 2007 08:05:10 +0000 (UTC)

 edwin       2007-05-02 08:05:06 UTC
 
   FreeBSD ports repository
 
   Modified files:
     audio/xmp            Makefile 
   Log:
   [patch] cleanup non-supported FreeBSD versions
   
   PR:             ports/111698
   Submitted by:   Edwin Groothuis <edwin@mavetju.org>
   Approved by:    maintainer timeout
   
   Revision  Changes    Path
   1.33      +8 -20     ports/audio/xmp/Makefile
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
