[Midnightbsd-cvs] mports [19842] trunk/misc: fix builds

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Aug 20 07:49:12 EDT 2015 

Revision: 19842
          http://svnweb.midnightbsd.org/mports/?rev=19842
Author:   laffer1
Date:     2015-08-20 07:49:11 -0400 (Thu, 20 Aug 2015)
Log Message:
-----------
fix builds

Modified Paths:
--------------
    trunk/misc/qt4-doc/Makefile
    trunk/misc/qt4-l10n/Makefile
    trunk/misc/qt4-l10n/pkg-plist
    trunk/misc/qt4-qtconfig/Makefile
    trunk/misc/qt4-qtdemo/Makefile

Removed Paths:
-------------
    trunk/misc/qt4-doc/distinfo
    trunk/misc/qt4-l10n/distinfo
    trunk/misc/qt4-qtconfig/distinfo
    trunk/misc/qt4-qtdemo/distinfo

Modified: trunk/misc/qt4-doc/Makefile
===================================================================
--- trunk/misc/qt4-doc/Makefile	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-doc/Makefile	2015-08-20 11:49:11 UTC (rev 19842)
@@ -2,7 +2,7 @@
 
 PORTNAME=	doc
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	misc
+CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org

Deleted: trunk/misc/qt4-doc/distinfo
===================================================================
--- trunk/misc/qt4-doc/distinfo	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-doc/distinfo	2015-08-20 11:49:11 UTC (rev 19842)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667

Modified: trunk/misc/qt4-l10n/Makefile
===================================================================
--- trunk/misc/qt4-l10n/Makefile	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-l10n/Makefile	2015-08-20 11:49:11 UTC (rev 19842)
@@ -8,9 +8,10 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Qt translations messages
+
 LICENSE=	gpl3
 
-USE_QT4=	linguist_build
+USE_QT4=	linguisttools_build
 QT_DIST=	yes
 
 EXTRACT_AFTER_ARGS+=	--include '${DISTNAME}/src/corelib' \

Deleted: trunk/misc/qt4-l10n/distinfo
===================================================================
--- trunk/misc/qt4-l10n/distinfo	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-l10n/distinfo	2015-08-20 11:49:11 UTC (rev 19842)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667

Modified: trunk/misc/qt4-l10n/pkg-plist
===================================================================
--- trunk/misc/qt4-l10n/pkg-plist	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-l10n/pkg-plist	2015-08-20 11:49:11 UTC (rev 19842)
@@ -97,5 +97,3 @@
 %%QT_L10NDIR%%/qvfb_uk.qm
 %%QT_L10NDIR%%/qvfb_zh_CN.qm
 %%QT_L10NDIR%%/qvfb_zh_TW.qm
- at dirrm %%QT_L10NDIR%%
- at dirrmtry %%QT_DATADIR%%

Modified: trunk/misc/qt4-qtconfig/Makefile
===================================================================
--- trunk/misc/qt4-qtconfig/Makefile	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-qtconfig/Makefile	2015-08-20 11:49:11 UTC (rev 19842)
@@ -14,9 +14,9 @@
 
 PHONON_DESC=	Multimedia via Phonon (implies GStreamer)
 
+USES=		pkgconfig
 USE_QT4=	qmake_build moc_build rcc_build uic_build \
-		dbus gui xml
-QT_NONSTANDARD=	yes
+		corelib dbus gui xml
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
@@ -53,8 +53,6 @@
 BUILD_WRKSRC=	${WRKSRC}/tools/${PORTNAME}
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 pre-configure:
 	${REINPLACE_CMD} -e 's|^TARGET.*|TARGET=qtconfig-qt4|g' \
 		${BUILD_WRKSRC}/${PORTNAME}.pro

Deleted: trunk/misc/qt4-qtconfig/distinfo
===================================================================
--- trunk/misc/qt4-qtconfig/distinfo	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-qtconfig/distinfo	2015-08-20 11:49:11 UTC (rev 19842)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 33b0e38ba4c54a0cf8a4be8ca5a4584f1c2e0adfecb57b21d9d1d267b0093270
-SIZE (KDE/qt-everywhere-opensource-src-4.8.4.tar.gz) = 236593028

