Attachment #125381 for bug #168996

Lines 6-15 Link Here

(-)devel/piklab/Makefile (-4 / +8 lines)
6	#	6	#
7		7
8	PORTNAME= piklab	8	PORTNAME= piklab
9	PORTVERSION= 0.15.10	9	PORTVERSION= 0.16.0
10	PORTREVISION= 2
11	CATEGORIES= devel	10	CATEGORIES= devel
12	MASTER_SITES= SF/${PORTNAME}/newest%20release/${PORTVERSION}	11	MASTER_SITES= SF
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
15	COMMENT= KDE IDE for microcontroller development	14	COMMENT= KDE IDE for microcontroller development
Lines 18-24 Link Here
18	LICENSE_FILE= ${WRKSRC}/COPYING	17	LICENSE_FILE= ${WRKSRC}/COPYING
19		18
20	USE_BZIP2= yes	19	USE_BZIP2= yes
21	USE_KDELIBS_VER=3	20	USE_QT4= corelib gui qt3support qtestlib xml \
		21	moc_build qmake_build rcc_build uic_build
		22	USE_KDE4= automoc4 kdehier kdelibs kdeprefix sharedmime
22	USE_GETTEXT= yes	23	USE_GETTEXT= yes
23	USE_CMAKE= yes	24	USE_CMAKE= yes
24	INSTALLS_ICONS= yes	25	INSTALLS_ICONS= yes
Lines 40-45 Link Here
40	@${REINPLACE_CMD} -e \	41	@${REINPLACE_CMD} -e \
41	'/install/s\|^\|#\|' ${WRKSRC}/CMakeLists.txt	42	'/install/s\|^\|#\|' ${WRKSRC}/CMakeLists.txt
42	@${REINPLACE_CMD} -e \	43	@${REINPLACE_CMD} -e \
		44	'/CMAKE_BUILD_TYPE/s\|^\|#\| ; \
		45	/KDE4/s\|INCLUDE_DIRS\|INCLUDES\|' ${WRKSRC}/cmake/Piklab.cmake
		46	@${REINPLACE_CMD} -e \
43	'/install/s\|share/man\|man\|' ${WRKSRC}/man/CMakeLists.txt	47	'/install/s\|share/man\|man\|' ${WRKSRC}/man/CMakeLists.txt
44		48
45	.include <bsd.port.post.mk>	49	.include <bsd.port.post.mk>

Lines 1-2 Link Here

(-)devel/piklab/distinfo (-2 / +2 lines)
1	SHA256 (piklab-0.15.10.tar.bz2) = 9ae1fc44bdd8eb99d67d74507a55b8115579791bc36235fa4a93748bbd18b418	1	SHA256 (piklab-0.16.0.tar.bz2) = f79d29e795f158a388d07fe1fe23ef912ea77ba74428efd1bcdd23e2c3ded788
2	SIZE (piklab-0.15.10.tar.bz2) = 929956	2	SIZE (piklab-0.16.0.tar.bz2) = 931968

Lines 1-6 Link Here

(-)devel/piklab/files/patch-doc__CMakeLists.txt (-6 lines)
1	--- ./doc/CMakeLists.txt.orig 2011-09-04 14:24:24.000000000 +0200
2	+++ ./doc/CMakeLists.txt 2011-09-04 14:26:07.000000000 +0200
3	@@ -1,2 +1,2 @@
4
5	-install(FILES index.docbook DESTINATION share/doc/HTML/en/piklab)
6	+install(FILES index.docbook DESTINATION share/doc/piklab/HTML/en)

Line 0 Link Here

(-)devel/piklab/files/patch-src_common__port__hid_port.cpp (+17 lines)
	1	--- src/common/port/hid_port.cpp.orig 2012-06-04 07:17:40.000000000 +0900
	2	+++ src/common/port/hid_port.cpp 2012-06-06 23:02:40.000000000 +0900
	3	@@ -7,6 +7,8 @@
	4	* the Free Software Foundation; either version 2 of the License, or *
	5	* (at your option) any later version. *
	6	***************************************************************************/
	7	+#ifdef __linux
	8	+
	9	#include "hid_port.h"
	10
	11	#ifdef Q_OS_UNIX
	12	@@ -140,3 +142,5 @@
	13	}
	14
	15	#endif
	16	+
	17	+#endif




