kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

move dependency from qt-1.44 to qt1-1.44

Browse source
This commit is contained in:
dmcmahill 2000-03-23 22:07:12 +00:00
parent 62034bfa4c
commit 7d380b604d
9 changed files with 87 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
audio/xsidplay/Makefile
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.5 2000/02/15 09:26:18 agc Exp $
# $NetBSD: Makefile,v 1.6 2000/03/23 22:07:12 dmcmahill Exp $
#
DISTNAME= xsidplay-1_3_8
@ -12,7 +12,7 @@ MAINTAINER= pooka@iki.fi
HOMEPAGE= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
DEPENDS= sidplay-1.36.35:../../audio/sidplay
DEPENDS+= qt-1.44:../../x11/qt
DEPENDS+= qt1-1.44:../../x11/qt1
USE_X11BASE= yes
GNU_CONFIGURE= yes
@ -20,9 +20,9 @@ USE_GMAKE= yes
CONFIGURE_ARGS+= --with-sidplay-includes=${LOCALBASE}/include \
--with-sidplay-library=${LOCALBASE}/lib \
--with-qt-includes=${LOCALBASE}/include/qt \
--with-qt-includes=${LOCALBASE}/include/qt1 \
--with-qt-libraries=${LOCALBASE}/lib \
--with-qt-includes=${X11BASE}/include/qt \
--with-qt-includes=${X11BASE}/include/qt1 \
--with-qt-libraries=${X11BASE}/lib
do-install:

7
audio/xsidplay/files/patch-sum
View file

@ -1,3 +1,6 @@
$NetBSD: patch-sum,v 1.1 1999/12/17 13:33:47 pooka Exp $
$NetBSD: patch-sum,v 1.2 2000/03/23 22:07:13 dmcmahill Exp $
MD5 (patch-aa) = 62a92dede5fe103ad463c678f11008e0
MD5 (patch-aa) = c9deffe4688f37d23dc4af76ac2c8106
MD5 (patch-ab) = e868c68c0871d933f163787267b97b09
MD5 (patch-ac) = 09cd1be09d3eaa61ed196e99d53c732a
MD5 (patch-ad) = 41513e7ae935c2d4e4294e716d6b792e

4
audio/xsidplay/patches/patch-aa
View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.3 1999/12/17 13:33:48 pooka Exp $
$NetBSD: patch-aa,v 1.4 2000/03/23 22:07:13 dmcmahill Exp $
--- src/Makefile.in.orig Fri Jul 2 12:37:40 1999
+++ src/Makefile.in Fri Dec 17 13:31:49 1999
@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.3 1999/12/17 13:33:48 pooka Exp $
LIBIOS = @LIBIOS@
LIBAUDIO = @LIBAUDIO@
-LIBS = @LIBS@ -lqt -lX11 -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
+LIBS = @LIBS@ -lqt -lX11 -lXext -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
+LIBS = @LIBS@ -lqt1 -lX11 -lXext -lsidplay $(LIBM) $(LIBIOS) $(LIBAUDIO)
# Part of Qt.
MOC = @MOC@

18
audio/xsidplay/patches/patch-ab Normal file
View file