Modified: trunk/misc/qt4-qtdemo/Makefile
===================================================================
--- trunk/misc/qt4-qtdemo/Makefile	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-qtdemo/Makefile	2015-08-20 11:49:11 UTC (rev 19842)
@@ -2,7 +2,8 @@
 
 PORTNAME=	qtdemo
 DISTVERSION=	${QT4_VERSION}
-CATEGORIES?=	misc
+PORTREVISION=	1
+CATEGORIES=	misc
 PKGNAMEPREFIX=	qt4-
 
 MAINTAINER=	ports at MidnightBSD.org
@@ -14,9 +15,8 @@
 USE_GSTREAMER=	yes
 USE_QT4=	qmake_build moc_build rcc_build uic_build corelib designer \
 		gui network opengl sql svg qtestlib xml imageformats_run dbus \
-		script webkit phonon help assistant_run phonon-gst scripttools \
+		script webkit phonon help assistant_run phonon-gst_run scripttools \
 		xmlpatterns multimedia
-QT_NONSTANDARD=	yes
 QT_DIST=	yes
 
 HAS_CONFIGURE=	yes
@@ -27,9 +27,10 @@
 		PATH=${WRKSRC}/bin:$$PATH
 
 # qtlogo.png is installed by qt4-gui
-DESKTOP_ENTRIES="Qt Examples and Demos" "${COMMENT}" \
-		"${LOCALBASE}/share/pixmaps/qtlogo.png" \
-		"${PREFIX}/bin/qtdemo" "Development;Qt;" true
+DESKTOP_ENTRIES="Qt 4 Examples and Demos" "" \
+		"${QT_PREFIX}/share/pixmaps/qtlogo.png" \
+		"${PREFIX}/${QT_BINDIR_REL}/qtdemo" \
+		"Development;Qt;" true
 
 DO_NOT_EXTRACT=	doc mkspecs qmake translations \
 		src/activeqt src/openvg src/s60installs src/s60main src/tools \
@@ -43,10 +44,8 @@
 BUILD_WRKSRC=	${WRKSRC}/demos
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 
-EXTRA_PATCHES=	${.CURDIR}/../../devel/qt4/files/patch-configure
-
 post-patch:
-	${REINPLACE_CMD} -e '/app +=/s|"assistant"|"assistant-qt4"|' \
+	${REINPLACE_CMD} -e '/app +=/s|"assistant"|"assistant${_QT_BINSUFX}"|' \
 		${BUILD_WRKSRC}/${PORTNAME}/menumanager.cpp \
 		${WRKSRC}/examples/help/remotecontrol/remotecontrol.cpp \
 		${WRKSRC}/examples/help/simpletextviewer/assistant.cpp
@@ -59,10 +58,14 @@
 	${LN} -sf ${LOCALBASE}/bin/rcc ${WRKSRC}/bin/rcc
 
 post-build:
-	cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE}
+	cd ${WRKSRC}/examples && \
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${MAKEFILE} \
+		${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}
 
 post-install:
-	cd ${WRKSRC}/examples && ${SETENV} MAKEOBJDIR=. ${MAKE} install
+	cd ${WRKSRC}/examples && \
+		${SETENV} ${MAKE_ENV} ${MAKE} ${MAKEFLAGS} ${MAKEFILE} \
+		${MAKE_ARGS} ${INSTALL_TARGET}
 	${FIND} -E ${PREFIX}/share/examples/qt4/examples/declarative/cppextensions -regex ".*\.(moc|obj|pch|rcc)" -type d | ${XARGS} ${RM} -r
 
 .include <bsd.port.mk>

Deleted: trunk/misc/qt4-qtdemo/distinfo
===================================================================
--- trunk/misc/qt4-qtdemo/distinfo	2015-08-20 11:40:07 UTC (rev 19841)
+++ trunk/misc/qt4-qtdemo/distinfo	2015-08-20 11:49:11 UTC (rev 19842)
@@ -1,2 +0,0 @@
-SHA256 (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 8b14dd91b52862e09b8e6a963507b74bc2580787d171feda197badfa7034032c
-SIZE (KDE/qt-everywhere-opensource-src-4.8.6.tar.gz) = 241623667

More information about the Midnightbsd-cvs mailing list