Bug 176041 - devel/qmake: fix build on head
Summary: devel/qmake: fix build on head
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Mikhail Teterin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-02-12 00:50 UTC by Gavin Atkinson
Modified: 2013-02-12 02:30 UTC (History)
0 users

See Also:


Attachments
qmake-fix-head.diff (472 bytes, patch)
2013-02-12 00:50 UTC, Gavin Atkinson
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Gavin Atkinson freebsd_committer freebsd_triage 2013-02-12 00:50:00 UTC
	devel/qmake does not build on 10-CURRENT because it relies on
NOMAN, which has been deprecated for several years and finally removed in
head.  This should be changed to NO_MAN in Makefile.bsd.

How-To-Repeat: root@tyne:/usr/ports/devel/qmake # uname -a
FreeBSD tyne.XXX.net 10.0-CURRENT FreeBSD 10.0-CURRENT #1 r246146M: Thu Jan 31 16:22:14 GMT 2013     root@tyne.XXX.net:/usr/obj/usr/src/head/sys/GENERIC  amd64
root@tyne:/usr/ports/devel/qmake # make all
===>   qmake-3.3.8_1 depends on file: /usr/local/sbin/pkg - found
===>  Extracting for qmake-3.3.8_1
=> SHA256 Checksum OK for KDE/qt-x11-free-3.3.8.tar.bz2.
===>  Patching for qmake-3.3.8_1
===>  Configuring for qmake-3.3.8_1
/usr/bin/sed -e 's|/usr/local|/usr/local|g'  < /usr/ports/devel/qmake/files/qconfig.cpp  > /usr/ports/devel/qmake/work/qt-x11-free-3.3.8/src/tools/qconfig.cpp
echo '/* empty */' > /usr/ports/devel/qmake/work/qt-x11-free-3.3.8/qmake/qconfig.h
/bin/ln /usr/ports/devel/qmake/work/qt-x11-free-3.3.8/qmake/qconfig.h /usr/ports/devel/qmake/work/qt-x11-free-3.3.8/qmake/qmodules.h
/bin/ln -s . /usr/ports/devel/qmake/work/qt-x11-free-3.3.8/src/tools/private
===>  Building for qmake-3.3.8_1
make: don't know how to make qmake.1. Stop
*** [do-build] Error code 1

Stop in /usr/ports/devel/qmake.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2013-02-12 00:50:13 UTC
Responsible Changed
From-To: freebsd-ports-bugs->mi

mi@aldan.algebra.com => mi@ (via the GNATS Auto Assign Tool)
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2013-02-12 00:50:14 UTC
Maintainer of devel/qmake,

Please note that PR ports/176041 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/176041

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 3 Edwin Groothuis freebsd_committer freebsd_triage 2013-02-12 00:50:15 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-02-12 02:24:45 UTC
Author: mi
Date: Tue Feb 12 02:24:36 2013
New Revision: 312086
URL: http://svnweb.freebsd.org/changeset/ports/312086

Log:
  Change NOMAN to NO_MAN:
  
  PR:		ports/176041
  Submitted by:	Gavin Atkinson
  
  Also, change to use the MAKE_JOBS_SAFE knob from the old-fashioned
  adding of -j to make's command-line.

Modified:
  head/devel/qmake/Makefile
  head/devel/qmake/files/Makefile.bsd

Modified: head/devel/qmake/Makefile
==============================================================================
--- head/devel/qmake/Makefile	Tue Feb 12 00:57:47 2013	(r312085)
+++ head/devel/qmake/Makefile	Tue Feb 12 02:24:36 2013	(r312086)
@@ -19,7 +19,7 @@ COMMENT=	The build utility of the Qt pro
 REINPLACE_ARGS=	-i ""
 WRKSRC=		${WRKDIR}/${DISTNAME}/qmake
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-ALL_TARGET=	-j`${SYSCTL} -n hw.ncpu`
+MAKE_JOBS_SAFE=	yes
 PLIST_SUB+=	_PREFIX="${PREFIX}"
 MAKE_ENV+=	FILESDIR="${FILESDIR}"
 

Modified: head/devel/qmake/files/Makefile.bsd
==============================================================================
--- head/devel/qmake/files/Makefile.bsd	Tue Feb 12 00:57:47 2013	(r312085)
+++ head/devel/qmake/files/Makefile.bsd	Tue Feb 12 02:24:36 2013	(r312086)
@@ -5,7 +5,7 @@ _OBJS!=	${MAKE} -f Makefile.unix -V OBJS
 # next to -DHAVE_CONFIG_CPP below: 
 #_OBJS:=	${_OBJS:S/qconfig.o//}
 SRCS:=	${_OBJS:.o=.cpp}
-NOMAN=	true	# qmake.1 anyone?
+NO_MAN=	true	# qmake.1 anyone?
 
 .PATH:	${.CURDIR} ${.CURDIR:H}/src/tools
 CXXFLAGS+=-I${.CURDIR:H}/mkspecs/freebsd-g++
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
Comment 5 Mikhail Teterin freebsd_committer freebsd_triage 2013-02-12 02:25:21 UTC
State Changed
From-To: feedback->closed

Committed, thank you!