Index: head/devel/piklab/Makefile =================================================================== --- head/devel/piklab/Makefile (revision 299911) +++ head/devel/piklab/Makefile (revision 299912) @@ -1,45 +1,49 @@ # New ports collection makefile for: piklab # Date created: 2007-11-19 # Whom: Michael Nottebrock # # $FreeBSD$ # PORTNAME= piklab -PORTVERSION= 0.15.10 -PORTREVISION= 2 +PORTVERSION= 0.16.0 CATEGORIES= devel -MASTER_SITES= SF/${PORTNAME}/newest%20release/${PORTVERSION} +MASTER_SITES= SF MAINTAINER= ports@FreeBSD.org COMMENT= KDE IDE for microcontroller development LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING USE_BZIP2= yes -USE_KDELIBS_VER=3 +USE_QT4= corelib gui qt3support qtestlib xml \ + moc_build qmake_build rcc_build uic_build +USE_KDE4= automoc4 kdehier kdelibs kdeprefix sharedmime USE_GETTEXT= yes USE_CMAKE= yes INSTALLS_ICONS= yes MAKE_JOBS_SAFE= yes MAN1= piklab-hex.1 piklab-prog.1 piklab.1x .include .if ${ARCH} == "sparc64" BROKEN= Does not compile on sparc64 .endif .if ${OSVERSION} < 800069 LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb .endif post-patch: @${REINPLACE_CMD} -e \ '/install/s|^|#|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e \ + '/CMAKE_BUILD_TYPE/s|^|#| ; \ + /KDE4/s|INCLUDE_DIRS|INCLUDES|' ${WRKSRC}/cmake/Piklab.cmake @${REINPLACE_CMD} -e \ '/install/s|share/man|man|' ${WRKSRC}/man/CMakeLists.txt .include Property changes on: head/devel/piklab/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.16 \ No newline at end of property +1.17 \ No newline at end of property Index: head/devel/piklab/distinfo =================================================================== --- head/devel/piklab/distinfo (revision 299911) +++ head/devel/piklab/distinfo (revision 299912) @@ -1,2 +1,2 @@ -SHA256 (piklab-0.15.10.tar.bz2) = 9ae1fc44bdd8eb99d67d74507a55b8115579791bc36235fa4a93748bbd18b418 -SIZE (piklab-0.15.10.tar.bz2) = 929956 +SHA256 (piklab-0.16.0.tar.bz2) = f79d29e795f158a388d07fe1fe23ef912ea77ba74428efd1bcdd23e2c3ded788 +SIZE (piklab-0.16.0.tar.bz2) = 931968 Property changes on: head/devel/piklab/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.3 \ No newline at end of property +1.4 \ No newline at end of property Index: head/devel/piklab/files/patch-doc__CMakeLists.txt =================================================================== --- head/devel/piklab/files/patch-doc__CMakeLists.txt (revision 299911) +++ head/devel/piklab/files/patch-doc__CMakeLists.txt (nonexistent) @@ -1,6 +0,0 @@ ---- ./doc/CMakeLists.txt.orig 2011-09-04 14:24:24.000000000 +0200 -+++ ./doc/CMakeLists.txt 2011-09-04 14:26:07.000000000 +0200 -@@ -1,2 +1,2 @@ - --install(FILES index.docbook DESTINATION share/doc/HTML/en/piklab) -+install(FILES index.docbook DESTINATION share/doc/piklab/HTML/en) Property changes on: head/devel/piklab/files/patch-doc__CMakeLists.txt ___________________________________________________________________ Deleted: cvs2svn:cvs-rev ## -1 +0,0 ## -1.1 \ No newline at end of property Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/devel/piklab/files/patch-src_common__port__hid_port.cpp =================================================================== --- head/devel/piklab/files/patch-src_common__port__hid_port.cpp (nonexistent) +++ head/devel/piklab/files/patch-src_common__port__hid_port.cpp (revision 299912) @@ -0,0 +1,17 @@ +--- src/common/port/hid_port.cpp.orig 2012-06-04 07:17:40.000000000 +0900 ++++ src/common/port/hid_port.cpp 2012-06-06 23:02:40.000000000 +0900 +@@ -7,6 +7,8 @@ + * the Free Software Foundation; either version 2 of the License, or * + * (at your option) any later version. * + ***************************************************************************/ ++#ifdef __linux ++ + #include "hid_port.h" + + #ifdef Q_OS_UNIX +@@ -140,3 +142,5 @@ + } + + #endif ++ ++#endif Property changes on: head/devel/piklab/files/patch-src_common__port__hid_port.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/piklab/files/patch-src_common__port__port.cpp =================================================================== --- head/devel/piklab/files/patch-src_common__port__port.cpp (nonexistent) +++ head/devel/piklab/files/patch-src_common__port__port.cpp (revision 299912) @@ -0,0 +1,35 @@ +--- 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; Property changes on: head/devel/piklab/files/patch-src_common__port__port.cpp ___________________________________________________________________ Added: cvs2svn:cvs-rev ## -0,0 +1 ## +1.1 \ No newline at end of property Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Index: head/devel/piklab/pkg-plist =================================================================== --- head/devel/piklab/pkg-plist (revision 299911) +++ head/devel/piklab/pkg-plist (revision 299912) @@ -1,83 +1,36 @@ bin/piklab bin/piklab-coff bin/piklab-hex bin/piklab-prog -share/applications/kde/piklab.desktop +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 -%%DOCSDIR%%/HTML/en/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/doc/HTML/en/piklab/index.docbook 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/es/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/mimelnk/application/x-piklab.desktop -@dirrmtry %%DOCSDIR%%/HTML/en -@dirrmtry %%DOCSDIR%%/HTML -@dirrmtry %%DOCSDIR%% +share/mime/packages/piklab.xml +@dirrm share/doc/HTML/en/piklab +@dirrm share/apps/piklab/pics @dirrm share/apps/piklab -@dirrmtry share/apps/katepart/syntax -@dirrmtry share/apps/katepart -@dirrmtry share/apps +@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 Property changes on: head/devel/piklab/pkg-plist ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property