From tkato@prontomail.com  Sat Sep  6 07:54:37 2003
Return-Path: <tkato@prontomail.com>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 91B7916A4C2
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  6 Sep 2003 07:52:33 -0700 (PDT)
Received: from hfep04.dion.ne.jp (hfep04.dion.ne.jp [203.181.105.70])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6E45243FDD
	for <FreeBSD-gnats-submit@FreeBSD.org>; Sat,  6 Sep 2003 07:52:32 -0700 (PDT)
	(envelope-from tkato@prontomail.com)
Received: from localhost ([211.126.70.194]) by hfep04.dion.ne.jp with SMTP
          id <20030906145229196.YUGP@hfep04.dion.ne.jp>
          for <FreeBSD-gnats-submit@FreeBSD.org>;
          Sat, 6 Sep 2003 23:52:29 +0900
Message-Id: <20030906235041.45a356cc.tkato@prontomail.com>
Date: Sat, 6 Sep 2003 23:50:41 +0900
From: KATO Tsuguru <tkato@prontomail.com>
To: FreeBSD-gnats-submit@FreeBSD.org
Subject: Update port: sysutils/gtoaster

>Number:         56530
>Category:       ports
>Synopsis:       Update port: sysutils/gtoaster
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Sep 06 08:00:37 PDT 2003
>Closed-Date:    Sun Sep 07 22:50:59 PDT 2003
>Last-Modified:  Sun Sep 07 22:50:59 PDT 2003
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE-p3 i386
>Organization:
>Environment:
>Description:
- Fix handling PORTVERSION
- Reaarange USE_GNOME
- machine/soundcard.h -> sys/soundcard.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/sysutils/gtoaster/Makefile sysutils/gtoaster/Makefile
--- /usr/ports/sysutils/gtoaster/Makefile	Thu Jul 10 14:33:25 2003
+++ sysutils/gtoaster/Makefile	Fri Sep  5 12:52:07 2003
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gtoaster
-PORTVERSION=	1.0.Beta6
-PORTEPOCH=	1
+PORTVERSION=	1.0.b6
+PORTEPOCH=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://gnometoaster.rulez.org/archive/
-DISTNAME=	${PORTNAME}1.0Beta6
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.b/Beta/}
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
@@ -19,17 +19,45 @@
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs
 
-WRKSRC=		${WRKDIR}/gtoaster
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_X_PREFIX=	yes
+WANT_GNOME=	yes
+USE_GNOME=	gnomehack gnometarget gtk12
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${X11BASE}
-CONFIGURE_ENV=	GTK_CONFIG=${X11BASE}/bin/gtk12-config
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-USE_GNOME=	gtk12
-USE_GMAKE=	yes
-USE_X_PREFIX=	yes
+.include <bsd.port.pre.mk>
 
-pre-configure:
-	@${RM} ${WRKSRC}/config.guess
+.if ${HAVE_GNOME:Mgnomelibs}!=""
+PKGNAMESUFFIX=	-gnome
+USE_GNOME+=	gnomelibs
+.else
+CONFIGURE_ARGS+=	--without-gnome
+.endif
+
+.if ${HAVE_GNOME:Morbit}!=""
+USE_GNOME+=	orbit
+.else
+CONFIGURE_ARGS+=	--without-orbit
+.endif
+
+.if ${HAVE_GNOME:Mesound}!=""
+USE_GNOME+=	esound
+.else
+CONFIGURE_ARGS+=	--without-esd
+.endif
+
+post-extract:
+	@${RM} -f ${WRKSRC}/config.guess
+	@${TOUCH} ${WRKSRC}/config.guess
+
+post-patch:
+.for file in configure audio_oss.c
+	@${REINPLACE_CMD} -e 's|linux/soundcard|sys/soundcard|g ; \
+		 s|machine/soundcard|sys/soundcard|g' ${WRKSRC}/${file}
+.endfor
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: edwin 
State-Changed-When: Sun Sep 7 22:50:01 PDT 2003 
State-Changed-Why:  
Commited, thanks! 
(with some minor patches) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=56530 
>Unformatted:
