From jmcoopr@uidaho.edu  Sat Aug 24 20:18:17 2002
Return-Path: <jmcoopr@uidaho.edu>
Received: from mx1.FreeBSD.org (mx1.FreeBSD.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id AA65237B400
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 24 Aug 2002 20:18:17 -0700 (PDT)
Received: from harrier.csrv.uidaho.edu (harrier.csrv.uidaho.edu [129.101.119.224])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1DDD743E6A
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 24 Aug 2002 20:18:17 -0700 (PDT)
	(envelope-from jmcoopr@uidaho.edu)
Received: from pc016247.reshall.uidaho.edu (PC016247.reshall.uidaho.edu [129.101.136.30])
	by harrier.csrv.uidaho.edu (8.9.3 (PHNE_22672)/) with ESMTP id UAA25209
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 24 Aug 2002 20:18:16 -0700 (PDT)
Received: from pc016247.reshall.uidaho.edu (localhost [IPv6:::1])
	by pc016247.reshall.uidaho.edu (8.12.5/8.12.5) with ESMTP id g7P3IFNI068324
	for <FreeBSD-gnats-submit@freebsd.org>; Sat, 24 Aug 2002 20:18:15 -0700 (PDT)
	(envelope-from jmcoopr@pc016247.reshall.uidaho.edu)
Received: (from root@localhost)
	by pc016247.reshall.uidaho.edu (8.12.5/8.12.5/Submit) id g7P3I60D068323;
	Sat, 24 Aug 2002 20:18:06 -0700 (PDT)
	(envelope-from jmcoopr)
Message-Id: <200208250318.g7P3I60D068323@pc016247.reshall.uidaho.edu>
Date: Sat, 24 Aug 2002 20:18:06 -0700 (PDT)
From: John Merryweather Cooper <coop9211@uidaho.edu>
Reply-To: John Merryweather Cooper <coop9211@uidaho.edu>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER UPDATE] Update xsidplay to use QT3
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         41989
>Category:       ports
>Synopsis:       [MAINTAINER UPDATE] Update xsidplay to use QT3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sat Aug 24 20:20:01 PDT 2002
>Closed-Date:    Sun Aug 25 09:11:55 PDT 2002
>Last-Modified:  Sun Aug 25 09:11:55 PDT 2002
>Originator:     John Merryweather Cooper
>Release:        FreeBSD 4.6-STABLE i386
>Organization:
>Environment:
System: FreeBSD PC016247.reshall.uidaho.edu 4.6-STABLE FreeBSD 4.6-STABLE #34: Thu Aug 22 19:34:48 PDT 2002 root@PC016247.reshall.uidaho.edu:/usr/obj/usr/src/sys/JOHNCOOP i386


	
>Description:
	Hack xsidplay to use QT3.  Pretty much, it already supports it
	except for a coding error in the UI for the Playlist.  Ugly hack
	to generated code makes things work.

>How-To-Repeat:
	N/A
>Fix:

--- update-xsidplay-1.6.4.3_2,1 begins here ---
# This is a patch for xsidplay to update it to xsidplay-1.6.4.3_2,1
# 
# To apply this patch:
# STEP 1: Chdir to the source directory.
# STEP 2: Run the 'applypatch' program with this patch file as input.
#
# If you do not have 'applypatch', it is part of the 'makepatch' package
# that you can fetch from the Comprehensive Perl Archive Network:
# http://www.perl.com/CPAN/authors/Johan_Vromans/makepatch-x.y.tar.gz
# In the above URL, 'x' should be 2 or higher.
#
# To apply this patch without the use of 'applypatch':
# STEP 1: Chdir to the source directory.
# If you have a decent Bourne-type shell:
# STEP 2: Run the shell with this file as input.
# If you don't have such a shell, you may need to manually create
# the files as shown below.
# STEP 3: Run the 'patch' program with this file as input.
#
# These are the commands needed to create/delete files/directories:
#
touch 'files/patch-src::PlaylistEditDialogData.cpp'
chmod 0644 'files/patch-src::PlaylistEditDialogData.cpp'
#
# This command terminates the shell and need not be executed manually.
exit
#
#### End of Preamble ####

