Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 6 Dec 2013 17:43:18 +0000 (UTC)
From:      Kris Moore <kmoore@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r335780 - head/sysutils/pcbsd-utils-qt4
Message-ID:  <201312061743.rB6HhIpS059684@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: kmoore
Date: Fri Dec  6 17:43:18 2013
New Revision: 335780
URL: http://svnweb.freebsd.org/changeset/ports/335780

Log:
  Fix some Makefile changes clobbered by my previous commit, Thanks Bapt!
  
  While here fix pkg-plist

Modified:
  head/sysutils/pcbsd-utils-qt4/Makefile
  head/sysutils/pcbsd-utils-qt4/pkg-plist

Modified: head/sysutils/pcbsd-utils-qt4/Makefile
==============================================================================
--- head/sysutils/pcbsd-utils-qt4/Makefile	Fri Dec  6 17:06:30 2013	(r335779)
+++ head/sysutils/pcbsd-utils-qt4/Makefile	Fri Dec  6 17:43:18 2013	(r335780)
@@ -8,33 +8,23 @@ MASTER_SITES=	http://www.pcbsd.org/~kris
 		ftp://ftp.pcbsd.org/pub/software/
 
 MAINTAINER=	kmoore@FreeBSD.org
-COMMENT=	PC-BSD QT4 Utilities
+COMMENT=	PC-BSD Qt4 Utilities
 
 RUN_DEPENDS=	pc-metapkgmanager:${PORTSDIR}/sysutils/pcbsd-utils
-LIB_DEPENDS=	QtSolutions_SingleApplication-head.1:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication \
+LIB_DEPENDS=	libQtSolutions_SingleApplication-head.so:${PORTSDIR}/devel/qt4-qtsolutions-singleapplication \
 		curl:${PORTSDIR}/ftp/curl
 
 MAKE_JOBS_UNSAFE=yes
 USE_CDRTOOLS=	yes
 USE_BZIP2=	yes
 USE_LDCONFIG=	yes
-USE_QT4=	accessible \
-		clucene codecs-cn codecs-jp codecs-kr codecs-tw corelib \
-		dbus declarative \
-		graphicssystems-opengl gui help help-tools \
-		iconengines imageformats inputmethods \
-		linguist l10n makeqpf moc multimedia network opengl \
-		pixeltool porting phonon phonon-gst \
-		qdbusviewer qmlviewer qmake qtconfig qtestlib \
-		qvfb rcc script scripttools \
-		svg uic uic3 \
-		xml xmlpatterns xmlpatterns-tool
+USE_QT4=	corelib gui network svg linguist \
+		moc_build rcc_build uic_build
+USES=		qmake
 
 WRKSRC=		${WRKDIR}/src-qt4
-HAS_CONFIGURE=	yes
 
-QMAKE_PRO=	src-qt4.pro
-QMAKE_ARGS=	-recursive ${QMAKE_PRO}
+QMAKE_ARGS=	CONFIG+="configure"
 
 .include <bsd.port.pre.mk>
 
@@ -42,11 +32,4 @@ QMAKE_ARGS=	-recursive ${QMAKE_PRO}
 IGNORE=		requires FreeBSD 10 or later
 .endif
 
-do-configure:
-	@cd ${WRKSRC} && ${SETENV} ${CONFIGURE_ENV} \
-		${QMAKE} PREFIX=${PREFIX} -unix CONFIG+="configure" ${QMAKE_PRO}
-
-do-install:
-	cd ${WRKSRC} && make install INSTALL_ROOT=${STAGEDIR}
-
 .include <bsd.port.post.mk>

Modified: head/sysutils/pcbsd-utils-qt4/pkg-plist
==============================================================================
--- head/sysutils/pcbsd-utils-qt4/pkg-plist	Fri Dec  6 17:06:30 2013	(r335779)
+++ head/sysutils/pcbsd-utils-qt4/pkg-plist	Fri Dec  6 17:43:18 2013	(r335780)
@@ -88,6 +88,18 @@ share/pcbsd/icons/sysupdate.png
 share/pcbsd/icons/pkgmanager.png
 share/pcbsd/icons/zmanager.png
 share/pcbsd/doc/handbook_en.pdf
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1024x600_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1024x768_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1280x1024_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1280x800_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1440x900_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1600x1200_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1920x1080_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_1920x1200_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_600x400_v2.jpg
+share/wallpapers/PCBSD/PCBSD_10_Joule_WP_800x600_v2.jpg
+share/wallpapers/pcbsd10-default/contents/.directory
+share/wallpapers/pcbsd10-default/contents/images/.directory
 share/wallpapers/pcbsd10-default/contents/images/1024x768.jpg
 share/wallpapers/pcbsd10-default/contents/images/1600x1200.jpg
 share/wallpapers/pcbsd10-default/contents/images/1280x800.jpg
@@ -2698,6 +2710,7 @@ share/applications/pc-updatecenter.deskt
 share/applications/pc-welcome.desktop
 share/applications/warden.desktop
 share/applications/EasyPBI.desktop
+share/applications/pc-dmconf.desktop
 lib/libpcbsd-ui.so.0.9.8
 lib/libpcbsd-ui.so
 lib/libpcbsd-ui.so.0



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201312061743.rB6HhIpS059684>