diff options
Diffstat (limited to 'x11-toolkits/qt33')
| -rw-r--r-- | x11-toolkits/qt33/Makefile | 6 | ||||
| -rw-r--r-- | x11-toolkits/qt33/distinfo | 2 | ||||
| -rw-r--r-- | x11-toolkits/qt33/files/patch-aa | 12 | ||||
| -rw-r--r-- | x11-toolkits/qt33/files/patch-ag | 12 | ||||
| -rw-r--r-- | x11-toolkits/qt33/pkg-plist | 3 |
5 files changed, 11 insertions, 24 deletions
diff --git a/x11-toolkits/qt33/Makefile b/x11-toolkits/qt33/Makefile index 8f2145bec63e..82f0a06c8891 100644 --- a/x11-toolkits/qt33/Makefile +++ b/x11-toolkits/qt33/Makefile @@ -6,7 +6,7 @@ # PORTNAME?= qt -PORTVERSION?= 2.3.0 +PORTVERSION?= 2.3.1 CATEGORIES?= x11-toolkits MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ DISTNAME= qt-x11-${PORTVERSION} @@ -24,8 +24,8 @@ USE_X_PREFIX= yes USE_NEWGCC= yes HAS_CONFIGURE= yes CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \ - -system-libmng -thread -no-opengl \ - -I${LOCALBASE}/include -L${LOCALBASE}/lib + -system-libmng -thread -no-opengl -xft \ + -no-g++-exceptions -I${LOCALBASE}/include -L${LOCALBASE}/lib .if defined(QT_DEBUG) CONFIGURE_ARGS+= -debug diff --git a/x11-toolkits/qt33/distinfo b/x11-toolkits/qt33/distinfo index e539763ce446..d7f52ea83fbc 100644 --- a/x11-toolkits/qt33/distinfo +++ b/x11-toolkits/qt33/distinfo @@ -1 +1 @@ -MD5 (qt-x11-2.3.0.tar.gz) = f4993d952b9380a5009735aa1b7b9c03 +MD5 (qt-x11-2.3.1.tar.gz) = 358d6dfbcbdc353b65b5236866b0f3a7 diff --git a/x11-toolkits/qt33/files/patch-aa b/x11-toolkits/qt33/files/patch-aa index 695099386459..a58966744e42 100644 --- a/x11-toolkits/qt33/files/patch-aa +++ b/x11-toolkits/qt33/files/patch-aa @@ -27,16 +27,10 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -57,16 +57,14 @@ - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # - SYSCONF_LINK_SHLIB = g++ +@@ -60,1 +60,1 @@ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) - SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ - $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ - $(OBJECTS) $(OBJMOC) $(LIBS) && \ - mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ +@@ -65,6 +65,4 @@ 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; \ @@ -45,8 +39,6 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so - # Linking static libraries - # - Build the $(TARGET) library, eg. lib$(TARGET).a @@ -77,8 +75,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) diff --git a/x11-toolkits/qt33/files/patch-ag b/x11-toolkits/qt33/files/patch-ag index 7cc73dc21a23..ba5e83f30d70 100644 --- a/x11-toolkits/qt33/files/patch-ag +++ b/x11-toolkits/qt33/files/patch-ag @@ -27,16 +27,10 @@ # UI compiler SYSCONF_UIC = $(QTDIR)/bin/uic -@@ -57,16 +57,14 @@ - # - Usually needs to incorporate $(VER_MAJ), $(VER_MIN) and $(VER_PATCH) - # - SYSCONF_LINK_SHLIB = g++ +@@ -60,1 +60,1 @@ -SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ).$(VER_MIN).$(VER_PATCH) +SYSCONF_LINK_TARGET_SHARED = lib$(TARGET).so.$(VER_MAJ) - SYSCONF_LINK_LIB_SHARED = $(SYSCONF_LINK_SHLIB) -shared \ - $(LFLAGS) -o $(SYSCONF_LINK_TARGET_SHARED) \ - $(OBJECTS) $(OBJMOC) $(LIBS) && \ - mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \ +@@ -65,6 +65,4 @@ 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; \ @@ -45,8 +39,6 @@ + rm -f lib$(TARGET).so;\ + ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so - # Linking static libraries - # - Build the $(TARGET) library, eg. lib$(TARGET).a @@ -77,8 +75,8 @@ SYSCONF_LINK_LIB_STATIC = rm -f $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) ; \ $(SYSCONF_AR) $(DESTDIR)$(SYSCONF_LINK_TARGET_STATIC) $(OBJECTS) $(OBJMOC) diff --git a/x11-toolkits/qt33/pkg-plist b/x11-toolkits/qt33/pkg-plist index 2b57cd177e28..59ed9b3dfbc1 100644 --- a/x11-toolkits/qt33/pkg-plist +++ b/x11-toolkits/qt33/pkg-plist @@ -431,6 +431,7 @@ share/doc/qt2/html/objecttrees.html share/doc/qt2/html/opengl.html share/doc/qt2/html/organizers.html share/doc/qt2/html/palette.png +share/doc/qt2/html/performance-qws.html share/doc/qt2/html/picture-picture-cpp.html share/doc/qt2/html/pictures.html share/doc/qt2/html/pnglogo.png @@ -1401,6 +1402,8 @@ share/doc/qt2/html/qwsmousehandler-members.html share/doc/qt2/html/qwsmousehandler.html share/doc/qt2/html/qwsserver-members.html share/doc/qt2/html/qwsserver.html +share/doc/qt2/html/qwswindow-members.html +share/doc/qt2/html/qwswindow.html share/doc/qt2/html/qxml-h.html share/doc/qt2/html/qxmlattributes-members.html share/doc/qt2/html/qxmlattributes.html |