[pkgsrc/trunk]: pkgsrc/x11/qt2-libs Use the FreeBSD rules for DragonFly as we...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/e2afca2445ef
branches:  trunk
changeset: 500262:e2afca2445ef
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Tue Oct 04 19:34:36 2005 +0000

description:
Use the FreeBSD rules for DragonFly as well, just like Qt 3.3 does.
Streamline FreeBSD/DragonFly config handling with NetBSD, this should
allow Xorg from pkgsrc to work properly.

Discussed with jlam@, but not tested on FreeBSD.
Silence from freebsd-pkg-people@.

diffstat:

 x11/qt2-libs/Makefile.common  |   10 ++-
 x11/qt2-libs/distinfo         |    5 +-
 x11/qt2-libs/patches/patch-ao |   13 ++++
 x11/qt2-libs/patches/patch-ap |  115 ++++++++++++++++++++++++++++++++++++++++++
 x11/qt2-libs/patches/patch-aq |   13 ++++
 5 files changed, 152 insertions(+), 4 deletions(-)

diffs (205 lines):

diff -r b28e4ccf2f4f -r e2afca2445ef x11/qt2-libs/Makefile.common
--- a/x11/qt2-libs/Makefile.common      Tue Oct 04 19:23:39 2005 +0000
+++ b/x11/qt2-libs/Makefile.common      Tue Oct 04 19:34:36 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/06/01 18:03:30 jlam Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/10/04 19:34:36 joerg Exp $
 #
 
 DISTNAME=      qt-x11-${QTVERSION}
@@ -37,6 +37,8 @@
 
 .if ${OPSYS} == "SunOS"
 CONFIGURE_ARGS+=       -platform solaris-g++
+.elif ${OPSYS} == "DragonFly"
+CONFIGURE_ARGS+=       -xft -platform freebsd-g++
 .endif
 
 FILES_SUBST=           BUILDLINK_DIR=${BUILDLINK_DIR}
@@ -50,13 +52,15 @@
 
 post-extract:
        cd ${WRKSRC}/configs;                                           \
-       for file in netbsd-g++-static solaris-g++-static; do            \
+       for file in netbsd-g++-static solaris-g++-static                \
+           freebsd-g++-static; do                                      \
                ${MV} -f $${file} $${file}.in;                          \
        done
 
 post-patch:
        cd ${WRKSRC}/configs;                                           \
-       for file in netbsd-g++-static solaris-g++-static; do            \
+       for file in netbsd-g++-static solaris-g++-static                \
+           freebsd-g++-static; do                                      \
                ${SED} ${FILES_SUBST_SED} $${file}.in > $${file};       \
        done
 
diff -r b28e4ccf2f4f -r e2afca2445ef x11/qt2-libs/distinfo
--- a/x11/qt2-libs/distinfo     Tue Oct 04 19:23:39 2005 +0000
+++ b/x11/qt2-libs/distinfo     Tue Oct 04 19:34:36 2005 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.14 2005/02/23 17:36:19 wiz Exp $
+$NetBSD: distinfo,v 1.15 2005/10/04 19:34:36 joerg Exp $
 
 SHA1 (qt-x11-2.3.1.tar.gz) = f1403700fe80fbfb125ec84731d0dfe9c576c823
 RMD160 (qt-x11-2.3.1.tar.gz) = b579018cfa5782d2f8b94b0846c35bce3a09dfa4
@@ -16,3 +16,6 @@
 SHA1 (patch-ak) = 3eac0d921f3535231aab9ff1f6738f9541b8b564
 SHA1 (patch-al) = 32f6b13393b115c56a4ca75f62f5916034189174
 SHA1 (patch-am) = ebbc184b095e2adcf81461472f4723d515167a9e
