switch dependency from qt-1.44 to qt1-1.44

5 files changed, 77 insertions, 32 deletions

diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index a97f89b1313..2359936bc36 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 1999/09/17 00:48:26 hubertf Exp $
+# $NetBSD: Makefile,v 1.2 2000/03/23 23:27:24 dmcmahill Exp $
 # FreeBSD: ports/audio/xamp/Makefile,v 1.5 1999/08/25 04:36:22 obrien Exp
 #
 
@@ -11,14 +11,20 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	rxg@ms25.url.com.tw
 HOMEPAGE=	http://edu.lahti.fi/xamp/
 
-DEPENDS+=	qt-1.44:../../x11/qt
+DEPENDS+=	qt1-1.44:../../x11/qt1
 
 WRKSRC=		${WRKDIR}/xamp-0.8/xamp-0.8
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	CXXFLAGS="${CFLAGS}"
+CONFIGURE_ENV+=	CXXFLAGS="${CFLAGS}"
 USE_GMAKE=	yes
 USE_X11BASE=	yes
 
+CONFIGURE_ARGS+=	--with-qt-includes=${X11BASE}/include/qt1 \
+			--with-qt-libs=${X11BASE}/lib \
+
+tst:
+	echo ${INSTALL}
+
 do-install:
 		${INSTALL_PROGRAM} ${WRKSRC}/xamp ${PREFIX}/bin
 		${INSTALL_MAN} ${WRKSRC}/xamp.1 ${PREFIX}/man/man1
diff --git a/audio/xamp/files/patch-sum b/audio/xamp/files/patch-sum
index 40f078ed162..c5386324413 100644
--- a/audio/xamp/files/patch-sum
+++ b/audio/xamp/files/patch-sum
@@ -1,11 +1,11 @@
-$NetBSD: patch-sum,v 1.1 1999/11/21 16:38:29 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
 
 MD5 (patch-aa) = 01e268f9ad2bf936744ad1acc50175d2
 MD5 (patch-ab) = 6c6eca722a46d0151c1b2392945e1136
 MD5 (patch-ac) = e4c19506ef2163d2b1ac239d300b44b6
 MD5 (patch-ad) = 4b477706bbaf6ecd6218ef94279de0de
-MD5 (patch-ae) = 3389bf98d4d87e395078943508c0c550
+MD5 (patch-ae) = 327f4dcfc2767bccc95c161c99dd9264
 MD5 (patch-af) = bf81124d051be2e04ff6be01c1f71e13
 MD5 (patch-ag) = 825e22e159d0c3ea81833489c8598758
-MD5 (patch-ah) = 02fafd2628f4e87743015bb9a5758c1b
-MD5 (patch-ai) = 647e55c0d44d9f2a9f83573b21e30ec5
+MD5 (patch-ah) = debf433414670c9accf1a4500663d293
+MD5 (patch-ai) = 97bcd152234e208d46f48a1d2f125e61
diff --git a/audio/xamp/patches/patch-ae b/audio/xamp/patches/patch-ae
index 27262eeb13c..cbbba7be117 100644
--- a/audio/xamp/patches/patch-ae
+++ b/audio/xamp/patches/patch-ae
@@ -1,9 +1,8 @@
-$NetBSD: patch-ae,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
+$NetBSD: patch-ae,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
 
---- Makefile.in.orig	Wed Feb 11 06:37:20 1998
-+++ Makefile.in	Fri Sep 17 02:30:10 1999
-@@ -14,7 +14,8 @@
- DEFINES = -DOS_@OS_TYPE@ -DARCH_@ARCH_TYPE@
+--- Makefile.in.orig	Tue Feb 10 17:37:20 1998
++++ Makefile.in	Wed Mar 22 18:48:42 2000
+@@ -15,5 +15,6 @@
  CFLAGS = @CFLAGS@ ${DEFINES} ${DEBUG} ${BACK}
  LDFLAGS = @LDFLAGS@
 -INSTALL= @INSTALL@
@@ -11,22 +10,24 @@ $NetBSD: patch-ae,v 1.1.1.1 1999/09/17 00:48:27 hubertf Exp $
 +DESTDIR= ${PREFIX}/bin
  
  #
- # uncomment both of these if you want profiling support
-@@ -37,7 +38,7 @@
- 	id3.o id3Data.o QLayer.o mid3.o mid3Data.o pixmaps/pixmaps.o \
+@@ -38,5 +39,5 @@
  	backs/backs.o
  	
 -LIBS = @QT_LDFLAGS@ -lm -lqt
-+LIBS = @QT_LDFLAGS@ -lm -lqt -Wl,-rpath,$(X11BASE)/lib -lX11 -lXext
++LIBS = @QT_LDFLAGS@ -lm -lqt1 -Wl,-rpath,$(X11BASE)/lib -lX11 -lXext
  
  all: xamp
