From 923a1f92484ebd8e75be80dcd54903ea65f7499d Mon Sep 17 00:00:00 2001
From: minskim <minskim@pkgsrc.org>
Date: Fri, 3 Mar 2006 00:53:54 +0000
Subject: Make qmake and libtool use the same library versioning.  Should have
 been done when the pkgsrc libtool versioning was changed.  This addresses PR
 pkg/29572.  No recursive bump because the major version number is not
 affected by this.

Bump PKGREVISION for qt3-libs and qt3-tools.
---
 x11/qt3-libs/Makefile         | 4 ++--
 x11/qt3-libs/files/qmake.conf | 6 +++---
 x11/qt3-tools/Makefile        | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'x11')

diff --git a/x11/qt3-libs/Makefile b/x11/qt3-libs/Makefile
index 552abf7ffe1..8aa098d9381 100644
--- a/x11/qt3-libs/Makefile
+++ b/x11/qt3-libs/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.48 2006/02/25 03:55:57 minskim Exp $
+# $NetBSD: Makefile,v 1.49 2006/03/03 00:53:54 minskim Exp $
 
 PKGNAME=	qt3-libs-${QTVERSION}
-PKGREVISION=	5
+PKGREVISION=	6
 MAINTAINER=	adam@NetBSD.org
 COMMENT=	C++ X GUI toolkit
 
diff --git a/x11/qt3-libs/files/qmake.conf b/x11/qt3-libs/files/qmake.conf
index 439b2415a93..52630355e70 100644
--- a/x11/qt3-libs/files/qmake.conf
+++ b/x11/qt3-libs/files/qmake.conf
@@ -1,5 +1,5 @@
-# $NetBSD: qmake.conf,v 1.18 2005/07/01 01:10:06 reed Exp $
-# $Id: qmake.conf,v 1.18 2005/07/01 01:10:06 reed Exp $
+# $NetBSD: qmake.conf,v 1.19 2006/03/03 00:53:54 minskim Exp $
+# $Id: qmake.conf,v 1.19 2006/03/03 00:53:54 minskim Exp $
 #
 # qmake configuration for netbsd-g++
 #
@@ -50,7 +50,7 @@ QMAKE_LINK_SHLIB_CMD    = \
 			$(patsubst %.so,%.la,$(DESTDIR)$(TARGET0)), \
 			$(patsubst %.so,%.la,$(DESTDIR)$(TARGET))) \
                 $(if $(TARGET0), \
-                        -version-info $(subst $(TARGET0).,,$(TARGET1)):$(subst $(TARGET1).,,$(TARGET2)), \
+                        -version-info `expr $(subst $(TARGET0).,,$(TARGET1)) + $(subst $(TARGET1).,,$(TARGET2))`:$(subst $(TARGET2).,,$(TARGET)):$(subst $(TARGET1).,,$(TARGET2)), \
                         -module -avoid-version) \
 		$(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS) \
 		-rpath $(if $(TARGET0), \
diff --git a/x11/qt3-tools/Makefile b/x11/qt3-tools/Makefile
index aeb6ca623a1..4f4b8e5f144 100644
--- a/x11/qt3-tools/Makefile
+++ b/x11/qt3-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2006/02/17 23:26:26 adam Exp $
+# $NetBSD: Makefile,v 1.42 2006/03/03 00:53:54 minskim Exp $
 
 .include "../../mk/bsd.prefs.mk"
 # XXX: hack - work round an ICE with GCC 3.3 on sparc
@@ -9,7 +9,7 @@ GCC_REQD+=		3.4
 .include "../../x11/qt3-libs/Makefile.common"
 
 PKGNAME=	qt3-tools-${QTVERSION}
-PKGREVISION=	3
+PKGREVISION=	4
 COMMENT=	QT GUI (WYSIWYG) builder and other tools
 
 CONFIGURE_ARGS+=	-I${QTDIR}/include \
-- 
cgit v1.2.3