--- src/common/port/port.cpp.orig	2012-06-04 07:17:40.000000000 +0900
+++ src/common/port/port.cpp	2012-06-06 23:01:04.000000000 +0900
@@ -60,8 +60,12 @@
 const PortType::Data PortType::DATA[Nb_Types] = {
   { I18N_NOOP("Serial Port"),   "serial",   true  },
   { I18N_NOOP("Parallel Port"), "parallel", true  },
+#ifdef __linux
   { I18N_NOOP("USB Port"),      "usb",      false },
   { I18N_NOOP("HID Port"),      "hid",      false }
+#else
+  { I18N_NOOP("USB Port"),      "usb",      false }
+#endif
 };
 
 const char * const Port::IO_DIR_NAMES[3] = { "no_io", "in", "out" };
@@ -73,7 +77,9 @@
     case PortType::Serial:   return Serial::probedDeviceList();
     case PortType::Parallel: return Parallel::probedDeviceList();
     case PortType::USB:      return USB::probedDeviceList();
+#ifdef __linux
     case PortType::HID:      return HID::probedDeviceList();
+#endif
     case PortType::Nb_Types: break;
   }
   return QStringList();
@@ -85,7 +91,9 @@
     case PortType::Serial:   return Serial::isAvailable();
     case PortType::Parallel: return Parallel::isAvailable();
     case PortType::USB:      return USB::isAvailable();
+#ifdef __linux
     case PortType::HID:      return HID::isAvailable();
+#endif
     case PortType::Nb_Types: break;
   }
   return false;