@ -0,0 +1,18 @@
$NetBSD: patch-ab,v 1.3 2000/03/23 22:07:13 dmcmahill Exp $
--- acinclude.m4.orig Thu Oct 8 20:08:24 1998
+++ acinclude.m4 Thu Mar 23 16:38:53 2000
@@ -283,5 +283,5 @@
qt_libdirs="$ac_qt_libraries /usr/lib/qt/lib /usr/local/qt/lib /usr/lib/qt /usr/lib $x_libraries $QTLIB"
test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-AC_FIND_FILE(libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl, $qt_libdirs, qt_libdir)
+AC_FIND_FILE(libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl, $qt_libdirs, qt_libdir)
ac_qt_libraries=$qt_libdir
@@ -372,5 +372,5 @@
AC_DEFUN(AC_PATH_QT_MOC,
[
-AC_PATH_PROG(MOC,moc,/usr/bin/moc,
+AC_PATH_PROG(MOC,moc1,/usr/bin/moc1,
$PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin)
])

18
audio/xsidplay/patches/patch-ac Normal file
View file

@ -0,0 +1,18 @@
$NetBSD: patch-ac,v 1.3 2000/03/23 22:07:14 dmcmahill Exp $
--- aclocal.m4.orig Thu Oct 8 20:08:24 1998
+++ aclocal.m4 Thu Mar 23 16:39:44 2000
@@ -295,5 +295,5 @@
qt_libdirs="$ac_qt_libraries /usr/lib/qt/lib /usr/local/qt/lib /usr/lib/qt /usr/lib $x_libraries $QTLIB"
test -n "$QTDIR" && qt_libdirs="$QTDIR/lib $QTDIR $qt_libdirs"
-AC_FIND_FILE(libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl, $qt_libdirs, qt_libdir)
+AC_FIND_FILE(libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl, $qt_libdirs, qt_libdir)
ac_qt_libraries=$qt_libdir
@@ -384,5 +384,5 @@
AC_DEFUN(AC_PATH_QT_MOC,
[
-AC_PATH_PROG(MOC,moc,/usr/bin/moc,
+AC_PATH_PROG(MOC,moc1,/usr/bin/moc1,
$PATH:/usr/bin:/usr/X11R6/bin:$QTDIR/bin:/usr/lib/qt/bin:/usr/local/qt/bin)
])

27
audio/xsidplay/patches/patch-ad Normal file
View file

@ -0,0 +1,27 @@
$NetBSD: patch-ad,v 1.3 2000/03/23 22:07:14 dmcmahill Exp $
--- configure.orig Sun Jul 4 03:11:29 1999
+++ configure Thu Mar 23 16:40:15 2000
@@ -1407,5 +1407,5 @@
for i in $qt_libdirs;
do
- for j in libqt.so libqt.so.1.40 libqt.so.1.41 libqt.so.1 libqt.a libqt.sl;
+ for j in libqt1.so libqt1.so.1.40 libqt1.so.1.41 libqt1.so.1 libqt1.a libqt1.sl;
do
if test -r "$i/$j"; then
@@ -1483,6 +1483,6 @@
-# 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:1489: checking for $ac_word" >&5
@@ -1508,5 +1508,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

6
cad/vipec/Makefile
View file

@ -1,14 +1,14 @@
# $NetBSD: Makefile,v 1.2 1999/06/04 15:39:09 drochner Exp $
# $NetBSD: Makefile,v 1.3 2000/03/23 22:07:17 dmcmahill Exp $
#
DISTNAME= vipec-1.07
CATEGORIES= cad
MASTER_SITES= http://netfold.com/~vipec/public_ftp/unstable/
MAINTAINER= mcmahill@alum.mit.edu
MAINTAINER= dmcmahill@netbsd.org
HOMEPAGE= http://www.netfold.com/~vipec/
DEPENDS+= qt-1.44:../../x11/qt
DEPENDS+= qt1-1.44:../../x11/qt1
USE_X11= yes

4
cad/vipec/files/patch-sum
View file

@ -1,3 +1,3 @@
$NetBSD: patch-sum,v 1.1 1999/07/09 13:50:22 agc Exp $
$NetBSD: patch-sum,v 1.2 2000/03/23 22:07:17 dmcmahill Exp $
MD5 (patch-aa) = 76b15b6df5a4dce9810e2bcdd5d5c711
MD5 (patch-aa) = a56454f95657188cc5d4eb3132239d76

16
cad/vipec/patches/patch-aa
View file

@ -1,17 +1,17 @@
$NetBSD: patch-aa,v 1.1.1.1 1999/06/03 16:26:26 tron Exp $
$NetBSD: patch-aa,v 1.2 2000/03/23 22:07:18 dmcmahill Exp $
--- Makefile.orig Tue May 25 08:52:00 1999
+++ Makefile Thu Jun 3 18:08:37 1999
@@ -11,10 +11,10 @@
CXX = g++
--- Makefile.orig Tue May 25 02:52:00 1999
+++ Makefile Thu Mar 23 17:01:44 2000
@@ -12,9 +12,9 @@
CFLAGS = -Wall -W -O2 -fno-strength-reduce
CXXFLAGS= -Wall -W -O2 -fno-strength-reduce
-INCPATH = -I$(QTDIR)/include
+INCPATH = -I$(X11BASE)/include/qt -I$(X11BASE)/include
+INCPATH = -I$(X11BASE)/include/qt1 -I$(X11BASE)/include
LINK = g++
LFLAGS =
-LIBS = -L$(QTDIR)/lib -lqt -lX11 -lXext
+LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lqt -lX11 -lXext
MOC = moc
-MOC = moc
+LIBS = -L$(X11BASE)/lib -Wl,-R$(X11BASE)/lib -lqt1 -lX11 -lXext
+MOC = moc1
TAR = tar -cf