#### Patch data follows ####
diff -u 'xsidplay/Makefile' 'xsidplay-1.6.4.3_2,1/Makefile'
Index: ./Makefile
--- ./Makefile	Thu Jan 10 22:26:54 2002
+++ ./Makefile	Sat Aug 24 20:07:11 2002
@@ -2,28 +2,29 @@
 # Date created:        28 November 1999
 # Whom:                Anders Nordby <anders@fix.no>
 #
-# $FreeBSD: ports/audio/xsidplay/Makefile,v 1.19 2002/01/11 06:26:54 pat Exp $
+# $FreeBSD$
 #
 
 PORTNAME=	xsidplay
 PORTVERSION=	1.6.4.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	audio emulators
 MASTER_SITES=	http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/packages/
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	jmcoopr@webmail.bmi.net
+MAINTAINER=	coop9211@uidaho.edu
 
 LIB_DEPENDS=	sidplay.1:${PORTSDIR}/audio/libsidplay
 
 USE_X_PREFIX=	yes
-USE_QT_VER=	2
+USE_QT_VER=	3
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-qt-binaries=${X11BASE}/bin
+CONFIGURE_ARGS=	--with-qt3 --with-qt-binaries=${X11BASE}/bin
 QTCPPFLAGS+=	${PTHREAD_CFLAGS}
 QTCFGLIBS+=	${PTHREAD_LIBS}
+USE_REINPLACE=	yes
 
 MAN1=		xsidplay.1
 
@@ -35,10 +36,9 @@
 
 pre-patch:
 .for file in configure src/Makefile.in
-	@${PERL} -pi -e 's|moc|${MOC:T}|g ; \
-		 s|qt-mt|${QTNAME}-mt|g' ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e 's|lib-mt|libqt-mt|g' ${WRKSRC}/${file}
 .endfor
-	@${PERL} -pi -e 's|/usr/share|${PREFIX}|g' ${WRKSRC}/xsidplay.1
+	@${REINPLACE_CMD} -e 's|/usr/share|${PREFIX}|g' ${WRKSRC}/xsidplay.1
 
 do-install:
 	@${MKDIR} ${PREFIX}/share/pixmaps
diff -u /dev/null 'xsidplay-1.6.4.3_2,1/files/patch-src::PlaylistEditDialogData.cpp'
Index: ./files/patch-src::PlaylistEditDialogData.cpp
--- ./files/patch-src::PlaylistEditDialogData.cpp	Wed Dec 31 16:00:00 1969
+++ ./files/patch-src::PlaylistEditDialogData.cpp	Sat Aug 24 19:41:25 2002
@@ -0,0 +1,11 @@
+--- src/PlaylistEditDialogData.cpp.orig	Mon Nov 19 11:41:19 2001
++++ src/PlaylistEditDialogData.cpp	Sat Aug 24 19:41:01 2002
+@@ -151,8 +151,6 @@
+ 
+     subtuneSpinBox = new QSpinBox( this, "subtuneSpinBox" );
+     subtuneSpinBox->setGeometry( QRect( 260, 115, 50, 25 ) ); 
+-    subtuneSpinBox->setFrameShape( QSpinBox::WinPanel );
+-    subtuneSpinBox->setFrameShadow( QSpinBox::Sunken );
+     subtuneSpinBox->setButtonSymbols( QSpinBox::PlusMinus );
+     subtuneSpinBox->setMaxValue( 256 );
+     subtuneSpinBox->setMinValue( 1 );
#### End of Patch data ####

#### ApplyPatch data follows ####
# Data version        : 1.0
# Date generated      : Sat Aug 24 20:12:19 2002
# Generated by        : makepatch 2.00
# Recurse directories : Yes
# p 'Makefile' 1493 1030244831 0100644
# c 'files/patch-src::PlaylistEditDialogData.cpp' 0 1030243285 0100644
#### End of ApplyPatch data ####

#### End of Patch kit [created: Sat Aug 24 20:12:19 2002] ####
#### Checksum: 110 3826 39087 ####
--- update-xsidplay-1.6.4.3_2,1 ends here ---


>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: lioux 
State-Changed-When: Sun Aug 25 09:10:23 PDT 2002 
State-Changed-Why:  
Committed, thanks! Please list all added files in later PRs. 

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