bin/piklab-coff
bin/piklab-hex
bin/piklab-prog
share/applications/kde4/piklab.desktop
share/apps/katepart/syntax/asm-pic.xml
share/apps/katepart/syntax/coff-c-pic.xml
share/apps/katepart/syntax/coff-pic.xml
share/apps/katepart/syntax/jal-pic.xml
share/apps/piklab/hexeditorpartui.rc
share/apps/piklab/katepartui.rc
share/apps/piklab/pics/breakpoint_active.png
share/apps/piklab/pics/breakpoint_disabled.png
share/apps/piklab/pics/breakpoint_invalid.png
share/apps/piklab/pics/breakpoint_reached.png
share/apps/piklab/pics/program_counter.png
share/apps/piklab/pics/program_counter_disabled.png
share/apps/piklab/piklabui.rc
share/doc/HTML/en/piklab/index.docbook
share/icons/hicolor/16x16/actions/piklab_addcurrentfile.png
share/icons/hicolor/16x16/actions/piklab_addfile.png
share/icons/hicolor/16x16/actions/piklab_blankcheck.png
share/icons/hicolor/16x16/actions/piklab_burnchip.png
share/icons/hicolor/16x16/actions/piklab_chip.png
share/icons/hicolor/16x16/actions/piklab_closeproject.png
share/icons/hicolor/16x16/actions/piklab_compile.png
share/icons/hicolor/16x16/actions/piklab_createproject.png
share/icons/hicolor/16x16/actions/piklab_decompile.png
share/icons/hicolor/16x16/actions/piklab_editproject.png
share/icons/hicolor/16x16/actions/piklab_erasechip.png
share/icons/hicolor/16x16/actions/piklab_find_next.png
share/icons/hicolor/16x16/actions/piklab_find_previous.png
share/icons/hicolor/16x16/actions/piklab_likeback_bug.png
share/icons/hicolor/16x16/actions/piklab_likeback_dislike.png
share/icons/hicolor/16x16/actions/piklab_likeback_like.png
share/icons/hicolor/16x16/actions/piklab_openproject.png
share/icons/hicolor/16x16/actions/piklab_readchip.png
share/icons/hicolor/16x16/actions/piklab_verifychip.png
share/icons/hicolor/16x16/apps/piklab.png
share/icons/hicolor/22x22/actions/piklab_addcurrentfile.png
share/icons/hicolor/22x22/actions/piklab_addfile.png
share/icons/hicolor/22x22/actions/piklab_blankcheck.png
share/icons/hicolor/22x22/actions/piklab_breakpoint_active.png
share/icons/hicolor/22x22/actions/piklab_breakpoint_disabled.png
share/icons/hicolor/22x22/actions/piklab_breakpoint_invalid.png
share/icons/hicolor/22x22/actions/piklab_breakpoint_reached.png
share/icons/hicolor/22x22/actions/piklab_burnchip.png
share/icons/hicolor/22x22/actions/piklab_chip.png
share/icons/hicolor/22x22/actions/piklab_closeproject.png
share/icons/hicolor/22x22/actions/piklab_compile.png
share/icons/hicolor/22x22/actions/piklab_createproject.png
share/icons/hicolor/22x22/actions/piklab_debug_step.png
share/icons/hicolor/22x22/actions/piklab_debug_stepin.png
share/icons/hicolor/22x22/actions/piklab_debug_stepout.png
share/icons/hicolor/22x22/actions/piklab_debug_stepover.png
share/icons/hicolor/22x22/actions/piklab_debughalt.png
share/icons/hicolor/22x22/actions/piklab_decompile.png
share/icons/hicolor/22x22/actions/piklab_editproject.png
share/icons/hicolor/22x22/actions/piklab_erasechip.png
share/icons/hicolor/22x22/actions/piklab_find_next.png
share/icons/hicolor/22x22/actions/piklab_find_previous.png
share/icons/hicolor/22x22/actions/piklab_openproject.png
share/icons/hicolor/22x22/actions/piklab_power.png
share/icons/hicolor/22x22/actions/piklab_program_counter.png
share/icons/hicolor/22x22/actions/piklab_program_counter_disabled.png
share/icons/hicolor/22x22/actions/piklab_readchip.png
share/icons/hicolor/22x22/actions/piklab_restart.png
share/icons/hicolor/22x22/actions/piklab_run.png
share/icons/hicolor/22x22/actions/piklab_stop.png
share/icons/hicolor/22x22/actions/piklab_verifychip.png
share/icons/hicolor/32x32/actions/piklab_config_assembler.png
share/icons/hicolor/32x32/actions/piklab_config_disassembler.png
share/icons/hicolor/32x32/actions/piklab_config_programmer.png
share/icons/hicolor/32x32/apps/piklab.png
share/icons/hicolor/32x32/mimetypes/piklab_project.png
share/icons/hicolor/48x48/apps/piklab.png
share/icons/hicolor/64x64/apps/piklab.png
share/locale/cs/LC_MESSAGES/piklab.mo
share/locale/de/LC_MESSAGES/piklab.mo

share/locale/fr/LC_MESSAGES/piklab.mo
share/locale/hu/LC_MESSAGES/piklab.mo
share/locale/it/LC_MESSAGES/piklab.mo
share/mime/packages/piklab.xml
@dirrm share/doc/HTML/en/piklab
@dirrm share/apps/piklab/pics
@dirrmtry %%DOCSDIR%%
@dirrm share/apps/piklab
@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true
@dirrmtry share/apps

Return to bug 168996

Line 0 Link Here

(-)devel/piklab/files/patch-src_common__port__port.cpp (+35 lines)
	1	--- src/common/port/port.cpp.orig 2012-06-04 07:17:40.000000000 +0900
	2	+++ src/common/port/port.cpp 2012-06-06 23:01:04.000000000 +0900
	3	@@ -60,8 +60,12 @@
	4	const PortType::Data PortType::DATA[Nb_Types] = {
	5	{ I18N_NOOP("Serial Port"), "serial", true },
	6	{ I18N_NOOP("Parallel Port"), "parallel", true },
	7	+#ifdef __linux
	8	{ I18N_NOOP("USB Port"), "usb", false },
	9	{ I18N_NOOP("HID Port"), "hid", false }
	10	+#else
	11	+ { I18N_NOOP("USB Port"), "usb", false }
	12	+#endif
	13	};
	14
	15	const char * const Port::IO_DIR_NAMES[3] = { "no_io", "in", "out" };
	16	@@ -73,7 +77,9 @@
	17	case PortType::Serial: return Serial::probedDeviceList();
	18	case PortType::Parallel: return Parallel::probedDeviceList();
	19	case PortType::USB: return USB::probedDeviceList();
	20	+#ifdef __linux
	21	case PortType::HID: return HID::probedDeviceList();
	22	+#endif
	23	case PortType::Nb_Types: break;
	24	}
	25	return QStringList();
	26	@@ -85,7 +91,9 @@
	27	case PortType::Serial: return Serial::isAvailable();
	28	case PortType::Parallel: return Parallel::isAvailable();
	29	case PortType::USB: return USB::isAvailable();
	30	+#ifdef __linux
	31	case PortType::HID: return HID::isAvailable();
	32	+#endif
	33	case PortType::Nb_Types: break;
	34	}
	35	return false;

