ports/181335: [PATCH] devel/qmake4: Fix port test and Tinderbox, trim ${LN}

Rusmir Dusko nemysis at FreeBSD.org
Fri Aug 16 03:10:02 UTC 2013


>Number:         181335
>Category:       ports
>Synopsis:       [PATCH] devel/qmake4: Fix port test and Tinderbox, trim ${LN}
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 16 03:10:01 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Rusmir Dusko
>Release:        FreeBSD 9.1-RELEASE-p17 amd64
>Organization:
>Environment:
FreeBSD FreeBSD_Ports 9.1-RELEASE-p17 FreeBSD 9.1-RELEASE-p17 #0: Sun Jul 28 00:39:53 UTC 2013
>Description:
- Remove MAKE_JOBS_SAFE
- Correctly use -sf flags for ${LN}
- Fix port test and Tinderbox
- Trim pkg-plist
>How-To-Repeat:
Build log

https://redports.org/buildarchive/20130816020800-12276/
>Fix:


Patch attached with submission follows:

Original version does not exist at /usr/ports/devel/qt4-qmake
Using /usr/ports/devel/qmake4 instead
===> Generating patch
===> Viewing diff with more
diff -ruN /usr/ports/devel/qmake4/Makefile ./Makefile
--- /usr/ports/devel/qmake4/Makefile	2013-06-02 19:00:13.000000000 +0200
+++ ./Makefile	2013-08-16 04:07:34.000000000 +0200
@@ -16,7 +16,6 @@
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 MAKE_ENV+=	FILESDIR="${FILESDIR}"
-MAKE_JOBS_SAFE=	yes
 TODAY_CMD=	/bin/date +%Y-%m-%d
 
 EXTRACT_AFTER_ARGS= \
@@ -72,9 +71,10 @@
 		< ${FILESDIR}/qconfig.cpp \
 		> ${WRKSRC:H}/src/corelib/global/qconfig.cpp
 	${ECHO} '/* empty */' > ${WRKSRC}/qconfig.h
-	${LN} ${WRKSRC}/qconfig.h ${WRKSRC}/../src/corelib/global/qconfig.h
+	${LN} -sf ${WRKSRC}/qconfig.h ${WRKSRC}/../src/corelib/global/qconfig.h
 
 post-install:
-	${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${PREFIX}/share/qt4/mkspecs/default
+	@${MKDIR} ${PREFIX}/share/qt4/mkspecs/default/
+	${LN} -sf ${PREFIX}/share/qt4/mkspecs/freebsd-${QMAKE_BASE_COMPILER} ${PREFIX}/share/qt4/mkspecs/default/
 
 .include <bsd.port.mk>
diff -ruN /usr/ports/devel/qmake4/pkg-plist ./pkg-plist
--- /usr/ports/devel/qmake4/pkg-plist	2013-06-02 19:00:13.000000000 +0200
+++ ./pkg-plist	2013-08-16 03:52:52.000000000 +0200
@@ -81,7 +81,7 @@
 share/qt4/mkspecs/cygwin-g++/qplatformdefs.h
 share/qt4/mkspecs/darwin-g++/qmake.conf
 share/qt4/mkspecs/darwin-g++/qplatformdefs.h
-share/qt4/mkspecs/default
+share/qt4/mkspecs/default/freebsd-g++
 share/qt4/mkspecs/features/build_pass.prf
 share/qt4/mkspecs/features/dbusadaptors.prf
 share/qt4/mkspecs/features/dbusinterfaces.prf
@@ -720,6 +720,8 @@
 @dirrm share/qt4/mkspecs/features/symbian
 @dirrm share/qt4/mkspecs/features/mac
 @dirrmtry share/qt4/mkspecs/features
+ at dirrm share/qt4/mkspecs/default/freebsd-g++
+ at dirrm share/qt4/mkspecs/default
 @dirrm share/qt4/mkspecs/darwin-g++
 @dirrm share/qt4/mkspecs/cygwin-g++
 @dirrm share/qt4/mkspecs/common/wince
===> Done


>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list