ports/174194: devel/piklab: Update to version 0.16.2

Wed Dec 5 18:10:11 UTC 2012

>Number:         174194
>Category:       ports
>Synopsis:       devel/piklab: Update to version 0.16.2
>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:   Wed Dec 05 18:10:11 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p11 i386
>Organization:
>Environment:
>Description:
- Update to version 0.16.2

New file:
files/patch-cmake__Piklab.cmkae
files/patch-src__CMakeLists.txt
files/patch-src__common__global__pfile.cpp
files/patch-src__common__port__hid_port.h

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/devel/piklab/Makefile devel/piklab/Makefile

--- /usr/ports/devel/piklab/Makefile	2012-11-08 05:27:37.000000000 +0900
+++ devel/piklab/Makefile	2012-12-03 23:42:23.000000000 +0900
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	piklab
-# Date created:		2007-11-19
-# Whom:			Michael Nottebrock <lofi at kiste>
-#
+# Created by: Michael Nottebrock <lofi at kiste>
 # $FreeBSD: head/devel/piklab/Makefile 302052 2012-08-05 04:57:57Z miwi $
-#
 
 PORTNAME=	piklab
-PORTVERSION=	0.16.1
+PORTVERSION=	0.16.2
 CATEGORIES=	devel
 MASTER_SITES=	SF
 
@@ -14,7 +10,6 @@
 COMMENT=	KDE IDE for microcontroller development
 
 LICENSE=	GPLv2 # (or later)
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 OPTIONS_DEFINE=	KDE4
 OPTIONS_DEFAULT=KDE4
@@ -22,6 +17,8 @@
 USE_BZIP2=	yes
 USE_QT4=	corelib gui qt3support qtestlib xml \
 		moc_build qmake_build rcc_build uic_build
+USE_NCURSES=	yes
+USE_READLINE=	yes
 USE_GETTEXT=	yes
 USE_CMAKE=	yes
 MAKE_JOBS_SAFE=	yes
@@ -55,9 +52,6 @@
 	@${REINPLACE_CMD} -e \
 		'/man/s|^|#| ; \
 		 /install/s|^|#|' ${WRKSRC}/CMakeLists.txt
