diff options
-rw-r--r-- | databases/qt4-sql/Makefile | 3 | ||||
-rw-r--r-- | databases/qt4-sql/pkg-plist | 2 | ||||
-rw-r--r-- | devel/dbus-qt4/Makefile | 6 | ||||
-rw-r--r-- | devel/dbus-qt4/pkg-plist | 2 | ||||
-rw-r--r-- | devel/qt4-corelib/Makefile | 4 | ||||
-rw-r--r-- | devel/qt4-corelib/pkg-plist | 2 | ||||
-rw-r--r-- | devel/qt4-qtestlib/Makefile | 5 | ||||
-rw-r--r-- | devel/qt4-qtestlib/pkg-plist | 2 | ||||
-rw-r--r-- | graphics/qt4-svg/Makefile | 4 | ||||
-rw-r--r-- | graphics/qt4-svg/pkg-plist | 2 | ||||
-rw-r--r-- | net/qt4-network/Makefile | 3 | ||||
-rw-r--r-- | net/qt4-network/pkg-plist | 2 | ||||
-rw-r--r-- | textproc/qt4-xml/Makefile | 3 | ||||
-rw-r--r-- | textproc/qt4-xml/pkg-plist | 2 |
14 files changed, 23 insertions, 19 deletions
diff --git a/databases/qt4-sql/Makefile b/databases/qt4-sql/Makefile index 285aebf752c5..16c3f8dee15e 100644 --- a/databases/qt4-sql/Makefile +++ b/databases/qt4-sql/Makefile @@ -8,6 +8,7 @@ PORTNAME= sql PORTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES?= databases MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -73,7 +74,7 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|local/lib/QtSql.pc|local/libdata/QtSql.pc|g' \ + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtSql.pc|${PREFIX}/libdata/pkgconfig/QtSql.pc|g' \ -e 's|(test -z.*||g' \ ${WRKSRC}/Makefile diff --git a/databases/qt4-sql/pkg-plist b/databases/qt4-sql/pkg-plist index 0dbf639fbad6..c8c1797ef943 100644 --- a/databases/qt4-sql/pkg-plist +++ b/databases/qt4-sql/pkg-plist @@ -75,5 +75,5 @@ lib/libQtSql.so lib/libQtSql.so.4 lib/libQtSql.so.4.2 lib/libQtSql.so.4.2.2 -libdata/QtSql.pc +libdata/pkgconfig/QtSql.pc @dirrm include/QtSql diff --git a/devel/dbus-qt4/Makefile b/devel/dbus-qt4/Makefile index f5a52a72d521..a1ca16acd9dd 100644 --- a/devel/dbus-qt4/Makefile +++ b/devel/dbus-qt4/Makefile @@ -8,7 +8,7 @@ PORTNAME= dbus PORTVERSION= 4.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMESUFFIX= -qt4 @@ -69,7 +69,7 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|local/lib/QtDBus.pc|local/libdata/QtDBus.pc|g' \ - ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtDBus.pc|${PREFIX}/libdata/pkgconfig/QtDBus.pc|g' \ + ${WRKSRC}/src/Makefile .include <bsd.port.post.mk> diff --git a/devel/dbus-qt4/pkg-plist b/devel/dbus-qt4/pkg-plist index 397a0a235721..7dd82f8512d4 100644 --- a/devel/dbus-qt4/pkg-plist +++ b/devel/dbus-qt4/pkg-plist @@ -32,7 +32,7 @@ include/QtDBus/qdbusmessage.h include/QtDBus/qdbusmetatype.h include/QtDBus/qdbusreply.h include/QtDBus/qdbusserver.h -lib/QtDBus.pc +libdata/pkgconfig/QtDBus.pc lib/libQtDBus.la lib/libQtDBus.prl lib/libQtDBus.so diff --git a/devel/qt4-corelib/Makefile b/devel/qt4-corelib/Makefile index c21e4460452f..5a69dc86bedb 100644 --- a/devel/qt4-corelib/Makefile +++ b/devel/qt4-corelib/Makefile @@ -8,7 +8,7 @@ PORTNAME= corelib PORTVERSION= 4.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -75,7 +75,7 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|local/lib/QtCore.pc|local/libdata/QtCore.pc|g' \ + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtCore.pc|${PREFIX}/libdata/pkgconfig/QtCore.pc|g' \ ${WRKSRC}/Makefile .if !defined(PKGNAMESUFFIX) diff --git a/devel/qt4-corelib/pkg-plist b/devel/qt4-corelib/pkg-plist index ca1d9e65ca7f..0c22090f0250 100644 --- a/devel/qt4-corelib/pkg-plist +++ b/devel/qt4-corelib/pkg-plist @@ -409,7 +409,7 @@ lib/libQtCore.so.4.2 lib/libQtCore.so.4.2.2 lib/libQtCore.so.4.2.2.debug lib/plugins/.keep_me -libdata/QtCore.pc +libdata/pkgconfig/QtCore.pc @dirrm lib/plugins @dirrm include/QtCore @dirrm include/Qt diff --git a/devel/qt4-qtestlib/Makefile b/devel/qt4-qtestlib/Makefile index 4bd1937da463..8d4b6d1eaa87 100644 --- a/devel/qt4-qtestlib/Makefile +++ b/devel/qt4-qtestlib/Makefile @@ -8,6 +8,7 @@ PORTNAME= qtestlib PORTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES?= devel MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -65,7 +66,7 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/qmake-qt4 ${WRKSRC}/../../bin/qmake ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|local/lib/QtTest.pc|local/libdata/QtTest.pc|g' \ - ${WRKSRC}/Makefile + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtTest.pc|${PREFIX}/libdata/pkgconfig/QtTest.pc|g' \ + ${WRKSRC}/src/Makefile .include <bsd.port.post.mk> diff --git a/devel/qt4-qtestlib/pkg-plist b/devel/qt4-qtestlib/pkg-plist index c9c446f3e2f1..c2d55bf78241 100644 --- a/devel/qt4-qtestlib/pkg-plist +++ b/devel/qt4-qtestlib/pkg-plist @@ -27,7 +27,7 @@ include/QtTest/qtestkeyboard.h include/QtTest/qtestmouse.h include/QtTest/qtestspontaneevent.h include/QtTest/qtestsystem.h -lib/QtTest.pc +libdata/pkgconfig/QtTest.pc lib/libQtTest.la lib/libQtTest.prl lib/libQtTest.so diff --git a/graphics/qt4-svg/Makefile b/graphics/qt4-svg/Makefile index c0ee4b340c72..f268b2d5f782 100644 --- a/graphics/qt4-svg/Makefile +++ b/graphics/qt4-svg/Makefile @@ -8,7 +8,7 @@ PORTNAME= svg PORTVERSION= 4.2.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES?= graphics MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -77,7 +77,7 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|local/lib/QtXml.pc|local/libdata/QtSvg.pc|g' \ + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtSvg.pc|${PREFIX}/libdata/pkgconfig/QtSvg.pc|g' \ ${WRKSRC}/Makefile .include <bsd.port.post.mk> diff --git a/graphics/qt4-svg/pkg-plist b/graphics/qt4-svg/pkg-plist index 118b5c108855..533a44b09ed8 100644 --- a/graphics/qt4-svg/pkg-plist +++ b/graphics/qt4-svg/pkg-plist @@ -9,7 +9,7 @@ include/QtSvg/QtSvg include/QtSvg/qgraphicssvgitem.h include/QtSvg/qsvgrenderer.h include/QtSvg/qsvgwidget.h -lib/QtSvg.pc +libdata/pkgconfig/QtSvg.pc lib/libQtSvg.la lib/libQtSvg.prl lib/libQtSvg.so diff --git a/net/qt4-network/Makefile b/net/qt4-network/Makefile index 0326d68128cc..e8b818498651 100644 --- a/net/qt4-network/Makefile +++ b/net/qt4-network/Makefile @@ -8,6 +8,7 @@ PORTNAME= network PORTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES?= net ipv6 MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -66,7 +67,7 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|local/lib/QtNetwork.pc|local/libdata/QtNetwork.pc|g' \ + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtNetwork.pc|${PREFIX}/libdata/pkgconfig/QtNetwork.pc|g' \ ${WRKSRC}/Makefile .include <bsd.port.post.mk> diff --git a/net/qt4-network/pkg-plist b/net/qt4-network/pkg-plist index eedd93867372..410d5a62f06b 100644 --- a/net/qt4-network/pkg-plist +++ b/net/qt4-network/pkg-plist @@ -46,5 +46,5 @@ lib/libQtNetwork.so.4 lib/libQtNetwork.so.4.2 lib/libQtNetwork.so.4.2.2 lib/libQtNetwork.so.4.2.2.debug -libdata/QtNetwork.pc +libdata/pkgconfig/QtNetwork.pc @dirrm include/QtNetwork diff --git a/textproc/qt4-xml/Makefile b/textproc/qt4-xml/Makefile index 3b36fe4131ac..4f79014745b3 100644 --- a/textproc/qt4-xml/Makefile +++ b/textproc/qt4-xml/Makefile @@ -8,6 +8,7 @@ PORTNAME= xml PORTVERSION= 4.2.2 +PORTREVISION= 1 CATEGORIES?= textproc MASTER_SITES= ${MASTER_SITE_QT} PKGNAMEPREFIX= qt4- @@ -67,7 +68,7 @@ pre-configure: ${LN} -sf ${LOCALBASE}/bin/moc4 ${WRKSRC}/../../bin/moc post-configure: - ${REINPLACE_CMD} -e 's|local/lib/QtXml.pc|local/libdata/QtXml.pc|g' \ + ${REINPLACE_CMD} -e 's|${PREFIX}/lib/QtXml.pc|${PREFIX}/libdata/pkgconfig/QtXml.pc|g' \ ${WRKSRC}/Makefile .include <bsd.port.post.mk> diff --git a/textproc/qt4-xml/pkg-plist b/textproc/qt4-xml/pkg-plist index 4daaf5cad837..6ae6ce53d78e 100644 --- a/textproc/qt4-xml/pkg-plist +++ b/textproc/qt4-xml/pkg-plist @@ -42,5 +42,5 @@ lib/libQtXml.so.4 lib/libQtXml.so.4.2 lib/libQtXml.so.4.2.2 lib/libQtXml.so.4.2.2.debug -libdata/QtXml.pc +libdata/pkgconfig/QtXml.pc @dirrm include/QtXml |