Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/cppcheck/options.mk,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/devel/cppcheck/options.mk,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- pkgsrc/devel/cppcheck/options.mk	2010/02/03 09:52:32	1.2
+++ pkgsrc/devel/cppcheck/options.mk	2011/05/29 11:52:12	1.3
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2010/02/03 09:52:32 wiz Exp $
+# $NetBSD: options.mk,v 1.3 2011/05/29 11:52:12 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cppcheck
 PKG_SUPPORTED_OPTIONS=	qt
@@ -6,43 +6,23 @@ PKG_SUPPORTED_OPTIONS=	qt
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mqt)
-SUBST_CLASSES+=		lrelease
-SUBST_FILES.lrelease=	gui/gui.pro
-SUBST_STAGE.lrelease=	post-extract
-SUBST_SED.lrelease=	-e "s,lrelease gui.pro,${PREFIX}/qt4/bin/lrelease gui.pro,g"
-SUBST_MESSAGE.lrelease=	Fixing path to lrelease.
-
 INSTALLATION_DIRS+=	lib share/cppcheck
 
 PLIST_SRC+=		PLIST PLIST.qt
 
-do-configure:
-	cd ${WRKSRC} && ${PREFIX}/qt4/bin/qmake
-
-.PHONY: link-build
-post-build: link-build
-link-build:
-	${ECHO} '#!/bin/sh' > ${WRKSRC}/cppcheck-gui
-	${ECHO} 'cd ${PREFIX}/share/cppcheck && ${PREFIX}/lib/cppcheck-gui "$$@"' >> ${WRKSRC}/cppcheck-gui
-
-.PHONY: qt-install
-post-install: qt-install
-qt-install:
+do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cli/cppcheck ${DESTDIR}${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/cppcheck-gui ${DESTDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/gui/gui \
-		${DESTDIR}${PREFIX}/lib/cppcheck-gui
+	${INSTALL_PROGRAM} ${WRKSRC}/gui/cppcheck-gui \
+		${DESTDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/man/cppcheck.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
-	${INSTALL_DATA} ${WRKSRC}/gui/*.qm ${DESTDIR}${PREFIX}/share/cppcheck
 
 .include "../../x11/qt4-libs/buildlink3.mk"
+BUILDLINK_DEPMETHOD.qt4-tools?= full
 .include "../../x11/qt4-tools/buildlink3.mk"
 .else
-.PHONY: main-install
-post-install: main-install
-main-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/cppcheck ${DESTDIR}${PREFIX}/bin/
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/cli/cppcheck ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_DATA} ${WRKSRC}/man/cppcheck.1 \
 		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
 .endif