From owner-svn-ports-head@FreeBSD.ORG Sun Aug 5 04:57:58 2012 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id A843B106566C; Sun, 5 Aug 2012 04:57:58 +0000 (UTC) (envelope-from miwi@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 890DD8FC0C; Sun, 5 Aug 2012 04:57:58 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q754vwpk037633; Sun, 5 Aug 2012 04:57:58 GMT (envelope-from miwi@svn.freebsd.org) Received: (from miwi@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q754vwJU037629; Sun, 5 Aug 2012 04:57:58 GMT (envelope-from miwi@svn.freebsd.org) Message-Id: <201208050457.q754vwJU037629@svn.freebsd.org> From: Martin Wilke Date: Sun, 5 Aug 2012 04:57:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r302052 - head/devel/piklab X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 05 Aug 2012 04:57:58 -0000 Author: miwi Date: Sun Aug 5 04:57:57 2012 New Revision: 302052 URL: http://svn.freebsd.org/changeset/ports/302052 Log: - Update to 0.16.1 PR: 170145 Submitted by: Ports Fury Modified: head/devel/piklab/Makefile head/devel/piklab/distinfo head/devel/piklab/pkg-plist Modified: head/devel/piklab/Makefile ============================================================================== --- head/devel/piklab/Makefile Sun Aug 5 04:57:54 2012 (r302051) +++ head/devel/piklab/Makefile Sun Aug 5 04:57:57 2012 (r302052) @@ -6,7 +6,7 @@ # PORTNAME= piklab -PORTVERSION= 0.16.0 +PORTVERSION= 0.16.1 CATEGORIES= devel MASTER_SITES= SF @@ -16,16 +16,30 @@ COMMENT= KDE IDE for microcontroller dev LICENSE= GPLv2 # (or later) LICENSE_FILE= ${WRKSRC}/COPYING +OPTIONS_DEFINE= KDE4 +OPTIONS_DEFAULT=KDE4 + USE_BZIP2= yes 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 +MAN1= piklab-hex.1 piklab-prog.1 + +.include + +.if ${PORT_OPTIONS:MKDE4} +USE_KDE4= automoc4 kdehier kdelibs kdeprefix sharedmime +INSTALLS_ICONS= yes +MAN1+= piklab.1x +PLIST_SUB+= KDE4="" +.else +CMAKE_ARGS+= -DQT_ONLY:BOOL=ON \ + -DLOCALE_INSTALL_DIR:STRING="${PREFIX}/share/locale" +PLIST_SUB+= KDE4="@comment " +.endif .include @@ -39,11 +53,16 @@ LIB_DEPENDS+= usb:${PORTSDIR}/devel/libu post-patch: @${REINPLACE_CMD} -e \ - '/install/s|^|#|' ${WRKSRC}/CMakeLists.txt + '/man/s|^|#| ; \ + /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 + +post-install: + ${INSTALL_MAN} ${WRKSRC}/man/piklab-*.1 ${MANPREFIX}/man/man1 +.if ${PORT_OPTIONS:MKDE4} + ${INSTALL_MAN} ${WRKSRC}/man/piklab.1x ${MANPREFIX}/man/man1 +.endif .include Modified: head/devel/piklab/distinfo ============================================================================== --- head/devel/piklab/distinfo Sun Aug 5 04:57:54 2012 (r302051) +++ head/devel/piklab/distinfo Sun Aug 5 04:57:57 2012 (r302052) @@ -1,2 +1,2 @@ -SHA256 (piklab-0.16.0.tar.bz2) = f79d29e795f158a388d07fe1fe23ef912ea77ba74428efd1bcdd23e2c3ded788 -SIZE (piklab-0.16.0.tar.bz2) = 931968 +SHA256 (piklab-0.16.1.tar.bz2) = 80db24022de47a7377412912b1fd186d6ad08fafa042bed17b49ada2de56004d +SIZE (piklab-0.16.1.tar.bz2) = 972681 Modified: head/devel/piklab/pkg-plist ============================================================================== --- head/devel/piklab/pkg-plist Sun Aug 5 04:57:54 2012 (r302051) +++ head/devel/piklab/pkg-plist Sun Aug 5 04:57:57 2012 (r302052) @@ -1,36 +1,36 @@ -bin/piklab +%%KDE4%%bin/piklab 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/apps/piklab.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 +%%KDE4%%share/applications/kde4/piklab.desktop +%%KDE4%%share/apps/katepart/syntax/asm-pic.xml +%%KDE4%%share/apps/katepart/syntax/coff-c-pic.xml +%%KDE4%%share/apps/katepart/syntax/coff-pic.xml +%%KDE4%%share/apps/katepart/syntax/jal-pic.xml +%%KDE4%%share/apps/piklab/hexeditorpartui.rc +%%KDE4%%share/apps/piklab/katepartui.rc +%%KDE4%%share/apps/piklab/pics/breakpoint_active.png +%%KDE4%%share/apps/piklab/pics/breakpoint_disabled.png +%%KDE4%%share/apps/piklab/pics/breakpoint_invalid.png +%%KDE4%%share/apps/piklab/pics/breakpoint_reached.png +%%KDE4%%share/apps/piklab/pics/program_counter.png +%%KDE4%%share/apps/piklab/pics/program_counter_disabled.png +%%KDE4%%share/apps/piklab/piklabui.rc +%%KDE4%%share/doc/HTML/en/piklab/index.docbook +%%KDE4%%share/icons/hicolor/16x16/apps/piklab.png +%%KDE4%%share/icons/hicolor/32x32/apps/piklab.png +%%KDE4%%share/icons/hicolor/32x32/mimetypes/piklab_project.png +%%KDE4%%share/icons/hicolor/48x48/apps/piklab.png +%%KDE4%%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/mime/packages/piklab.xml -@dirrm share/doc/HTML/en/piklab -@dirrm share/apps/piklab/pics -@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 +%%KDE4%%share/mime/packages/piklab.xml +%%KDE4%%@dirrm share/doc/HTML/en/piklab +%%KDE4%%@dirrm share/apps/piklab/pics +%%KDE4%%@dirrm share/apps/piklab +%%KDE4%%@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true +%%KDE4%%@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime > /dev/null || /usr/bin/true