Lines 2-71 Link Here

(-)devel/piklab/pkg-plist (-62 / +15 lines)
2	bin/piklab-coff	2	bin/piklab-coff
3	bin/piklab-hex	3	bin/piklab-hex
4	bin/piklab-prog	4	bin/piklab-prog
5	share/applications/kde/piklab.desktop	5	share/applications/kde4/piklab.desktop
6	share/apps/katepart/syntax/asm-pic.xml	6	share/apps/katepart/syntax/asm-pic.xml
7	share/apps/katepart/syntax/coff-c-pic.xml	7	share/apps/katepart/syntax/coff-c-pic.xml
8	share/apps/katepart/syntax/coff-pic.xml	8	share/apps/katepart/syntax/coff-pic.xml
9	share/apps/katepart/syntax/jal-pic.xml	9	share/apps/katepart/syntax/jal-pic.xml
10	share/apps/piklab/hexeditorpartui.rc	10	share/apps/piklab/hexeditorpartui.rc
		11	share/apps/piklab/katepartui.rc
		12	share/apps/piklab/pics/breakpoint_active.png
		13	share/apps/piklab/pics/breakpoint_disabled.png
		14	share/apps/piklab/pics/breakpoint_invalid.png
		15	share/apps/piklab/pics/breakpoint_reached.png
		16	share/apps/piklab/pics/program_counter.png
		17	share/apps/piklab/pics/program_counter_disabled.png