- 
-@@ -59,7 +60,7 @@
- 	cd pixmaps ; make
+@@ -60,5 +61,5 @@
  
  xamp: images $(OBJ) 
 -	$(CC) -o xamp $(OBJ) $(LDFLAGS) $(LIBS) 
 +	$(CXX) -o xamp $(OBJ) $(LDFLAGS) $(LIBS) -lossaudio
  	
  install:
- 	$(INSTALL) -m 755 xamp $(DESTDIR)
+@@ -94,5 +95,5 @@
+ 
+ qembed.cpp:
+-	$(CXX) qembed.cpp -o qembed -lqt
++	$(CXX) qembed.cpp -o qembed -lqt1
+ .SUFFIXES: .cpp
+ .cpp.o:
diff --git a/audio/xamp/patches/patch-ah b/audio/xamp/patches/patch-ah
index da218fd7bf9..8851da295c0 100644
--- a/audio/xamp/patches/patch-ah
+++ b/audio/xamp/patches/patch-ah
@@ -1,13 +1,23 @@
-$NetBSD: patch-ah,v 1.1 1999/11/15 13:07:12 rh Exp $
+$NetBSD: patch-ah,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
 
---- configure.in.orig	Sun Oct  5 18:42:34 1997
-+++ configure.in	Mon Nov 15 13:58:45 1999
-@@ -57,7 +57,7 @@
-     CFLAGS="-O3 -ffast-math -funroll-loops"
+--- configure.in.orig	Sun Oct  5 12:42:34 1997
++++ configure.in	Wed Mar 22 18:49:34 2000
+@@ -9,9 +9,9 @@
+ AC_PROG_CC
+ AC_PROG_CXX
+-AC_PATH_PROG(MOC, moc, /usr/bin/moc)
++AC_PATH_PROG(MOC, moc1, /usr/bin/moc1)
+ AC_PROG_INSTALL(INSTALL, /usr/bin/install)
+ 
+ dnl Checks for libraries.
+-AC_HAVE_LIBRARY(qt,,,-lX11)
++AC_HAVE_LIBRARY(qt1,,,-lX11)
+ 
+ dnl Checks for header files.
+@@ -58,5 +58,5 @@
      ;;
  
 -  Linux|FreeBSD)
 +  Linux|FreeBSD|NetBSD)
      CC="gcc"
      if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"
diff --git a/audio/xamp/patches/patch-ai b/audio/xamp/patches/patch-ai
index 41f6cb4b65a..6852c147eea 100644
--- a/audio/xamp/patches/patch-ai
+++ b/audio/xamp/patches/patch-ai
@@ -1,13 +1,41 @@
-$NetBSD: patch-ai,v 1.1 1999/11/15 13:07:13 rh Exp $
+$NetBSD: patch-ai,v 1.2 2000/03/23 23:27:25 dmcmahill Exp $
 
---- configure.orig	Sun Oct 26 17:55:34 1997
-+++ configure	Mon Nov 15 13:58:45 1999
-@@ -1700,7 +1700,7 @@
-     CFLAGS="-O3 -ffast-math -funroll-loops"
+--- configure.orig	Sun Oct 26 11:55:34 1997
++++ configure	Thu Mar 23 18:12:08 2000
+@@ -841,6 +841,6 @@
+ fi
+ 
+-# Extract the first word of "moc", so it can be a program name with args.
+-set dummy moc; ac_word=$2
++# Extract the first word of "moc1", so it can be a program name with args.
++set dummy moc1; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+ echo "configure:841: checking for $ac_word" >&5
+@@ -862,5 +862,5 @@
+   done
+   IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc"
++  test -z "$ac_cv_path_MOC" && ac_cv_path_MOC="/usr/bin/moc1"
+   ;;
+ esac
+@@ -970,5 +970,5 @@
+ #try to guess qt locations
+ 
+-qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt $x_includes $QTINC"
++qt_incdirs="/usr/lib/qt/include /usr/local/qt/include /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt1 $x_includes $QTINC"
+ test -n "$QTDIR" && qt_incdirs="$QTDIR/include $QTDIR $qt_incdirs"
+ 
+@@ -993,5 +993,5 @@
+ for i in $qt_libdirs;
+ do
+-  for j in libqt.so libqt.a libqt.sl;
++  for j in libqt1.so libqt1.a libqt1.sl;
+   do
+     if test -r "$i/$j"; then
+@@ -1701,5 +1701,5 @@
      ;;
  
 -  Linux|FreeBSD)
 +  Linux|FreeBSD|NetBSD)
      CC="gcc"
      if test "$ARCH_TYPE" = "i486" ; then
-       CFLAGS_ARCH="-m486"