Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 22 Sep 2014 14:29:47 +0000 (UTC)
From:      Baptiste Daroussin <bapt@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r368943 - in head/devel/qmake: . files
Message-ID:  <201409221429.s8METlDV021889@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: bapt
Date: Mon Sep 22 14:29:47 2014
New Revision: 368943
URL: http://svnweb.freebsd.org/changeset/ports/368943
QAT: https://qat.redports.org/buildarchive/r368943/

Log:
  Don't what bug pkg_* had back in the time but pkg(8) doesn't have it
  So remove the workaround
  While here properly support stage, bump portrevision as it changes the qmake
  binary so that is is now looking in an existing place to find its configuration
  files

Modified:
  head/devel/qmake/Makefile
  head/devel/qmake/files/Makefile.bsd
  head/devel/qmake/pkg-plist

Modified: head/devel/qmake/Makefile
==============================================================================
--- head/devel/qmake/Makefile	Mon Sep 22 14:28:15 2014	(r368942)
+++ head/devel/qmake/Makefile	Mon Sep 22 14:29:47 2014	(r368943)
@@ -3,7 +3,7 @@
 
 PORTNAME=	qmake
 PORTVERSION=	3.3.8
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_QT}
 MASTER_SITE_SUBDIR=	archive/qt/${PORTVERSION:R:R}
@@ -16,8 +16,7 @@ COMMENT=	The build utility of the Qt pro
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-PLIST_SUB+=	_PREFIX="${PREFIX}"
-MAKE_ENV+=	FILESDIR="${FILESDIR}" STAGEDIR="${STAGEDIR}"
+MAKE_ENV+=	FILESDIR="${FILESDIR}"
 
 USES=		tar:bzip2 uidfix
 

Modified: head/devel/qmake/files/Makefile.bsd
==============================================================================
--- head/devel/qmake/files/Makefile.bsd	Mon Sep 22 14:28:15 2014	(r368942)
+++ head/devel/qmake/files/Makefile.bsd	Mon Sep 22 14:29:47 2014	(r368943)
@@ -32,12 +32,12 @@ CXXFLAGS+=-DQT_NO_TEXTCODEC -DQT_NO_UNIC
 
 PROG_CXX=	qmake
 BINDIR=	${PREFIX}/bin
-SHAREDIR=${STAGEDIR}${PREFIX}/share/qt
+SHAREDIR=	${PREFIX}/share/qt
 
-${SHAREDIR}:
+${DESTDIR}${SHAREDIR}:
 	mkdir -p "$@"
 
-beforeinstall: ${SHAREDIR}
-	cp -Rp ${.CURDIR:H}/mkspecs ${SHAREDIR}
+beforeinstall: ${DESTDIR}${SHAREDIR}
+	cp -Rp ${.CURDIR:H}/mkspecs ${DESTDIR}${SHAREDIR}
 
 .include <bsd.prog.mk>

Modified: head/devel/qmake/pkg-plist
==============================================================================
--- head/devel/qmake/pkg-plist	Mon Sep 22 14:28:15 2014	(r368942)
+++ head/devel/qmake/pkg-plist	Mon Sep 22 14:29:47 2014	(r368943)
@@ -1,198 +1,134 @@
 bin/qmake
