Date: Thu, 26 Jul 2012 02:43:00 +0900 From: KATO Tsuguru <tkato432@yahoo.com> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/170145: devel/piklab: Update to version 0.16.1 Message-ID: <20120726024300.afc4a62f791c747309b6dc47@yahoo.com> Resent-Message-ID: <201207251810.q6PIAAh8060734@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 170145
>Category: ports
>Synopsis: devel/piklab: Update to version 0.16.1
>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 Jul 25 18:10:10 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: FreeBSD 7.4-RELEASE-p9 i386
>Organization:
>Environment:
>Description:
- Update to version 0.16.1
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/devel/piklab/Makefile devel/piklab/Makefile
--- /usr/ports/devel/piklab/Makefile 2012-06-25 08:46:49.000000000 +0900
+++ devel/piklab/Makefile 2012-07-08 23:42:01.000000000 +0900
@@ -6,7 +6,7 @@
#
PORTNAME= piklab
-PORTVERSION= 0.16.0
+PORTVERSION= 0.16.1
CATEGORIES= devel
MASTER_SITES= SF
@@ -16,16 +16,30 @@
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 <bsd.port.options.mk>
+
+.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 <bsd.port.pre.mk>
@@ -39,11 +53,16 @@
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 <bsd.port.post.mk>
diff -urN /usr/ports/devel/piklab/distinfo devel/piklab/distinfo
--- /usr/ports/devel/piklab/distinfo 2012-06-25 08:46:49.000000000 +0900
+++ devel/piklab/distinfo 2012-07-03 15:34:29.000000000 +0900
@@ -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
diff -urN /usr/ports/devel/piklab/pkg-plist devel/piklab/pkg-plist
--- /usr/ports/devel/piklab/pkg-plist 2012-06-25 08:46:49.000000000 +0900
+++ devel/piklab/pkg-plist 2012-07-03 15:53:42.000000000 +0900
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20120726024300.afc4a62f791c747309b6dc47>