[Midnightbsd-cvs] mports [15530] U trunk/devel/automoc4/pkg-plist: update build configuration

laffer1 at midnightbsd.org laffer1 at midnightbsd.org
Thu Sep 26 19:27:10 EDT 2013


Revision: 15530
          http://svnweb.midnightbsd.org/mports/?rev=15530
Author:   laffer1
Date:     2013-09-26 19:27:09 -0400 (Thu, 26 Sep 2013)
Log Message:
-----------
update build configuration

Modified Paths:
--------------
    trunk/devel/automoc4/Makefile
    trunk/devel/automoc4/pkg-descr
    trunk/devel/automoc4/pkg-plist

Added Paths:
-----------
    trunk/devel/automoc4/files/
    trunk/devel/automoc4/files/patch-Automoc4Config.cmake
    trunk/devel/automoc4/files/patch-CMakeLists.txt

Property Changed:
----------------
    trunk/devel/automoc4/distinfo
    trunk/devel/automoc4/pkg-descr
    trunk/devel/automoc4/pkg-plist

Modified: trunk/devel/automoc4/Makefile
===================================================================
--- trunk/devel/automoc4/Makefile	2013-09-26 23:24:09 UTC (rev 15529)
+++ trunk/devel/automoc4/Makefile	2013-09-26 23:27:09 UTC (rev 15530)
@@ -2,7 +2,7 @@
 
 PORTNAME=	automoc4
 PORTVERSION=	0.9.88
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTNAME}/${PORTVERSION}/
@@ -12,13 +12,9 @@
 COMMENT=	Automatic moc for Qt 4 packages
 LICENSE=	bsd2
 
+USE_QT4=	corelib moc qmake_build rcc_build uic_build
 USE_BZIP2=	yes
-USE_ICONV=	yes
-USE_KDE4=	kdeprefix kdehier
-USE_QT_VER=	4
-QT_COMPONENTS=	uic moc rcc qmake corelib
-USE_CMAKE=	yes
-CMAKE_USE_PTHREAD=	yes
+USES=		cmake iconv
 MAKE_JOBS_UNSAFE=	yes
 
 .include <bsd.port.mk>

Index: trunk/devel/automoc4/distinfo
===================================================================
--- trunk/devel/automoc4/distinfo	2013-09-26 23:24:09 UTC (rev 15529)
+++ trunk/devel/automoc4/distinfo	2013-09-26 23:27:09 UTC (rev 15530)

Property changes on: trunk/devel/automoc4/distinfo
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.4
\ No newline at end of property
Added: trunk/devel/automoc4/files/patch-Automoc4Config.cmake
===================================================================
--- trunk/devel/automoc4/files/patch-Automoc4Config.cmake	                        (rev 0)
+++ trunk/devel/automoc4/files/patch-Automoc4Config.cmake	2013-09-26 23:27:09 UTC (rev 15530)
@@ -0,0 +1,12 @@
+--- ./Automoc4Config.cmake.orig	2012-05-28 10:08:18.449122610 +0200
++++ ./Automoc4Config.cmake	2012-05-28 10:09:14.719218317 +0200
+@@ -49,7 +49,8 @@
+ #     THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ 
+ 
+-get_filename_component(_AUTOMOC4_CURRENT_DIR  "${CMAKE_CURRENT_LIST_FILE}" PATH)
++get_filename_component(_AUTOMOC4_CURRENT_DIR  "${CMAKE_CURRENT_LIST_FILE}" REALPATH)
++get_filename_component(_AUTOMOC4_CURRENT_DIR  "${_AUTOMOC4_CURRENT_DIR}" PATH)
+ 
+ # set the automoc version number
+ include(${_AUTOMOC4_CURRENT_DIR}/Automoc4Version.cmake)

Added: trunk/devel/automoc4/files/patch-CMakeLists.txt
===================================================================
--- trunk/devel/automoc4/files/patch-CMakeLists.txt	                        (rev 0)
+++ trunk/devel/automoc4/files/patch-CMakeLists.txt	2013-09-26 23:27:09 UTC (rev 15530)
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	Sun Dec 25 15:35:23 2011
++++ CMakeLists.txt	Sun Dec 25 15:35:40 2011
+@@ -21,7 +21,9 @@
+ set_target_properties(automoc4  PROPERTIES  SKIP_BUILD_RPATH            FALSE
+                                             INSTALL_RPATH_USE_LINK_PATH TRUE )
+ 
+-target_link_libraries(automoc4 ${QT_QTCORE_LIBRARY})
++find_package(Threads)
++target_link_libraries(automoc4 ${QT_QTCORE_LIBRARY} ${CMAKE_THREAD_LIBS_INIT})
++
+ 
+ install(TARGETS automoc4 DESTINATION bin)
+ install(FILES Automoc4Config.cmake Automoc4Version.cmake automoc4.files.in  DESTINATION  lib${LIB_SUFFIX}/automoc4)

Modified: trunk/devel/automoc4/pkg-descr
===================================================================
--- trunk/devel/automoc4/pkg-descr	2013-09-26 23:24:09 UTC (rev 15529)
+++ trunk/devel/automoc4/pkg-descr	2013-09-26 23:27:09 UTC (rev 15530)
@@ -1,3 +1,4 @@
-Add automoc4 tool, used to build kde4 and related packages.
+Automoc4 is a tool to add rules to CMake projects for generating Qt 4
+moc files automatically.
 
-WWW: http://www.kde.org/
+WWW: http://www.kde.org


Property changes on: trunk/devel/automoc4/pkg-descr
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Modified: trunk/devel/automoc4/pkg-plist
===================================================================
--- trunk/devel/automoc4/pkg-plist	2013-09-26 23:24:09 UTC (rev 15529)
+++ trunk/devel/automoc4/pkg-plist	2013-09-26 23:27:09 UTC (rev 15530)
@@ -1,5 +1,5 @@
 bin/automoc4
+lib/automoc4/Automoc4Config.cmake
 lib/automoc4/Automoc4Version.cmake
-lib/automoc4/Automoc4Config.cmake
 lib/automoc4/automoc4.files.in
 @dirrmtry lib/automoc4


Property changes on: trunk/devel/automoc4/pkg-plist
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property


More information about the Midnightbsd-cvs mailing list