Date: Thu, 28 Jul 2011 11:57:25 +0000 From: Max Brazhnikov <makc@freebsd.org> To: Kris Moore <kmoore@freebsd.org>, yurkis@gmail.com Cc: cvs-ports@freebsd.org, ports-committers@freebsd.org Subject: Re: cvs commit: ports/devel/qt4-qtsolutions-singleapplication Makefile distinfo Message-ID: <201107281157.26473.makc@freebsd.org> In-Reply-To: <201107201600.p6KG0Rgt064188@repoman.freebsd.org> References: <201107201600.p6KG0Rgt064188@repoman.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--Boundary-00=_m6UMO4jI/6cDJhZ
Content-Type: Text/Plain;
charset="us-ascii"
Content-Transfer-Encoding: 7bit
On Wed, 20 Jul 2011 16:00:27 +0000 (UTC), Kris Moore wrote:
> kmoore 2011-07-20 16:00:27 UTC
>
> FreeBSD ports repository
>
> Modified files:
> devel/qt4-qtsolutions-singleapplication Makefile distinfo
> Log:
> Update distfile location(s)
>
> Revision Changes Path
> 1.2 +3 -3
> ports/devel/qt4-qtsolutions-singleapplication/Makefile 1.2 +2 -2
> ports/devel/qt4-qtsolutions-singleapplication/distinfo
Kris, yurkis (unfortunately first commit message doesn't contain
submitter/maintainer name)
this port can be improved and simplified. The patch also fixes portlint errors
and warnings.
Thanks,
Max
--Boundary-00=_m6UMO4jI/6cDJhZ
Content-Type: text/x-patch; charset="UTF-8";
name="qt4-qtsolutions-singleapplication.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="qt4-qtsolutions-singleapplication.diff"
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/qt4-qtsolutions-singleapplication/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- Makefile 20 Jul 2011 16:00:27 -0000 1.2
+++ Makefile 21 Jul 2011 11:27:43 -0000
@@ -16,30 +16,30 @@
COMMENT= QT4 Solutions Single Application Framework
USE_QT_VER= 4
-QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui network
+QT_COMPONENTS= qmake_build moc_build rcc_build uic_build gui network
+HAS_CONFIGURE= yes
+USE_LDCONFIG= yes
+
+WRKSRC= ${WRKDIR}/qt-solutions-qt-solutions/${SUB_PROJECT_NAME}
+BUILD_WRKSRC= ${WRKSRC}/buildlib
+
+PLIST_FILES= ${LIBRARY_HEADERS:S,^,include/,} \
+ lib/${LIBRARY_NAME} \
+ lib/${LIBRARY_NAME}.1
-SUB_PROJECT_NAME=qtsingleapplication
+SUB_PROJECT_NAME= qtsingleapplication
+QMAKE_PRO= buildlib.pro
-WRKSRC=${WRKDIR}/qt-solutions-qt-solutions/${SUB_PROJECT_NAME}
-BUILD_WRKSRC=${WRKSRC}/buildlib
-
-QMAKE_PRO=buildlib.pro
-
-USE_LDCONFIG = ${PREFIX}/lib
-
-LIBRARY_SUFFIX=SingleApplication
-LIBRARY_HEADERS=${WRKSRC}/src/qtsingleapplication.h ${WRKSRC}/src/qtsinglecoreapplication.h
-
-HAS_CONFIGURE= yes
+LIBRARY_NAME= libQtSolutions_SingleApplication-head.so
+LIBRARY_HEADERS= qtsingleapplication.h qtsinglecoreapplication.h
do-configure:
- cd ${BUILD_WRKSRC} && ${QMAKE} ${QMAKE_PRO}
+ cd ${BUILD_WRKSRC} && ${QMAKE} ${QMAKEFLAGS} ${QMAKE_PRO}
do-install:
- ${INSTALL_LIB} ${WRKSRC}/lib/libQtSolutions_${LIBRARY_SUFFIX}-head.so.1.0.0 ${PREFIX}/lib
- ${LN} -sf ${PREFIX}/lib/libQtSolutions_${LIBRARY_SUFFIX}-head.so.1.0.0 ${PREFIX}/lib/libQtSolutions_${LIBRARY_SUFFIX}-head.so.1.0
- ${LN} -sf ${PREFIX}/lib/libQtSolutions_${LIBRARY_SUFFIX}-head.so.1.0.0 ${PREFIX}/lib/libQtSolutions_${LIBRARY_SUFFIX}-head.so.1
- ${LN} -sf ${PREFIX}/lib/libQtSolutions_${LIBRARY_SUFFIX}-head.so.1.0.0 ${PREFIX}/lib/libQtSolutions_${LIBRARY_SUFFIX}-head.so
- ${INSTALL_DATA} ${LIBRARY_HEADERS} ${PREFIX}/include
+ ${MKDIR} ${PREFIX}/include ${PREFIX}/lib
+ cd ${WRKSRC}/src && ${INSTALL_DATA} ${LIBRARY_HEADERS} ${PREFIX}/include
+ ${INSTALL_LIB} ${WRKSRC}/lib/${LIBRARY_NAME}.1.0.0 ${PREFIX}/lib/${LIBRARY_NAME}.1
+ ${LN} -sf ${PREFIX}/lib/${LIBRARY_NAME}.1 ${PREFIX}/lib/${LIBRARY_NAME}
.include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: pkg-plist
diff -N pkg-plist
--- pkg-plist 19 Jul 2011 17:06:51 -0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,6 +0,0 @@
-include/qtsingleapplication.h
-include/qtsinglecoreapplication.h
-lib/libQtSolutions_SingleApplication-head.so
-lib/libQtSolutions_SingleApplication-head.so.1
-lib/libQtSolutions_SingleApplication-head.so.1.0
-lib/libQtSolutions_SingleApplication-head.so.1.0.0
--Boundary-00=_m6UMO4jI/6cDJhZ--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201107281157.26473.makc>