[pkgsrc/trunk]: pkgsrc/x11 Make qmake and libtool use the same library versio...

[minskim <minskim%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6365cd28b865
branches:  trunk
changeset: 509092:6365cd28b865
user:      minskim <minskim%pkgsrc.org@localhost>
date:      Fri Mar 03 00:53:54 2006 +0000

description:
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.

diffstat:

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

diffs (51 lines):

diff -r 2668e35d783b -r 6365cd28b865 x11/qt3-libs/Makefile
--- a/x11/qt3-libs/Makefile     Thu Mar 02 23:57:51 2006 +0000
+++ b/x11/qt3-libs/Makefile     Fri Mar 03 00:53:54 2006 +0000
@@ -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@localhost
 COMMENT=       C++ X GUI toolkit
 
diff -r 2668e35d783b -r 6365cd28b865 x11/qt3-libs/files/qmake.conf
--- a/x11/qt3-libs/files/qmake.conf     Thu Mar 02 23:57:51 2006 +0000
+++ b/x11/qt3-libs/files/qmake.conf     Fri Mar 03 00:53:54 2006 +0000
@@ -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 @@
                        $(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 -r 2668e35d783b -r 6365cd28b865 x11/qt3-tools/Makefile
--- a/x11/qt3-tools/Makefile    Thu Mar 02 23:57:51 2006 +0000
+++ b/x11/qt3-tools/Makefile    Fri Mar 03 00:53:54 2006 +0000
@@ -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 @@
 .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 \