summaryrefslogtreecommitdiff
path: root/graphics
diff options
context:
space:
mode:
authorMichael Nottebrock <lofi@FreeBSD.org>2007-07-16 10:12:15 +0000
committerMichael Nottebrock <lofi@FreeBSD.org>2007-07-16 10:12:15 +0000
commit8bd00266dc1b89a8a7a9d6170d1d895ef285c905 (patch)
tree78e6b0d3b242b999541f0e267c681933f7c9bc9d /graphics
parentMake EMACS_PORT_NAME overridable. (diff)
Update to Qt 4.3.0, introduce bsd.qt.mk.
Approved by: portmgr (bsd.port.mk changes)
Notes
Notes: svn path=/head/; revision=195715
Diffstat (limited to 'graphics')
-rw-r--r--graphics/poppler/Makefile1
-rw-r--r--graphics/qt4-iconengines/Makefile25
-rw-r--r--graphics/qt4-iconengines/distinfo6
-rw-r--r--graphics/qt4-imageformats/Makefile30
-rw-r--r--graphics/qt4-imageformats/distinfo6
-rw-r--r--graphics/qt4-imageformats/pkg-plist2
-rw-r--r--graphics/qt4-pixeltool/Makefile27
-rw-r--r--graphics/qt4-pixeltool/distinfo6
-rw-r--r--graphics/qt4-svg/Makefile30
-rw-r--r--graphics/qt4-svg/distinfo6
-rw-r--r--graphics/qt4-svg/pkg-plist10
11 files changed, 51 insertions, 98 deletions
diff --git a/graphics/poppler/Makefile b/graphics/poppler/Makefile
index ada959b36843..72b0680b6a32 100644
--- a/graphics/poppler/Makefile
+++ b/graphics/poppler/Makefile
@@ -61,7 +61,6 @@ USE_QT_VER+= 4
QT_COMPONENTS= gui corelib xml qtestlib
#BUILD_WRKSRC= ${WRKSRC}/qt4
INSTALL_WRKSRC= ${WRKSRC}/qt4
-.include "${PORTSDIR}/Mk/bsd.kde.mk"
.else
CONFIGURE_ARGS+=--disable-poppler-qt4
.endif
diff --git a/graphics/qt4-iconengines/Makefile b/graphics/qt4-iconengines/Makefile
index c93bdf1ba94e..8721d617a53d 100644
--- a/graphics/qt4-iconengines/Makefile
+++ b/graphics/qt4-iconengines/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= iconengines
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,26 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG icon engine plugin
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtSvg:${PORTSDIR}/graphics/qt4-svg \
- QtXml:${PORTSDIR}/textproc/qt4-xml
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui svg xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
-
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} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/graphics/qt4-iconengines/distinfo b/graphics/qt4-iconengines/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-iconengines/distinfo
+++ b/graphics/qt4-iconengines/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-imageformats/Makefile b/graphics/qt4-imageformats/Makefile
index 0fd8f096b6a8..0598124b8063 100644
--- a/graphics/qt4-imageformats/Makefile
+++ b/graphics/qt4-imageformats/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= imageformats
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,28 +18,18 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt imageformat plugins for GIF, JPEG, MNG and SVG
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- rcc:${PORTSDIR}/devel/qt4-rcc
-LIB_DEPENDS= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtSvg:${PORTSDIR}/graphics/qt4-svg \
- QtXml:${PORTSDIR}/textproc/qt4-xml \
- jpeg:${PORTSDIR}/graphics/jpeg
+LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \
+ mng:${PORTSDIR}/graphics/libmng \
+ png:${PORTSDIR}/graphics/png \
+ tiff:${PORTSDIR}/graphics/tiff
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc rcc corelib gui svg xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
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} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/graphics/qt4-imageformats/distinfo b/graphics/qt4-imageformats/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-imageformats/distinfo
+++ b/graphics/qt4-imageformats/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-imageformats/pkg-plist b/graphics/qt4-imageformats/pkg-plist
index 80f0c38e7f48..4f61b248e9a8 100644
--- a/graphics/qt4-imageformats/pkg-plist
+++ b/graphics/qt4-imageformats/pkg-plist
@@ -6,4 +6,6 @@ lib/plugins/imageformats/libqmng.so
lib/plugins/imageformats/libqmng.so.debug
lib/plugins/imageformats/libqsvg.so
lib/plugins/imageformats/libqsvg.so.debug
+lib/plugins/imageformats/libqtiff.so
+lib/plugins/imageformats/libqtiff.so.debug
@dirrm lib/plugins/imageformats
diff --git a/graphics/qt4-pixeltool/Makefile b/graphics/qt4-pixeltool/Makefile
index 095dc633f8b4..bd8fe5ff3a64 100644
--- a/graphics/qt4-pixeltool/Makefile
+++ b/graphics/qt4-pixeltool/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= pixeltool
-PORTVERSION= 4.2.3
-PORTREVISION= 1
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,28 +18,13 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt screen magnification utility
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4 \
- uic-qt4:${PORTSDIR}/devel/qt4-uic
-
-LIB_DEPENDS= QtAssistantClient:${PORTSDIR}/devel/qt4-libqtassistantclient \
- QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtNetwork:${PORTSDIR}/net/qt4-network
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc uic assistantclient corelib gui network
+QT_NONSTANDARD= yes
+QT_DIST= yes
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} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
diff --git a/graphics/qt4-pixeltool/distinfo b/graphics/qt4-pixeltool/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-pixeltool/distinfo
+++ b/graphics/qt4-pixeltool/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile
index af9a6cc27fd6..67b4ada6bb66 100644
--- a/graphics/qt4-svg/Makefile
+++ b/graphics/qt4-svg/Makefile
@@ -7,8 +7,8 @@
#
PORTNAME= svg
-PORTVERSION= 4.2.3
-PORTREVISION= 2
+PORTVERSION= ${QT4_VERSION}
+PORTREVISION=0
CATEGORIES?= graphics
MASTER_SITES= ${MASTER_SITE_QT}
PKGNAMEPREFIX= qt4-
@@ -18,26 +18,14 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Qt SVG library
-BUILD_DEPENDS= moc-qt4:${PORTSDIR}/devel/qt4-moc \
- qmake-qt4:${PORTSDIR}/devel/qmake4
-LIB_DEPENDS?= QtCore:${PORTSDIR}/devel/qt4-corelib \
- QtGui:${PORTSDIR}/x11-toolkits/qt4-gui \
- QtXml:${PORTSDIR}/textproc/qt4-xml
-
-CONFLICTS= linguist-0.* qt-2.* qt-3.0.* \
- qt-3.1.* qt-3.2.* qt-designer-2.* xfmail-1.5.[0-5] \
- xfmail-1.5.5_[1-2]
+USE_QT_VER= 4
+QT_COMPONENTS= qmake moc corelib gui xml
+QT_NONSTANDARD= yes
+QT_DIST= yes
HAS_CONFIGURE= yes
USE_LDCONFIG= 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} \
- -plugindir ${PREFIX}/lib/plugins -bindir ${PREFIX}/bin \
- -confirm-license
-
ALL_TARGET= first
CONFIGURE_ENV?= QTDIR=${WRKSRC} PATH=${WRKSRC}/bin:$$PATH
MAKE_ENV?= QTDIR=${WRKSRC} LD_LIBRARY_PATH=${WRKSRC}/lib \
@@ -77,11 +65,11 @@ pre-configure:
${LN} -sf ${LOCALBASE}/bin/moc-qt4 ${WRKSRC}/../../bin/moc
post-configure:
- ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtSvg.pc|${PREFIX}/libdata/pkgconfig/QtSvg.pc|g' \
- ${WRKSRC}/Makefile
+ ${REINPLACE_CMD} -e 's|${PREFIX}/lib/pkgconfig|${PREFIX}/libdata/pkgconfig|g' \
+ -e 's|.*$$(QMAKE).*||g' -e 's|(test -z.*||g' ${WRKSRC}/Makefile
${REINPLACE_CMD} -E -e 's|-L.[^[:space:]]*qt-x11-opensource.[^[:space:]]*lib||g' \
-E -e 's|(.*location=).*moc|\1${PREFIX}/bin/moc-qt4|g' \
-E -e 's|(.*location=).*uic|\1${PREFIX}/bin/uic-qt4|g' \
- ${WRKSRC}/../../lib/*Qt*
+ ${WRKSRC}/../../lib/pkgconfig/*Qt*
.include <bsd.port.post.mk>
diff --git a/graphics/qt4-svg/distinfo b/graphics/qt4-svg/distinfo
index 48b91bd5d5e3..8fb631a2787d 100644
--- a/graphics/qt4-svg/distinfo
+++ b/graphics/qt4-svg/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 13f12bf58a32ebf15837fcd605cb3c99
-SHA256 (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = c163e72cb002435d1d261a47acdcb23e59c10e4263f983a5f2c2d2ca40ede75b
-SIZE (KDE/qt-x11-opensource-src-4.2.3.tar.gz) = 37635710
+MD5 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 8012acea71b35c18247bd92c4721589d
+SHA256 (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = abc37774d327a9b1d1d35e223f014c7e92168cd6c7baf66156badca68f8f1440
+SIZE (KDE/qt-x11-opensource-src-4.3.0.tar.gz) = 41955515
diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist
index 8acbce3e0946..7699fb340b95 100644
--- a/graphics/qt4-svg/pkg-plist
+++ b/graphics/qt4-svg/pkg-plist
@@ -1,20 +1,22 @@
include/Qt/QtSvg
include/Qt/qgraphicssvgitem.h
+include/Qt/qsvggenerator.h
include/Qt/qsvgrenderer.h
include/Qt/qsvgwidget.h
include/QtSvg/QGraphicsSvgItem
+include/QtSvg/QSvgGenerator
include/QtSvg/QSvgRenderer
include/QtSvg/QSvgWidget
include/QtSvg/QtSvg
include/QtSvg/qgraphicssvgitem.h
+include/QtSvg/qsvggenerator.h
include/QtSvg/qsvgrenderer.h
include/QtSvg/qsvgwidget.h
-libdata/pkgconfig/QtSvg.pc
lib/libQtSvg.la
lib/libQtSvg.prl
lib/libQtSvg.so
lib/libQtSvg.so.4
-lib/libQtSvg.so.4.2
-lib/libQtSvg.so.4.2.3
-lib/libQtSvg.so.4.2.3.debug
+lib/libQtSvg.so.4.3
+lib/libQtSvg.so.4.3.0
+libdata/pkgconfig/QtSvg.pc
@dirrm include/QtSvg
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-05 11:31:55 +0000