Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 1 Feb 2014 12:16:37 +0000 (UTC)
From:      Max Brazhnikov <makc@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r342127 - head/devel/piklab
Message-ID:  <201402011216.s11CGb3T052929@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: makc
Date: Sat Feb  1 12:16:36 2014
New Revision: 342127
URL: http://svnweb.freebsd.org/changeset/ports/342127
QAT: https://qat.redports.org/buildarchive/r342127/

Log:
  - Replace KDE4 sharedmime with USES=shared-mime-info
  - Add stage support
  - Use options helpers
  - Patch sources to install man pages to standard place and remove post-install
  - Add kde to CATEGORIES
  - Amend COMMENT

Modified:
  head/devel/piklab/Makefile
  head/devel/piklab/pkg-plist

Modified: head/devel/piklab/Makefile
==============================================================================
--- head/devel/piklab/Makefile	Sat Feb  1 12:15:59 2014	(r342126)
+++ head/devel/piklab/Makefile	Sat Feb  1 12:16:36 2014	(r342127)
@@ -3,54 +3,35 @@
 
 PORTNAME=	piklab
 PORTVERSION=	0.16.2
-CATEGORIES=	devel
+CATEGORIES=	devel kde
 MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
-COMMENT=	KDE IDE for microcontroller development
+COMMENT=	KDE/Qt IDE for microcontroller development
 
 LICENSE=	GPLv2 # (or later)
 
-OPTIONS_DEFINE=	KDE4
-OPTIONS_DEFAULT=KDE4
-
 USE_BZIP2=	yes
 DOS2UNIX_FILES=	cmake/Piklab.cmake
 USE_QT4=	corelib gui qt3support qtestlib xml \
 		moc_build qmake_build rcc_build uic_build
 USES=		cmake gettext readline dos2unix
 
-MAN1=		piklab-hex.1 piklab-prog.1
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	KDE4
+OPTIONS_DEFAULT=	KDE4
+OPTIONS_SUB=	yes
 
-.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 \
+KDE4_USES=	shared-mime-info
+KDE4_USE=	KDE4=automoc4,kdehier,kdelibs,kdeprefix
+KDE4_CMAKE_OFF=	-DQT_ONLY:BOOL=ON \
 		-DLOCALE_INSTALL_DIR:STRING="${PREFIX}/share/locale"
-PLIST_SUB+=	KDE4="@comment "
-.endif
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "sparc64"
-BROKEN=		Does not compile on sparc64
-.endif
+BROKEN_sparc64=		does not compile on sparc64
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/man/s|^|#| ; \
-		 /install/s|^|#|' ${WRKSRC}/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
+		'/install/s|^|#|' ${WRKSRC}/CMakeLists.txt
+	@${REINPLACE_CMD} -e \
+		's,share/man,man,' ${WRKSRC}/man/CMakeLists.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/piklab/pkg-plist
==============================================================================
--- head/devel/piklab/pkg-plist	Sat Feb  1 12:15:59 2014	(r342126)
+++ head/devel/piklab/pkg-plist	Sat Feb  1 12:16:36 2014	(r342127)
@@ -2,6 +2,9 @@
 bin/piklab-coff
 bin/piklab-hex
 bin/piklab-prog
+%%KDE4%%man/man1/piklab.1x.gz
+man/man1/piklab-hex.1.gz
+man/man1/piklab-prog.1.gz
 %%KDE4%%share/applications/kde4/piklab.desktop
 %%KDE4%%share/apps/katepart/syntax/asm-pic.xml
 %%KDE4%%share/apps/katepart/syntax/coff-c-pic.xml



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402011216.s11CGb3T052929>