+SHA1 (patch-ao) = 9e9be92054f4b73c973f63d4a8524ac30a4bbb44
+SHA1 (patch-ap) = b1245b7aab4b8dd5bd19892457ffb16cc182c1ca
+SHA1 (patch-aq) = cf7ece73766d43f68343f45b984516bae21822ad
diff -r b28e4ccf2f4f -r e2afca2445ef x11/qt2-libs/patches/patch-ao
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt2-libs/patches/patch-ao     Tue Oct 04 19:34:36 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2005/10/04 19:34:36 joerg Exp $
+
+--- src/tools/qglobal.h.orig   2005-07-30 22:20:46.000000000 +0000
++++ src/tools/qglobal.h
+@@ -99,7 +99,7 @@
+ #define _OS_RELIANT_
+ #elif defined(linux) || defined(__linux) || defined(__linux__)
+ #define _OS_LINUX_
+-#elif defined(__FreeBSD__)
++#elif defined(__FreeBSD__) || defined(__DragonFly__)
+ #define _OS_FREEBSD_
+ #elif defined(__NetBSD__)
+ #define _OS_NETBSD_
diff -r b28e4ccf2f4f -r e2afca2445ef x11/qt2-libs/patches/patch-ap
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt2-libs/patches/patch-ap     Tue Oct 04 19:34:36 2005 +0000
@@ -0,0 +1,115 @@
+$NetBSD: patch-ap,v 1.1 2005/10/04 19:34:36 joerg Exp $
+
+--- configs/freebsd-g++-static.in.orig 2005-07-30 22:54:44.000000000 +0000
++++ configs/freebsd-g++-static.in
+@@ -1,44 +1,42 @@
+ # Compiling
+ INTERFACE_DECL_PATH   = .
+-SYSCONF_CXX           = g++
+-SYSCONF_CC            = gcc
++SYSCONF_CXX           = c++
++SYSCONF_CC            = cc
++SYSCONF_CXX_LIB               = ${LIBTOOL} --mode=compile c++
+ DASHCROSS             = 
+ 
+ # Compiling with support libraries
+-SYSCONF_CXXFLAGS_X11  = -I/usr/X11R6/include
++SYSCONF_CXXFLAGS_X11  = -I@X11BASE@/include
+ SYSCONF_CXXFLAGS_QT   = -I$(QTDIR)/include
+-SYSCONF_CXXFLAGS_OPENGL       = -I/usr/X11R6/include
++SYSCONF_CXXFLAGS_OPENGL       = -I@LOCALBASE@/include -I@X11BASE@/include
+ 
+ # Compiling YACC output
+ SYSCONF_CXXFLAGS_YACC     = -Wno-unused -Wno-parentheses
+ 
+ # Linking with support libraries
+-SYSCONF_RPATH_X11     = -Wl,-rpath,/usr/X11R6/lib
+-SYSCONF_RPATH_QT      = -Wl,-rpath,$(QTDIR)/lib
+-SYSCONF_RPATH_OPENGL  = -Wl,-rpath,/usr/X11R6/lib
++SYSCONF_RPATH_X11     = -Wl,-R@X11BASE@/lib
++SYSCONF_RPATH_QT      = -Wl,-R@QTDIR@/lib
++SYSCONF_RPATH_OPENGL  = -Wl,-R@X11BASE@/lib -Wl,-R@LOCALBASE@/lib
+ 
+ # Linking with support libraries
+ # X11
+-SYSCONF_LFLAGS_X11    = -L/usr/X11R6/lib
++SYSCONF_LFLAGS_X11    = -L@X11BASE@/lib
+ SYSCONF_LIBS_X11      = -lXext -lX11 -lm
+ # Qt, Qt+OpenGL
+ SYSCONF_LFLAGS_QT     = -L$(QTDIR)/lib
+ SYSCONF_LIBS_QT               = -lqt$(QT_THREAD_SUFFIX)
+ SYSCONF_LIBS_QT_OPENGL        = 
+ # OpenGL
+-SYSCONF_LFLAGS_OPENGL = -L/usr/X11R6/lib
++SYSCONF_LFLAGS_OPENGL = -L@LOCALBASE@/lib -L@X11BASE@/lib
+ SYSCONF_LIBS_OPENGL   = -lGLU -lGL -lXmu
+ # Yacc
+ SYSCONF_LIBS_YACC     = 
+ 
+ # Linking applications
+-SYSCONF_LINK          = g++
++SYSCONF_LINK          = $(LIBTOOL) --mode=link c++
+ SYSCONF_LFLAGS                = 
+ SYSCONF_LIBS          = 
+ 
+-# Link flags for shared objects
+-SYSCONF_LFLAGS_SHOBJ  = -shared
+-
+ # Flags for threading
+ SYSCONF_CFLAGS_THREAD = -pthread -D_THREAD_SAFE
+ SYSCONF_CXXFLAGS_THREAD       = -pthread -D_THREAD_SAFE
+@@ -51,43 +49,24 @@ SYSCONF_MOC                = $(QTDIR)/bin/moc
+ # UI compiler
+ SYSCONF_UIC           = $(QTDIR)/bin/uic
+ 
+-# Linking shared libraries
+-#   - Build the $(TARGET) library, eg. lib$(TARGET).so.2.2.2
++# Linking libtool libraries
++#   - Build the $(TARGET) library, eg. lib$(TARGET).la
+ #   - Place target in $(DESTDIR) - which has a trailing /
+ #   - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH)
+ #
+-SYSCONF_LINK_SHLIB    = g++
+-SYSCONF_LINK_TARGET_SHARED    = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH)
+-SYSCONF_LINK_LIB_SHARED       =  $(SYSCONF_LINK_SHLIB) -shared -Wl,-soname,lib$(TARGET).so.$(VER_MAJ) \
+-                                   $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \
+-                                   $(OBJECTS) $(OBJMOC) $(LIBS) && \
+-                               mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
+-                               cd $(DESTDIR) && \
+-                               rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN); \
+-                               ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
+-                               ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ); \
+-                               ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
++SYSCONF_LINK_TARGET   = lib$(TARGET).la
++SYSCONF_LINK_LIB      = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET); \
++      $(SYSCONF_LINK) $(LFLAGS) -rpath $(QTPREFIX)/lib \
++      -version-info $(VER_MAJ):$(VER_MIN) -o $(SYSCONF_LINK_TARGET) \
++      $(OBJECTS:.o=.lo) $(OBJMOC:.o=.lo) $(LIBS)
+ 
+-# Linking static libraries
+-#   - Build the $(TARGET) library, eg. lib$(TARGET).a
+-#   - Place target in $(DESTDIR) - which has a trailing /
+-#
+-SYSCONF_AR            = ar cqs
+-SYSCONF_LINK_TARGET_STATIC = lib$(TARGET).a
+-SYSCONF_LINK_LIB_STATIC       = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \
+-                               $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) 
+ # Compiling application source
+-SYSCONF_CXXFLAGS      = -pipe -fno-exceptions -O2
+-SYSCONF_CFLAGS                = -pipe -fno-exceptions -O2
+-SYSCONF_LINK_LIB      = $(SYSCONF_LINK_LIB_STATIC)
+-SYSCONF_LINK_TARGET   = $(SYSCONF_LINK_TARGET_STATIC)
++#SYSCONF_CXXFLAGS     = -O2
++#SYSCONF_CFLAGS               = -O2
+ # Compiling library source
+-SYSCONF_CXXFLAGS_LIB  =
+-SYSCONF_CFLAGS_LIB    =
++#SYSCONF_CXXFLAGS_LIB =
++#SYSCONF_CFLAGS_LIB   =
+ # Compiling shared-object source
+-SYSCONF_CXXFLAGS_SHOBJ        = -fPIC
+-SYSCONF_CFLAGS_SHOBJ  = -fPIC
+ # Linking Qt
+ SYSCONF_LIBS_QTLIB    = $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT)
+ # Linking Qt applications
+-SYSCONF_LIBS_QTAPP    = $(SYSCONF_LFLAGS_X11) $(SYSCONF_CXXFLAGS_X11) $(QT_LIBS_MT) $(QT_LIBS_OPT) $(SYSCONF_LIBS_X11)
diff -r b28e4ccf2f4f -r e2afca2445ef x11/qt2-libs/patches/patch-aq
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/qt2-libs/patches/patch-aq     Tue Oct 04 19:34:36 2005 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-aq,v 1.1 2005/10/04 19:34:36 joerg Exp $
+
+--- src/network/qsocketdevice_unix.cpp.orig    2005-07-30 23:19:35.000000000 +0000
++++ src/network/qsocketdevice_unix.cpp
+@@ -150,6 +150,8 @@ typedef unsigned long u_long;
+ #if defined(_OS_LINUX_) && defined(__GLIBC__) && ( __GLIBC__ >= 2 )
+ // new linux is Single Unix 1998, not old linux
+ #define SOCKLEN_T socklen_t
++#elif defined(__DragonFly__)
++#define SOCKLEN_T socklen_t
+ #elif defined(BSD4_4)
+ // BSD 4.4
+ #  if defined(_OS_FREEBSD_) && __FreeBSD_version < 400000