11	share/apps/piklab/piklabui.rc	18	share/apps/piklab/piklabui.rc
12	%%DOCSDIR%%/HTML/en/index.docbook	19	share/doc/HTML/en/piklab/index.docbook
13	share/icons/hicolor/16x16/actions/piklab_addcurrentfile.png
14	share/icons/hicolor/16x16/actions/piklab_addfile.png
15	share/icons/hicolor/16x16/actions/piklab_blankcheck.png
16	share/icons/hicolor/16x16/actions/piklab_burnchip.png
17	share/icons/hicolor/16x16/actions/piklab_chip.png
18	share/icons/hicolor/16x16/actions/piklab_closeproject.png
19	share/icons/hicolor/16x16/actions/piklab_compile.png
20	share/icons/hicolor/16x16/actions/piklab_createproject.png
21	share/icons/hicolor/16x16/actions/piklab_decompile.png
22	share/icons/hicolor/16x16/actions/piklab_editproject.png
23	share/icons/hicolor/16x16/actions/piklab_erasechip.png
24	share/icons/hicolor/16x16/actions/piklab_find_next.png
25	share/icons/hicolor/16x16/actions/piklab_find_previous.png
26	share/icons/hicolor/16x16/actions/piklab_likeback_bug.png
27	share/icons/hicolor/16x16/actions/piklab_likeback_dislike.png
28	share/icons/hicolor/16x16/actions/piklab_likeback_like.png
29	share/icons/hicolor/16x16/actions/piklab_openproject.png
30	share/icons/hicolor/16x16/actions/piklab_readchip.png
31	share/icons/hicolor/16x16/actions/piklab_verifychip.png
32	share/icons/hicolor/16x16/apps/piklab.png	20	share/icons/hicolor/16x16/apps/piklab.png
33	share/icons/hicolor/22x22/actions/piklab_addcurrentfile.png
34	share/icons/hicolor/22x22/actions/piklab_addfile.png
35	share/icons/hicolor/22x22/actions/piklab_blankcheck.png
36	share/icons/hicolor/22x22/actions/piklab_breakpoint_active.png
37	share/icons/hicolor/22x22/actions/piklab_breakpoint_disabled.png
38	share/icons/hicolor/22x22/actions/piklab_breakpoint_invalid.png
39	share/icons/hicolor/22x22/actions/piklab_breakpoint_reached.png
40	share/icons/hicolor/22x22/actions/piklab_burnchip.png
41	share/icons/hicolor/22x22/actions/piklab_chip.png
42	share/icons/hicolor/22x22/actions/piklab_closeproject.png
43	share/icons/hicolor/22x22/actions/piklab_compile.png
44	share/icons/hicolor/22x22/actions/piklab_createproject.png
45	share/icons/hicolor/22x22/actions/piklab_debug_step.png
46	share/icons/hicolor/22x22/actions/piklab_debug_stepin.png
47	share/icons/hicolor/22x22/actions/piklab_debug_stepout.png
48	share/icons/hicolor/22x22/actions/piklab_debug_stepover.png
49	share/icons/hicolor/22x22/actions/piklab_debughalt.png
50	share/icons/hicolor/22x22/actions/piklab_decompile.png
51	share/icons/hicolor/22x22/actions/piklab_editproject.png
52	share/icons/hicolor/22x22/actions/piklab_erasechip.png
53	share/icons/hicolor/22x22/actions/piklab_find_next.png
54	share/icons/hicolor/22x22/actions/piklab_find_previous.png
55	share/icons/hicolor/22x22/actions/piklab_openproject.png
56	share/icons/hicolor/22x22/actions/piklab_power.png
57	share/icons/hicolor/22x22/actions/piklab_program_counter.png
58	share/icons/hicolor/22x22/actions/piklab_program_counter_disabled.png
59	share/icons/hicolor/22x22/actions/piklab_readchip.png
60	share/icons/hicolor/22x22/actions/piklab_restart.png
61	share/icons/hicolor/22x22/actions/piklab_run.png
62	share/icons/hicolor/22x22/actions/piklab_stop.png
63	share/icons/hicolor/22x22/actions/piklab_verifychip.png
64	share/icons/hicolor/32x32/actions/piklab_config_assembler.png
65	share/icons/hicolor/32x32/actions/piklab_config_disassembler.png
66	share/icons/hicolor/32x32/actions/piklab_config_programmer.png
67	share/icons/hicolor/32x32/apps/piklab.png	21	share/icons/hicolor/32x32/apps/piklab.png
68	share/icons/hicolor/32x32/mimetypes/piklab_project.png	22	share/icons/hicolor/32x32/mimetypes/piklab_project.png
		23	share/icons/hicolor/48x48/apps/piklab.png
69	share/icons/hicolor/64x64/apps/piklab.png	24	share/icons/hicolor/64x64/apps/piklab.png
70	share/locale/cs/LC_MESSAGES/piklab.mo	25	share/locale/cs/LC_MESSAGES/piklab.mo
71	share/locale/de/LC_MESSAGES/piklab.mo	26	share/locale/de/LC_MESSAGES/piklab.mo
Lines 73-83 Link Here
73	share/locale/fr/LC_MESSAGES/piklab.mo	28	share/locale/fr/LC_MESSAGES/piklab.mo
74	share/locale/hu/LC_MESSAGES/piklab.mo	29	share/locale/hu/LC_MESSAGES/piklab.mo
75	share/locale/it/LC_MESSAGES/piklab.mo	30	share/locale/it/LC_MESSAGES/piklab.mo
76	share/mimelnk/application/x-piklab.desktop	31	share/mime/packages/piklab.xml
77	@dirrmtry %%DOCSDIR%%/HTML/en	32	@dirrm share/doc/HTML/en/piklab
78	@dirrmtry %%DOCSDIR%%/HTML	33	@dirrm share/apps/piklab/pics
79	@dirrmtry %%DOCSDIR%%
80	@dirrm share/apps/piklab	34	@dirrm share/apps/piklab
81	@dirrmtry share/apps/katepart/syntax	35	@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null \|\| /usr/bin/true
82	@dirrmtry share/apps/katepart	36	@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null \|\| /usr/bin/true
83	@dirrmtry share/apps