diff options
| -rw-r--r-- | databases/mysql-client/Makefile | 4 | ||||
| -rw-r--r-- | databases/mysql-client/pkg/PLIST | 3 | ||||
| -rw-r--r-- | x11/qt/Makefile | 4 | ||||
| -rw-r--r-- | x11/qt/files/patch-sum | 6 | ||||
| -rw-r--r-- | x11/qt/patches/patch-aa | 6 | ||||
| -rw-r--r-- | x11/qt/patches/patch-ac | 6 | ||||
| -rw-r--r-- | x11/qt/pkg/PLIST | 3 |
7 files changed, 17 insertions, 15 deletions
diff --git a/databases/mysql-client/Makefile b/databases/mysql-client/Makefile index 4bc2a7dc5b5..9b8f4d5c290 100644 --- a/databases/mysql-client/Makefile +++ b/databases/mysql-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2000/08/12 01:26:51 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2000/08/16 01:54:09 wiz Exp $ # DISTNAME= mysql-3.22.32 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+=--without-readline CFLAGS+= -Dunix USE_PERL5= yes -USE_PKGLIBTOOL= yes +USE_LIBTOOL= yes INFO_FILES= mysql.info diff --git a/databases/mysql-client/pkg/PLIST b/databases/mysql-client/pkg/PLIST index 86504bf89db..7f176116fbe 100644 --- a/databases/mysql-client/pkg/PLIST +++ b/databases/mysql-client/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2000/02/15 04:46:32 bad Exp $ +@comment $NetBSD: PLIST,v 1.4 2000/08/16 01:54:10 wiz Exp $ bin/msql2mysql bin/mysql bin/mysql_zap @@ -35,6 +35,7 @@ include/mysql/sslopt-vars.h info/mysql.info @exec install-info %D/info/mysql.info %D/info/dir lib/mysql/libmysqlclient.a +lib/mysql/libmysqlclient.la lib/mysql/libmysqlclient.so.6.0 share/mysql/binary-configure share/mysql/make_binary_distribution diff --git a/x11/qt/Makefile b/x11/qt/Makefile index 699b81d8624..2541a227745 100644 --- a/x11/qt/Makefile +++ b/x11/qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2000/06/01 11:23:46 rh Exp $ +# $NetBSD: Makefile,v 1.35 2000/08/16 01:52:14 wiz Exp $ # DISTNAME= qt-2.0.2 @@ -18,7 +18,7 @@ NOT_FOR_PLATFORM= *-*-alpha # builds, but programs linked to qt crash HAS_CONFIGURE= yes USE_X11BASE= yes USE_GMAKE= yes -USE_PKGLIBTOOL= yes +USE_LIBTOOL= yes CONFIGURE_ENV+= QTDIR=${WRKSRC} CONFIGURE_ARGS+= -static -sm -system-zlib -system-libpng \ -I${LOCALBASE}/include -L${LOCALBASE}/lib \ diff --git a/x11/qt/files/patch-sum b/x11/qt/files/patch-sum index 62c7cc2f72f..6a130185f5d 100644 --- a/x11/qt/files/patch-sum +++ b/x11/qt/files/patch-sum @@ -1,5 +1,5 @@ -$NetBSD: patch-sum,v 1.2 2000/03/28 21:41:44 dmcmahill Exp $ +$NetBSD: patch-sum,v 1.3 2000/08/16 01:52:15 wiz Exp $ -MD5 (patch-aa) = e5f74faca4ba8334410e036e60dfb424 +MD5 (patch-aa) = 63db06023ee06892f3ebb9742ec07f84 MD5 (patch-ab) = 4f045be0e4e9df89dce9316ff1f2e6b7 -MD5 (patch-ac) = 22cab9b56814655b30817034464d66c6 +MD5 (patch-ac) = 7db9c29b88292e2b679cf545404a0543 diff --git a/x11/qt/patches/patch-aa b/x11/qt/patches/patch-aa index 6b78e992aa3..09213cda919 100644 --- a/x11/qt/patches/patch-aa +++ b/x11/qt/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.7 2000/03/28 21:41:44 dmcmahill Exp $ +$NetBSD: patch-aa,v 1.8 2000/08/16 01:52:15 wiz Exp $ --- configs/netbsd-g++-static.orig Tue Jul 20 04:45:11 1999 +++ configs/netbsd-g++-static Thu Oct 21 14:15:45 1999 @@ -6,7 +6,7 @@ $NetBSD: patch-aa,v 1.7 2000/03/28 21:41:44 dmcmahill Exp $ # Compiling SYSCONF_CXX = g++ SYSCONF_CC = gcc -+SYSCONF_CXX_LIB = $(LIBTOOL) --cplusplus --mode=compile g++ ++SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile g++ # Compiling with support libraries SYSCONF_CXXFLAGS_X11 = -I/usr/X11R6/include @@ -30,7 +30,7 @@ $NetBSD: patch-aa,v 1.7 2000/03/28 21:41:44 dmcmahill Exp $ # Linking applications -SYSCONF_LINK = g++ -+SYSCONF_LINK = $(LIBTOOL) --cplusplus --mode=link g++ ++SYSCONF_LINK = $(LIBTOOL) --mode=link g++ SYSCONF_LFLAGS = SYSCONF_LIBS = diff --git a/x11/qt/patches/patch-ac b/x11/qt/patches/patch-ac index 0f10ccd9845..6008ab81bd3 100644 --- a/x11/qt/patches/patch-ac +++ b/x11/qt/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.2 2000/03/28 21:41:44 dmcmahill Exp $ +$NetBSD: patch-ac,v 1.3 2000/08/16 01:52:16 wiz Exp $ --- configs/solaris-g++-static.orig Fri Sep 24 05:22:03 1999 +++ configs/solaris-g++-static Mon Mar 27 21:20:24 2000 @@ -6,7 +6,7 @@ $NetBSD: patch-ac,v 1.2 2000/03/28 21:41:44 dmcmahill Exp $ # Compiling -SYSCONF_CXX = g++ +SYSCONF_CXX = ${LOCALBASE}/egcs/bin/g++ -+SYSCONF_CXX_LIB = $(LIBTOOL) --cplusplus --mode=compile ${SYSCONF_CXX} ++SYSCONF_CXX_LIB = $(LIBTOOL) --mode=compile ${SYSCONF_CXX} SYSCONF_CC = gcc # Compiling with support libraries @@ -51,7 +51,7 @@ $NetBSD: patch-ac,v 1.2 2000/03/28 21:41:44 dmcmahill Exp $ # -SYSCONF_AR = ar cq -SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a -+SYSCONF_AR = $(LIBTOOL) --cplusplus --mode=link $(SYSCONF_CXX) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o ++SYSCONF_AR = $(LIBTOOL) --mode=link $(SYSCONF_CXX) -rpath $(PREFIX)/lib -version-info $(VER_MAJ):$(VER_MIN) -o +SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).la SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ - $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) diff --git a/x11/qt/pkg/PLIST b/x11/qt/pkg/PLIST index 104e08eb0c8..3f6a1a69d0d 100644 --- a/x11/qt/pkg/PLIST +++ b/x11/qt/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.15 2000/04/28 10:09:55 drochner Exp $ +@comment $NetBSD: PLIST,v 1.16 2000/08/16 01:52:16 wiz Exp $ qt2/bin/moc qt2/include/jri.h qt2/include/jritypes.h @@ -247,6 +247,7 @@ qt2/include/qwizard.h qt2/include/qwmatrix.h qt2/include/qxt.h qt2/lib/libqt.a +qt2/lib/libqt.la qt2/lib/libqt.so.2.0 qt2/man/man1/moc.1 qt2/man/man3/QAccel.3 |