-@comment A bug in pkg_* prevents us from using %D below
-@cwd %%_PREFIX%%/share/qt/mkspecs
-aix-g++-64/qmake.conf
-aix-g++-64/qplatformdefs.h
-aix-g++/qmake.conf
-aix-g++/qplatformdefs.h
-aix-xlc-64/qmake.conf
-aix-xlc-64/qplatformdefs.h
-aix-xlc/qmake.conf
-aix-xlc/qplatformdefs.h
-bsdi-g++/qmake.conf
-bsdi-g++/qplatformdefs.h
-cygwin-g++/qmake.conf
-cygwin-g++/qplatformdefs.h
-darwin-g++/qmake.conf
-darwin-g++/qplatformdefs.h
-dgux-g++/qmake.conf
-dgux-g++/qplatformdefs.h
-freebsd-g++/qmake.conf
-freebsd-g++/qplatformdefs.h
-freebsd-g++34/qmake.conf
-freebsd-g++34/qplatformdefs.h
-freebsd-icc/qmake.conf
-freebsd-icc/qplatformdefs.h
-hpux-acc-64/qmake.conf
-hpux-acc-64/qplatformdefs.h
-hpux-acc-o64/qmake.conf
-hpux-acc-o64/qplatformdefs.h
-hpux-acc/qmake.conf
-hpux-acc/qplatformdefs.h
-hpux-cc/qmake.conf
-hpux-cc/qplatformdefs.h
-hpux-g++-64/qmake.conf
-hpux-g++-64/qplatformdefs.h
-hpux-g++/qmake.conf
-hpux-g++/qplatformdefs.h
-hpuxi-acc-32/qmake.conf
-hpuxi-acc-32/qplatformdefs.h
-hpuxi-acc-64/qmake.conf
-hpuxi-acc-64/qplatformdefs.h
-hurd-g++/qmake.conf
-hurd-g++/qplatformdefs.h
-irix-cc-64/qmake.conf
-irix-cc-64/qplatformdefs.h
-irix-cc-o32/qmake.conf
-irix-cc-o32/qplatformdefs.h
-irix-cc/qmake.conf
-irix-cc/qplatformdefs.h
-irix-g++/qmake.conf
-irix-g++/qplatformdefs.h
-linux-cxx/qmake.conf
-linux-cxx/qplatformdefs.h
-linux-ecc-64/qmake.conf
-linux-ecc-64/qplatformdefs.h
-linux-g++-32/qmake.conf
-linux-g++-32/qplatformdefs.h
-linux-g++-64/qmake.conf
-linux-g++-64/qplatformdefs.h
-linux-g++/qmake.conf
-linux-g++/qplatformdefs.h
-linux-icc/qmake.conf
-linux-icc/qplatformdefs.h
-linux-kcc/qmake.conf
-linux-kcc/qplatformdefs.h
-linux-kylix/qmake.conf
-linux-kylix/qplatformdefs.h
-linux-pgcc/qmake.conf
-linux-pgcc/qplatformdefs.h
-lynxos-g++/qmake.conf
-lynxos-g++/qplatformdefs.h
-macx-g++/Info.plist.app
-macx-g++/qmake.conf
-macx-g++/qplatformdefs.h
-macx-mwerks/README
-macx-mwerks/mwerkstmpl.xml
-macx-mwerks/qmake.conf
-macx-mwerks/qplatformdefs.h
-macx-pbuilder/Info.plist.app
-macx-pbuilder/qmake.conf
-macx-pbuilder/qplatformdefs.h
-macx-xlc/qmake.conf
-macx-xlc/qplatformdefs.h
-netbsd-g++/qmake.conf
-netbsd-g++/qplatformdefs.h
-openbsd-g++/qmake.conf
-openbsd-g++/qplatformdefs.h
-qnx-g++/qmake.conf
-qnx-g++/qplatformdefs.h
-reliant-cds-64/qmake.conf
-reliant-cds-64/qplatformdefs.h
-reliant-cds/qmake.conf
-reliant-cds/qplatformdefs.h
-sco-cc/qmake.conf
-sco-cc/qplatformdefs.h
-sco-g++/qmake.conf
-sco-g++/qplatformdefs.h
-solaris-cc-64/qmake.conf
-solaris-cc-64/qplatformdefs.h
-solaris-cc/qmake.conf
-solaris-cc/qplatformdefs.h
-solaris-g++-64/qmake.conf
-solaris-g++-64/qplatformdefs.h
-solaris-g++/qmake.conf
-solaris-g++/qplatformdefs.h
-tru64-cxx/qmake.conf
-tru64-cxx/qplatformdefs.h
-tru64-g++/qmake.conf
-tru64-g++/qplatformdefs.h
-unixware-cc/qmake.conf
-unixware-cc/qplatformdefs.h
-unixware-g++/qmake.conf
-unixware-g++/qplatformdefs.h
-win32-borland/qmake.conf
-win32-borland/qplatformdefs.h
-win32-g++/qmake.conf
-win32-g++/qplatformdefs.h
-win32-g++/qtcrtentrypoint.cpp
-win32-icc/qmake.conf
-win32-icc/qplatformdefs.h
-win32-icc/win32app.dsp
-win32-icc/win32dll.dsp
-win32-icc/win32lib.dsp
-win32-msvc.net/qmake.conf
-win32-msvc.net/qplatformdefs.h
-win32-msvc/qmake.conf
-win32-msvc/qplatformdefs.h
-win32-msvc/win32app.dsp
-win32-msvc/win32dll.dsp
-win32-msvc/win32lib.dsp
-win32-msvc2005/qmake.conf
-win32-msvc2005/qplatformdefs.h
-win32-watcom/qmake.conf
-@dirrm aix-g++
-@dirrm aix-g++-64
-@dirrm aix-xlc
-@dirrm aix-xlc-64
-@dirrm bsdi-g++
-@dirrm cygwin-g++
-@dirrm darwin-g++
-@dirrm dgux-g++
-@dirrm freebsd-g++
-@dirrm freebsd-g++34
-@dirrm freebsd-icc
-@dirrm hpux-acc
-@dirrm hpux-acc-64
-@dirrm hpux-acc-o64
-@dirrm hpux-cc
-@dirrm hpux-g++
-@dirrm hpux-g++-64
-@dirrm hpuxi-acc-32
-@dirrm hpuxi-acc-64
-@dirrm hurd-g++
-@dirrm irix-cc
-@dirrm irix-cc-64
-@dirrm irix-cc-o32
-@dirrm irix-g++
-@dirrm linux-cxx
-@dirrm linux-ecc-64
-@dirrm linux-g++
-@dirrm linux-g++-32
-@dirrm linux-g++-64
-@dirrm linux-icc
-@dirrm linux-kcc
-@dirrm linux-kylix
-@dirrm linux-pgcc
-@dirrm lynxos-g++
-@dirrm macx-g++
-@dirrm macx-mwerks
-@dirrm macx-pbuilder
-@dirrm macx-xlc
-@dirrm netbsd-g++
-@dirrm openbsd-g++
-@dirrm qnx-g++
-@dirrm reliant-cds
-@dirrm reliant-cds-64
-@dirrm sco-cc
-@dirrm sco-g++
-@dirrm solaris-cc
-@dirrm solaris-cc-64
-@dirrm solaris-g++
-@dirrm solaris-g++-64
-@dirrm tru64-cxx
-@dirrm tru64-g++
-@dirrm unixware-cc
-@dirrm unixware-g++
-@dirrm win32-borland
-@dirrm win32-g++
-@dirrm win32-icc
-@dirrm win32-msvc
-@dirrm win32-msvc.net
-@dirrm win32-msvc2005
-@dirrm win32-watcom
-@unexec rmdir %%_PREFIX%%/share/qt/mkspecs
-@unexec rmdir %%_PREFIX%%/share/qt || echo %%_PREFIX%%/share/qt is still in use -- probably by the rest of Qt
+share/qt/mkspecs/aix-g++-64/qmake.conf
+share/qt/mkspecs/aix-g++-64/qplatformdefs.h
+share/qt/mkspecs/aix-g++/qmake.conf
+share/qt/mkspecs/aix-g++/qplatformdefs.h
+share/qt/mkspecs/aix-xlc-64/qmake.conf
+share/qt/mkspecs/aix-xlc-64/qplatformdefs.h
+share/qt/mkspecs/aix-xlc/qmake.conf
+share/qt/mkspecs/aix-xlc/qplatformdefs.h
+share/qt/mkspecs/bsdi-g++/qmake.conf
+share/qt/mkspecs/bsdi-g++/qplatformdefs.h
+share/qt/mkspecs/cygwin-g++/qmake.conf
+share/qt/mkspecs/cygwin-g++/qplatformdefs.h
+share/qt/mkspecs/darwin-g++/qmake.conf
+share/qt/mkspecs/darwin-g++/qplatformdefs.h
+share/qt/mkspecs/dgux-g++/qmake.conf
+share/qt/mkspecs/dgux-g++/qplatformdefs.h
+share/qt/mkspecs/freebsd-g++/qmake.conf
+share/qt/mkspecs/freebsd-g++/qplatformdefs.h
+share/qt/mkspecs/freebsd-g++34/qmake.conf
+share/qt/mkspecs/freebsd-g++34/qplatformdefs.h
+share/qt/mkspecs/freebsd-icc/qmake.conf
+share/qt/mkspecs/freebsd-icc/qplatformdefs.h
+share/qt/mkspecs/hpux-acc-64/qmake.conf
+share/qt/mkspecs/hpux-acc-64/qplatformdefs.h
+share/qt/mkspecs/hpux-acc-o64/qmake.conf
+share/qt/mkspecs/hpux-acc-o64/qplatformdefs.h
+share/qt/mkspecs/hpux-acc/qmake.conf
+share/qt/mkspecs/hpux-acc/qplatformdefs.h
+share/qt/mkspecs/hpux-cc/qmake.conf
+share/qt/mkspecs/hpux-cc/qplatformdefs.h
+share/qt/mkspecs/hpux-g++-64/qmake.conf
+share/qt/mkspecs/hpux-g++-64/qplatformdefs.h
+share/qt/mkspecs/hpux-g++/qmake.conf
+share/qt/mkspecs/hpux-g++/qplatformdefs.h
+share/qt/mkspecs/hpuxi-acc-32/qmake.conf
+share/qt/mkspecs/hpuxi-acc-32/qplatformdefs.h
+share/qt/mkspecs/hpuxi-acc-64/qmake.conf
+share/qt/mkspecs/hpuxi-acc-64/qplatformdefs.h
+share/qt/mkspecs/hurd-g++/qmake.conf
+share/qt/mkspecs/hurd-g++/qplatformdefs.h
+share/qt/mkspecs/irix-cc-64/qmake.conf
+share/qt/mkspecs/irix-cc-64/qplatformdefs.h
+share/qt/mkspecs/irix-cc-o32/qmake.conf
+share/qt/mkspecs/irix-cc-o32/qplatformdefs.h
+share/qt/mkspecs/irix-cc/qmake.conf
+share/qt/mkspecs/irix-cc/qplatformdefs.h
+share/qt/mkspecs/irix-g++/qmake.conf
+share/qt/mkspecs/irix-g++/qplatformdefs.h
+share/qt/mkspecs/linux-cxx/qmake.conf
+share/qt/mkspecs/linux-cxx/qplatformdefs.h
+share/qt/mkspecs/linux-ecc-64/qmake.conf
+share/qt/mkspecs/linux-ecc-64/qplatformdefs.h
+share/qt/mkspecs/linux-g++-32/qmake.conf
+share/qt/mkspecs/linux-g++-32/qplatformdefs.h
+share/qt/mkspecs/linux-g++-64/qmake.conf
+share/qt/mkspecs/linux-g++-64/qplatformdefs.h
+share/qt/mkspecs/linux-g++/qmake.conf
+share/qt/mkspecs/linux-g++/qplatformdefs.h
+share/qt/mkspecs/linux-icc/qmake.conf
+share/qt/mkspecs/linux-icc/qplatformdefs.h
+share/qt/mkspecs/linux-kcc/qmake.conf
+share/qt/mkspecs/linux-kcc/qplatformdefs.h
+share/qt/mkspecs/linux-kylix/qmake.conf
+share/qt/mkspecs/linux-kylix/qplatformdefs.h
+share/qt/mkspecs/linux-pgcc/qmake.conf
+share/qt/mkspecs/linux-pgcc/qplatformdefs.h
+share/qt/mkspecs/lynxos-g++/qmake.conf
+share/qt/mkspecs/lynxos-g++/qplatformdefs.h
+share/qt/mkspecs/macx-g++/Info.plist.app
+share/qt/mkspecs/macx-g++/qmake.conf
+share/qt/mkspecs/macx-g++/qplatformdefs.h
+share/qt/mkspecs/macx-mwerks/README
+share/qt/mkspecs/macx-mwerks/mwerkstmpl.xml
+share/qt/mkspecs/macx-mwerks/qmake.conf
+share/qt/mkspecs/macx-mwerks/qplatformdefs.h
+share/qt/mkspecs/macx-pbuilder/Info.plist.app
+share/qt/mkspecs/macx-pbuilder/qmake.conf
+share/qt/mkspecs/macx-pbuilder/qplatformdefs.h
+share/qt/mkspecs/macx-xlc/qmake.conf
+share/qt/mkspecs/macx-xlc/qplatformdefs.h
+share/qt/mkspecs/netbsd-g++/qmake.conf
+share/qt/mkspecs/netbsd-g++/qplatformdefs.h
+share/qt/mkspecs/openbsd-g++/qmake.conf
+share/qt/mkspecs/openbsd-g++/qplatformdefs.h
+share/qt/mkspecs/qnx-g++/qmake.conf
+share/qt/mkspecs/qnx-g++/qplatformdefs.h
+share/qt/mkspecs/reliant-cds-64/qmake.conf
+share/qt/mkspecs/reliant-cds-64/qplatformdefs.h
+share/qt/mkspecs/reliant-cds/qmake.conf
+share/qt/mkspecs/reliant-cds/qplatformdefs.h
+share/qt/mkspecs/sco-cc/qmake.conf
+share/qt/mkspecs/sco-cc/qplatformdefs.h
+share/qt/mkspecs/sco-g++/qmake.conf
+share/qt/mkspecs/sco-g++/qplatformdefs.h
+share/qt/mkspecs/solaris-cc-64/qmake.conf
+share/qt/mkspecs/solaris-cc-64/qplatformdefs.h
+share/qt/mkspecs/solaris-cc/qmake.conf
+share/qt/mkspecs/solaris-cc/qplatformdefs.h
+share/qt/mkspecs/solaris-g++-64/qmake.conf
+share/qt/mkspecs/solaris-g++-64/qplatformdefs.h
+share/qt/mkspecs/solaris-g++/qmake.conf
+share/qt/mkspecs/solaris-g++/qplatformdefs.h
+share/qt/mkspecs/tru64-cxx/qmake.conf
+share/qt/mkspecs/tru64-cxx/qplatformdefs.h
+share/qt/mkspecs/tru64-g++/qmake.conf
+share/qt/mkspecs/tru64-g++/qplatformdefs.h
+share/qt/mkspecs/unixware-cc/qmake.conf
+share/qt/mkspecs/unixware-cc/qplatformdefs.h
+share/qt/mkspecs/unixware-g++/qmake.conf
+share/qt/mkspecs/unixware-g++/qplatformdefs.h
+share/qt/mkspecs/win32-borland/qmake.conf
+share/qt/mkspecs/win32-borland/qplatformdefs.h
+share/qt/mkspecs/win32-g++/qmake.conf
+share/qt/mkspecs/win32-g++/qplatformdefs.h
+share/qt/mkspecs/win32-g++/qtcrtentrypoint.cpp
+share/qt/mkspecs/win32-icc/qmake.conf
+share/qt/mkspecs/win32-icc/qplatformdefs.h
+share/qt/mkspecs/win32-icc/win32app.dsp
+share/qt/mkspecs/win32-icc/win32dll.dsp
+share/qt/mkspecs/win32-icc/win32lib.dsp
+share/qt/mkspecs/win32-msvc.net/qmake.conf
+share/qt/mkspecs/win32-msvc.net/qplatformdefs.h
+share/qt/mkspecs/win32-msvc/qmake.conf
+share/qt/mkspecs/win32-msvc/qplatformdefs.h
+share/qt/mkspecs/win32-msvc/win32app.dsp
+share/qt/mkspecs/win32-msvc/win32dll.dsp
+share/qt/mkspecs/win32-msvc/win32lib.dsp
+share/qt/mkspecs/win32-msvc2005/qmake.conf
+share/qt/mkspecs/win32-msvc2005/qplatformdefs.h
+share/qt/mkspecs/win32-watcom/qmake.conf
 %%PORTDOCS%%%%DOCSDIR%%/html/qmake.dcf
 %%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-1.html
@@ -203,5 +139,3 @@ win32-watcom/qmake.conf
 %%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-6.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-7.html
 %%PORTDOCS%%%%DOCSDIR%%/html/qmake-manual-8.html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%/html
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%



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