-	@${REINPLACE_CMD} -e \
-		'/CMAKE_BUILD_TYPE/s|^|#| ; \
-		 /KDE4/s|INCLUDE_DIRS|INCLUDES|' ${WRKSRC}/cmake/Piklab.cmake
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/man/piklab-*.1 ${MANPREFIX}/man/man1
diff -urN /usr/ports/devel/piklab/distinfo devel/piklab/distinfo
--- /usr/ports/devel/piklab/distinfo	2012-11-08 05:27:37.000000000 +0900
+++ devel/piklab/distinfo	2012-10-17 18:15:47.000000000 +0900
@@ -1,2 +1,2 @@
-SHA256 (piklab-0.16.1.tar.bz2) = 80db24022de47a7377412912b1fd186d6ad08fafa042bed17b49ada2de56004d
-SIZE (piklab-0.16.1.tar.bz2) = 972681
+SHA256 (piklab-0.16.2.tar.bz2) = 51de9edda8edb9d2e9d07ed1c479b83b87eb6fb17c85717477f05fac03a5740e
+SIZE (piklab-0.16.2.tar.bz2) = 1036644
diff -urN /usr/ports/devel/piklab/files/patch-cmake__Piklab.cmkae devel/piklab/files/patch-cmake__Piklab.cmkae
--- /usr/ports/devel/piklab/files/patch-cmake__Piklab.cmkae	1970-01-01 09:00:00.000000000 +0900
+++ devel/piklab/files/patch-cmake__Piklab.cmkae	2012-10-17 23:39:14.000000000 +0900
@@ -0,0 +1,24 @@
+--- cmake/Piklab.cmake.bak	2012-10-15 14:22:22.000000000 +0900
++++ cmake/Piklab.cmake	2012-10-17 22:58:25.000000000 +0900
+@@ -1,10 +1,10 @@
+ #set(CMAKE_VERBOSE_MAKEFILE ON)
+ 
+ if(WIN32)
+-  set(CMAKE_BUILD_TYPE Release)
++#  set(CMAKE_BUILD_TYPE Release)
+   set(QT_ONLY 1)
+ else(WIN32)
+-  set(CMAKE_BUILD_TYPE Debug)
++#  set(CMAKE_BUILD_TYPE Debug)
+ endif(WIN32)
+ 
+ include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src)
+@@ -51,7 +51,7 @@
+ 
+ if(QT_ONLY)
+   add_definitions(-DNO_KDE)
+-  set(EXE_LIBS ${QT_LIBRARIES}  ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
++  set(EXE_LIBS nokde ${QT_LIBRARIES}  ${READLINE_LIBRARIES} ${NCURSES_LIBRARIES})
+   set(GUI_LIBS nokde_gui ${EXE_LIBS} ${LIBUSB_LIBRARIES})
+ else(QT_ONLY)
+   find_package(KDE4 REQUIRED)
diff -urN /usr/ports/devel/piklab/files/patch-src__CMakeLists.txt devel/piklab/files/patch-src__CMakeLists.txt
--- /usr/ports/devel/piklab/files/patch-src__CMakeLists.txt	1970-01-01 09:00:00.000000000 +0900
+++ devel/piklab/files/patch-src__CMakeLists.txt	2012-10-18 00:06:38.000000000 +0900
@@ -0,0 +1,13 @@
+--- src/CMakeLists.txt.orig	2012-10-15 14:22:47.000000000 +0900
++++ src/CMakeLists.txt	2012-10-18 00:06:13.000000000 +0900
+@@ -7,9 +7,9 @@
+ add_subdirectory(progs)
+ add_subdirectory(piklab-prog)
+ add_subdirectory(piklab-test)
+-add_subdirectory(dev-utils)
+ 
+ if(NOT QT_ONLY)
++    add_subdirectory(dev-utils)
+     add_subdirectory(data)
+     add_subdirectory(libgui)
+     add_subdirectory(tools)
diff -urN /usr/ports/devel/piklab/files/patch-src__common__global__pfile.cpp devel/piklab/files/patch-src__common__global__pfile.cpp
--- /usr/ports/devel/piklab/files/patch-src__common__global__pfile.cpp	1970-01-01 09:00:00.000000000 +0900
+++ devel/piklab/files/patch-src__common__global__pfile.cpp	2012-10-17 18:48:10.000000000 +0900
@@ -0,0 +1,32 @@
+--- src/common/global/pfile.cpp.orig	2012-10-15 14:22:37.000000000 +0900
++++ src/common/global/pfile.cpp	2012-10-17 18:47:35.000000000 +0900
+@@ -99,9 +99,14 @@
+ {
+   close();
+   _tmp.reset(new KTemporaryFile);
++#if defined(NO_KDE)
++  _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
++  _tmp->setAutoRemove(true);
++#else
+   if (!_extension.isEmpty()) {
+     _tmp->setSuffix("." + _extension);
+   }
++#endif
+   if (!_tmp->open()) {
+     _error = i18n("Could not create temporary file.");
+     _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
+@@ -149,9 +154,14 @@
+     }
+ 
+     _tmp.reset(new KTemporaryFile);
++#if defined(NO_KDE)
++    _tmp->setFileTemplate(QLatin1String("XXXXXX") + _extension);
++    _tmp->setAutoRemove(true);
++#else
+     if (!_extension.isEmpty()) {
+       _tmp->setSuffix("." + _extension);
+     }
++#endif
+     if (!_tmp->open()) {
+       _error = i18n("Could not create temporary file.");
+       _log.sorry(_error, i18n("File: %1").arg(_tmp->name()));
diff -urN /usr/ports/devel/piklab/files/patch-src__common__port__hid_port.h devel/piklab/files/patch-src__common__port__hid_port.h
--- /usr/ports/devel/piklab/files/patch-src__common__port__hid_port.h	1970-01-01 09:00:00.000000000 +0900
+++ devel/piklab/files/patch-src__common__port__hid_port.h	2012-10-17 22:33:45.000000000 +0900
@@ -0,0 +1,17 @@
+--- src/common/port/hid_port.h.orig	2012-10-15 14:22:38.000000000 +0900
++++ src/common/port/hid_port.h	2012-10-17 22:32:50.000000000 +0900
+@@ -9,6 +9,8 @@
+ #ifndef HID_PORT_H
+ #define HID_PORT_H
+ 
++#ifdef __linux
++
+ #include "port_base.h"
+ 
+ #ifdef Q_OS_UNIX
+@@ -57,3 +59,5 @@
+ } // namespace
+ 
+ #endif
++
++#endif
>Release-Note:
>Audit-Trail:
>Unformatted:
