diff options
| -rw-r--r-- | devel/piklab/Makefile | 21 | ||||
| -rw-r--r-- | devel/piklab/distinfo | 4 | ||||
| -rw-r--r-- | devel/piklab/files/patch-src_common__global__process.cpp | 11 | ||||
| -rw-r--r-- | devel/piklab/files/patch-src_common__port__usb_port.cpp | 15 | ||||
| -rw-r--r-- | devel/piklab/pkg-plist | 127 |
5 files changed, 98 insertions, 80 deletions
diff --git a/devel/piklab/Makefile b/devel/piklab/Makefile index 6837c266fe25..7ab0bdce9804 100644 --- a/devel/piklab/Makefile +++ b/devel/piklab/Makefile @@ -6,21 +6,22 @@ # PORTNAME= piklab -PORTVERSION= 0.15.2 -PORTREVISION= 5 +PORTVERSION= 0.15.10 CATEGORIES= devel -MASTER_SITES= SF +MASTER_SITES= SF/${PORTNAME}/newest%20release/${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= KDE IDE for microcontroller development -BROKEN= does not fetch +LICENSE= GPLv2 # (or later) +LICENSE_FILE= ${WRKSRC}/COPYING -USE_AUTOTOOLS= libtool -GNU_CONFIGURE= yes USE_BZIP2= yes USE_KDELIBS_VER=3 USE_GETTEXT= yes +USE_CMAKE= yes +INSTALLS_ICONS= yes +MAKE_JOBS_SAFE= yes MAN1= piklab-hex.1 piklab-prog.1 piklab.1x @@ -32,8 +33,12 @@ BROKEN= Does not compile on sparc64 .if ${OSVERSION} < 800069 LIB_DEPENDS+= usb:${PORTSDIR}/devel/libusb -. else -CONFIGURE_ENV+= LIBUSB_LIBS="-lusb" .endif +post-patch: + @${REINPLACE_CMD} -e \ + '/install/s|^|#|' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e \ + '/install/s|share/man|man|' ${WRKSRC}/man/CMakeLists.txt + .include <bsd.port.post.mk> diff --git a/devel/piklab/distinfo b/devel/piklab/distinfo index 449c88a9575d..5b3b1720c282 100644 --- a/devel/piklab/distinfo +++ b/devel/piklab/distinfo @@ -1,2 +1,2 @@ -SHA256 (piklab-0.15.2.tar.bz2) = 71e28b0873caf591dc9148706f901ea1d6a33a111954ee4e3a5badfa83549c7d -SIZE (piklab-0.15.2.tar.bz2) = 1417716 +SHA256 (piklab-0.15.10.tar.bz2) = 9ae1fc44bdd8eb99d67d74507a55b8115579791bc36235fa4a93748bbd18b418 +SIZE (piklab-0.15.10.tar.bz2) = 929956 diff --git a/devel/piklab/files/patch-src_common__global__process.cpp b/devel/piklab/files/patch-src_common__global__process.cpp new file mode 100644 index 000000000000..d53e7b8d37aa --- /dev/null +++ b/devel/piklab/files/patch-src_common__global__process.cpp @@ -0,0 +1,11 @@ +--- src/common/global/process.cpp.orig 2010-07-06 01:16:49.000000000 +0900 ++++ src/common/global/process.cpp 2011-08-22 00:40:39.000000000 +0900 +@@ -20,6 +20,8 @@ + #include "purl.h" + #include "common/common/synchronous.h" + ++extern char **environ; ++ + //---------------------------------------------------------------------------- + Process::State Process::runSynchronously(Base &process, RunActions actions, uint timeout) + { diff --git a/devel/piklab/files/patch-src_common__port__usb_port.cpp b/devel/piklab/files/patch-src_common__port__usb_port.cpp new file mode 100644 index 000000000000..bebf46086c37 --- /dev/null +++ b/devel/piklab/files/patch-src_common__port__usb_port.cpp @@ -0,0 +1,15 @@ +--- src/common/port/usb_port.cpp.orig 2010-07-06 01:16:50.000000000 +0900 ++++ src/common/port/usb_port.cpp 2011-09-01 20:09:27.000000000 +0900 +@@ -37,10 +37,12 @@ + _initialized = true; + #ifdef HAVE_USB + usb_init(); ++#if 0 + VersionData vd = VersionData::fromString(LIBUSB_VERSION); + QString s = QString("libusb %1").arg(vd.pretty()); + if ( vd<VersionData(0, 1, 8) ) qWarning("%s: may be too old (you need at least version 0.1.8)", s.latin1()); + #endif ++#endif + } + + bool Port::USB::isAvailable() diff --git a/devel/piklab/pkg-plist b/devel/piklab/pkg-plist index e8c46f595c1e..a62b2b9b9ddf 100644 --- a/devel/piklab/pkg-plist +++ b/devel/piklab/pkg-plist @@ -8,64 +8,62 @@ 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/icons/crystalsvg/16x16/actions/likeback_dislike.png -share/apps/piklab/icons/crystalsvg/16x16/actions/likeback_like.png -share/apps/piklab/icons/hicolor/16x16/actions/likeback_bug.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_addcurrentfile.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_addfile.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_blankcheck.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_burnchip.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_chip.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_closeproject.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_compile.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_createproject.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_decompile.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_editproject.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_erasechip.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_find_next.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_find_previous.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_openproject.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_readchip.png -share/apps/piklab/icons/hicolor/16x16/actions/piklab_verifychip.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_addcurrentfile.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_addfile.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_blankcheck.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_breakpoint_active.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_breakpoint_disabled.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_breakpoint_invalid.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_breakpoint_reached.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_burnchip.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_chip.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_closeproject.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_compile.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_createproject.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_debug_step.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_debug_stepin.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_debug_stepout.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_debug_stepover.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_debughalt.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_decompile.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_editproject.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_erasechip.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_find_next.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_find_previous.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_openproject.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_power.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_program_counter.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_program_counter_disabled.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_readchip.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_restart.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_run.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_stop.png -share/apps/piklab/icons/hicolor/22x22/actions/piklab_verifychip.png -share/apps/piklab/icons/hicolor/32x32/actions/piklab_config_assembler.png -share/apps/piklab/icons/hicolor/32x32/actions/piklab_config_disassembler.png -share/apps/piklab/icons/hicolor/32x32/actions/piklab_config_programmer.png share/apps/piklab/piklabui.rc -share/doc/HTML/en/piklab/common -share/doc/HTML/en/piklab/index.cache.bz2 -share/doc/HTML/en/piklab/index.docbook +%%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/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/64x64/apps/piklab.png @@ -76,20 +74,9 @@ 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 -@dirrm share/doc/HTML/en/piklab -@dirrmtry share/doc/HTML/en -@dirrmtry share/doc/HTML -@dirrm share/apps/piklab/icons/hicolor/32x32/actions -@dirrm share/apps/piklab/icons/hicolor/32x32 -@dirrm share/apps/piklab/icons/hicolor/22x22/actions -@dirrm share/apps/piklab/icons/hicolor/22x22 -@dirrm share/apps/piklab/icons/hicolor/16x16/actions -@dirrm share/apps/piklab/icons/hicolor/16x16 -@dirrm share/apps/piklab/icons/hicolor -@dirrm share/apps/piklab/icons/crystalsvg/16x16/actions -@dirrm share/apps/piklab/icons/crystalsvg/16x16/ -@dirrm share/apps/piklab/icons/crystalsvg -@dirrm share/apps/piklab/icons +@dirrmtry %%DOCSDIR%%/HTML/en +@dirrmtry %%DOCSDIR%%/HTML +@dirrmtry %%DOCSDIR%% @dirrm share/apps/piklab @dirrmtry share/apps/katepart/syntax @dirrmtry share/apps/katepart |