aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--Mk/bsd.kde.mk6
-rw-r--r--Mk/bsd.kde4.mk6
-rw-r--r--accessibility/qt4-accessible/Makefile3
-rw-r--r--chinese/Makefile1
-rw-r--r--chinese/qt4-codecs-tw/Makefile (renamed from misc/qt4-codecs-tw/Makefile)2
-rw-r--r--chinese/qt4-codecs-tw/distinfo (renamed from misc/qt4-codecs-tw/distinfo)0
-rw-r--r--chinese/qt4-codecs-tw/pkg-descr (renamed from misc/qt4-codecs-tw/pkg-descr)0
-rw-r--r--chinese/qt4-codecs-tw/pkg-plist (renamed from misc/qt4-codecs-tw/pkg-plist)0
-rw-r--r--devel/dbus-qt4/Makefile3
-rw-r--r--devel/qt4-assistant/Makefile3
-rw-r--r--devel/qt4-corelib/Makefile3
-rw-r--r--devel/qt4-designer/Makefile3
-rw-r--r--devel/qt4-libqtassistantclient/Makefile3
-rw-r--r--devel/qt4-linguist/Makefile3
-rw-r--r--devel/qt4-qt3support/Makefile3
-rw-r--r--devel/qt4-qvfb/Makefile3
-rw-r--r--devel/qt4-uic3/Makefile3
-rw-r--r--devel/qt4/Makefile2
-rw-r--r--graphics/qt4-iconengines/Makefile3
-rw-r--r--graphics/qt4-imageformats/Makefile3
-rw-r--r--graphics/qt4-pixeltool/Makefile3
-rw-r--r--graphics/qt4-svg/Makefile3
-rw-r--r--misc/Makefile1
-rw-r--r--misc/qt4-qtconfig/Makefile2
-rw-r--r--misc/qt4-qtdemo/Makefile3
-rw-r--r--x11-toolkits/qt4-gui/Makefile1
-rw-r--r--x11/qt4-inputmethods/Makefile3
-rw-r--r--x11/qt4-opengl/Makefile3
29 files changed, 46 insertions, 27 deletions
diff --git a/MOVED b/MOVED
index 6ff4a56721cd..dea3cfb6b4d1 100644
--- a/MOVED
+++ b/MOVED
@@ -2798,3 +2798,4 @@ textproc/p5-FreeBSD-Ports|ports-mgmt/p5-FreeBSD-Ports|2007-02-05|Moved to a new
sysutils/pkg_replace|ports-mgmt/pkg_replace|2007-02-05|Moved to a new category
archivers/py-bzip2||2007-02-05|Included with all current python versions in ports tree
devel/py-logging||2007-02-05|Included with all current python versions in ports tree
+misc/qt4-codecs-tw|chinese/qt4-codecs-tw|2007-02-06|Accidentally added to wrong category
diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index 111196deed5f..e93ba63f7840 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -153,8 +153,8 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
--with-qt-libraries=${QT_PREFIX}/lib \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC} CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
- QMAKE="${QMAKE} QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+ QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
.endif # !defined(QT_NONSTANDARD)
@@ -172,7 +172,7 @@ assistant_DEPENDS= devel/qt4-assistant
codecs-cn_DEPENDS= chinese/qt4-codecs-cn
codecs-jp_DEPENDS= japanese/qt4-codecs-jp
codecs-kr_DEPENDS= korean/qt4-codecs-kr
-codecs-tw_DEPENDS= misc/qt4-codecs-tw
+codecs-tw_DEPENDS= chinese/qt4-codecs-tw
corelib_DEPENDS= devel/qt4-corelib
designer_DEPENDS= devel/qt4-designer
doc_DEPENDS= misc/qt4-doc
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index 111196deed5f..e93ba63f7840 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -153,8 +153,8 @@ CONFIGURE_ARGS+=--with-qt-includes=${QT_PREFIX}/include \
--with-qt-libraries=${QT_PREFIX}/lib \
--with-extra-libs=${LOCALBASE}/lib \
--with-extra-includes=${LOCALBASE}/include
-CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC} CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
- QMAKE="${QMAKE} QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
+CONFIGURE_ENV+= MOC="${MOC}" UIC="${UIC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGLIBS}" \
+ QMAKE="${QMAKE}" QMAKESPEC="${QMAKESPEC}" QTDIR="${QT_PREFIX}" KDEDIR="${KDE_PREFIX}"
MAKE_ENV+= QMAKESPEC="${QMAKESPEC}"
.endif # !defined(QT_NONSTANDARD)
@@ -172,7 +172,7 @@ assistant_DEPENDS= devel/qt4-assistant
codecs-cn_DEPENDS= chinese/qt4-codecs-cn
codecs-jp_DEPENDS= japanese/qt4-codecs-jp
codecs-kr_DEPENDS= korean/qt4-codecs-kr
-codecs-tw_DEPENDS= misc/qt4-codecs-tw
+codecs-tw_DEPENDS= chinese/qt4-codecs-tw
corelib_DEPENDS= devel/qt4-corelib
designer_DEPENDS= devel/qt4-designer
doc_DEPENDS= misc/qt4-doc
diff --git a/accessibility/qt4-accessible/Makefile b/accessibility/qt4-accessible/Makefile
index 4c25454ad228..0ddce4375499 100644
--- a/accessibility/qt4-accessible/Makefile
+++ b/accessibility/qt4-accessible/Makefile
@@ -8,6 +8,7 @@
PORTNAME= accessible
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= accessibility ipv6
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -34,7 +35,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
- -qt-gif -release -system-libjpeg -system-libpng \
+ -qt-gif -release -system-libjpeg -system-libpng -no-sm \
-system-zlib -prefix ${PREFIX} -plugindir ${PREFIX}/lib/plugins \
-bindir ${PREFIX}/bin -confirm-license
diff --git a/chinese/Makefile b/chinese/Makefile
index b90ed0023d16..6a7e5f492562 100644
--- a/chinese/Makefile
+++ b/chinese/Makefile
@@ -110,6 +110,7 @@
SUBDIR += pyDict
SUBDIR += qe
SUBDIR += qt4-codecs-cn
+ SUBDIR += qt4-codecs-tw
SUBDIR += qterm
SUBDIR += reciteword
SUBDIR += scim-chewing
diff --git a/misc/qt4-codecs-tw/Makefile b/chinese/qt4-codecs-tw/Makefile
index 0f59b769b719..659ffad30e89 100644
--- a/misc/qt4-codecs-tw/Makefile
+++ b/chinese/qt4-codecs-tw/Makefile
@@ -8,7 +8,7 @@
PORTNAME= codecs
PORTVERSION= 4.2.2
-CATEGORIES?= misc
+CATEGORIES?= chinese
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
PKGNAMESUFFIX= -tw
diff --git a/misc/qt4-codecs-tw/distinfo b/chinese/qt4-codecs-tw/distinfo
index 5f51cf7b1256..5f51cf7b1256 100644
--- a/misc/qt4-codecs-tw/distinfo
+++ b/chinese/qt4-codecs-tw/distinfo
diff --git a/misc/qt4-codecs-tw/pkg-descr b/chinese/qt4-codecs-tw/pkg-descr
index efc79b9aaf24..efc79b9aaf24 100644
--- a/misc/qt4-codecs-tw/pkg-descr
+++ b/chinese/qt4-codecs-tw/pkg-descr
diff --git a/misc/qt4-codecs-tw/pkg-plist b/chinese/qt4-codecs-tw/pkg-plist
index 86cff7bf6e0a..86cff7bf6e0a 100644
--- a/misc/qt4-codecs-tw/pkg-plist
+++ b/chinese/qt4-codecs-tw/pkg-plist
diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile
index e6f374bced24..3e697fd48345 100644
--- a/devel/dbus-qt4/Makefile
+++ b/devel/dbus-qt4/Makefile
@@ -8,6 +8,7 @@
PORTNAME= dbus
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMESUFFIX= -qt4
@@ -34,7 +35,7 @@ NO_FILTER_SHLIBS=yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -system-nas-sound -prefix ${PREFIX} \
+ -system-zlib -system-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin -v \
-no-nas-sound -confirm-license
diff --git a/devel/qt4-assistant/Makefile b/devel/qt4-assistant/Makefile
index d08c002cb060..5a1155384658 100644
--- a/devel/qt4-assistant/Makefile
+++ b/devel/qt4-assistant/Makefile
@@ -8,6 +8,7 @@
PORTNAME= assistant
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -38,7 +39,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license -no-separate-debug-info
diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile
index 8933c729a5d5..c83018950d77 100644
--- a/devel/qt4-corelib/Makefile
+++ b/devel/qt4-corelib/Makefile
@@ -8,6 +8,7 @@
PORTNAME= corelib
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= devel
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -32,7 +33,7 @@ NO_FILTER_SHLIBS=yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -confirm-license \
+ -system-zlib -no-nas-sound -no-sm -confirm-license \
-prefix ${PREFIX} \
-docdir ${PREFIX}/share/doc/qt4 \
-headerdir ${PREFIX}/include \
diff --git a/devel/qt4-designer/Makefile b/devel/qt4-designer/Makefile
index 13216518044d..58706e479f4e 100644
--- a/devel/qt4-designer/Makefile
+++ b/devel/qt4-designer/Makefile
@@ -8,6 +8,7 @@
PORTNAME= designer
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -40,7 +41,7 @@ NO_FILTER_SHLIBS=yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm\
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/devel/qt4-libqtassistantclient/Makefile b/devel/qt4-libqtassistantclient/Makefile
index 78a4e29d9c22..2b35d42d62ca 100644
--- a/devel/qt4-libqtassistantclient/Makefile
+++ b/devel/qt4-libqtassistantclient/Makefile
@@ -8,6 +8,7 @@
PORTNAME= libQtAssistantClient
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -35,7 +36,7 @@ NO_FILTER_SHLIBS=yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/devel/qt4-linguist/Makefile b/devel/qt4-linguist/Makefile
index 6d7ee4a49309..8effdb5d7bcc 100644
--- a/devel/qt4-linguist/Makefile
+++ b/devel/qt4-linguist/Makefile
@@ -8,6 +8,7 @@
PORTNAME= linguist
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -36,7 +37,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/devel/qt4-qt3support/Makefile b/devel/qt4-qt3support/Makefile
index bfe28bc7f161..5146afe5f455 100644
--- a/devel/qt4-qt3support/Makefile
+++ b/devel/qt4-qt3support/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qt3support
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= devel x11-toolkits
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -37,7 +38,7 @@ USE_XLIB= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/devel/qt4-qvfb/Makefile b/devel/qt4-qvfb/Makefile
index 70e30c7355e9..a5cfc1bbcd29 100644
--- a/devel/qt4-qvfb/Makefile
+++ b/devel/qt4-qvfb/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qvfb
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -34,7 +35,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/devel/qt4-uic3/Makefile b/devel/qt4-uic3/Makefile
index dc99fd76d0c3..61fa1914fe4f 100644
--- a/devel/qt4-uic3/Makefile
+++ b/devel/qt4-uic3/Makefile
@@ -8,6 +8,7 @@
PORTNAME= uic3
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits ipv6
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -34,7 +35,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/devel/qt4/Makefile b/devel/qt4/Makefile
index 262ec9b24e63..6f14375c9c4b 100644
--- a/devel/qt4/Makefile
+++ b/devel/qt4/Makefile
@@ -19,6 +19,7 @@ OPTIONS= SQL_PLUGINS "Database connectivity plugins for QtSql" off
RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so:${PORTSDIR}/accessibility/qt4-accessible \
${LOCALBASE}/lib/plugins/codecs/libqcncodecs.so:${PORTSDIR}/chinese/qt4-codecs-cn \
+ ${LOCALBASE}/lib/plugins/codecs/libqtwcodecs.so:${PORTSDIR}/chinese/qt4-codecs-tw \
${LOCALBASE}/lib/libQtSql.so:${PORTSDIR}/databases/qt4-sql \
qdbus:${PORTSDIR}/devel/dbus-qt4 \
qmake-qt4:${PORTSDIR}/devel/qmake4 \
@@ -42,7 +43,6 @@ RUN_DEPENDS= ${LOCALBASE}/lib/plugins/accessible/libqtaccessiblecompatwidgets.so
${LOCALBASE}/lib/plugins/codecs/libqjpcodecs.so:${PORTSDIR}/japanese/qt4-codecs-jp \
${LOCALBASE}/lib/plugins/codecs/libqkrcodecs.so:${PORTSDIR}/korean/qt4-codecs-kr \
${LOCALBASE}/bin/qtconfig:${PORTSDIR}/misc/qt4-qtconfig \
- ${LOCALBASE}/lib/plugins/codecs/libqtwcodecs.so:${PORTSDIR}/misc/qt4-codecs-tw \
${LOCALBASE}/lib/libQtNetwork.so:${PORTSDIR}/net/qt4-network \
${LOCALBASE}/lib/libQtXml.so:${PORTSDIR}/textproc/qt4-xml \
${LOCALBASE}/lib/libQtOpenGL.so:${PORTSDIR}/x11/qt4-opengl \
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index 8e1f9d73079d..ccb43103af3a 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -8,6 +8,7 @@
PORTNAME= iconengines
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -33,7 +34,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
+ -system-zlib -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 369715d460f5..922851cd2d00 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -8,6 +8,7 @@
PORTNAME= imageformats
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -35,7 +36,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
+ -system-zlib -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 32acdf57a61e..1a759d30ed4e 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -8,6 +8,7 @@
PORTNAME= pixeltool
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -35,7 +36,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index d5a0b9c43afe..cc9f77c965b1 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -8,6 +8,7 @@
PORTNAME= svg
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -34,7 +35,7 @@ NO_FILTER_SHLIBS=yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/misc/Makefile b/misc/Makefile
index f9b1cb97e8fc..ca19169a2832 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -397,7 +397,6 @@
SUBDIR += quick-lounge-applet
SUBDIR += quotes
SUBDIR += quranref
- SUBDIR += qt4-codecs-tw
SUBDIR += qt4-qtdemo
SUBDIR += qt4-doc
SUBDIR += qt4-qtconfig
diff --git a/misc/qt4-qtconfig/Makefile b/misc/qt4-qtconfig/Makefile
index 3f8afe40404c..7d927f449d12 100644
--- a/misc/qt4-qtconfig/Makefile
+++ b/misc/qt4-qtconfig/Makefile
@@ -33,7 +33,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/misc/qt4-qtdemo/Makefile b/misc/qt4-qtdemo/Makefile
index e9ef5911d445..7e6e4fce21e0 100644
--- a/misc/qt4-qtdemo/Makefile
+++ b/misc/qt4-qtdemo/Makefile
@@ -8,6 +8,7 @@
PORTNAME= qtdemo
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= misc
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -42,7 +43,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -no-nas-sound -prefix ${PREFIX} \
+ -system-zlib -no-nas-sound -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/x11-toolkits/qt4-gui/Makefile b/x11-toolkits/qt4-gui/Makefile
index 15538d92a5f7..cb1583eeb7dd 100644
--- a/x11-toolkits/qt4-gui/Makefile
+++ b/x11-toolkits/qt4-gui/Makefile
@@ -8,6 +8,7 @@
PORTNAME= gui
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
diff --git a/x11/qt4-inputmethods/Makefile b/x11/qt4-inputmethods/Makefile
index 6aebf51e26cf..298ec2ba3b07 100644
--- a/x11/qt4-inputmethods/Makefile
+++ b/x11/qt4-inputmethods/Makefile
@@ -8,6 +8,7 @@
PORTNAME= inputmethods
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -31,7 +32,7 @@ HAS_CONFIGURE= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
+ -system-zlib -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-confirm-license
diff --git a/x11/qt4-opengl/Makefile b/x11/qt4-opengl/Makefile
index cc2e519581d4..951f79e8dfe9 100644
--- a/x11/qt4-opengl/Makefile
+++ b/x11/qt4-opengl/Makefile
@@ -8,6 +8,7 @@
PORTNAME= opengl
PORTVERSION= 4.2.2
+PORTREVISION= 1
CATEGORIES?= x11-toolkits
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -34,7 +35,7 @@ USE_XLIB= yes
CONFIGURE_ARGS= -fast -no-exceptions \
-platform ${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
-qt-gif -release -system-libjpeg -system-libpng \
- -system-zlib -prefix ${PREFIX} \
+ -system-zlib -prefix ${PREFIX} -no-sm \
-plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
-no-nas-sound -confirm-license