From owner-svn-ports-head@FreeBSD.ORG Tue Mar 19 14:23:15 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B445594C; Tue, 19 Mar 2013 14:23:15 +0000 (UTC) (envelope-from makc@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) by mx1.freebsd.org (Postfix) with ESMTP id 97EAAA28; Tue, 19 Mar 2013 14:23:15 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.6/8.14.6) with ESMTP id r2JENFRY016366; Tue, 19 Mar 2013 14:23:15 GMT (envelope-from makc@svn.freebsd.org) Received: (from makc@localhost) by svn.freebsd.org (8.14.6/8.14.5/Submit) id r2JENFeY016364; Tue, 19 Mar 2013 14:23:15 GMT (envelope-from makc@svn.freebsd.org) Message-Id: <201303191423.r2JENFeY016364@svn.freebsd.org> From: Max Brazhnikov Date: Tue, 19 Mar 2013 14:23:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r314651 - in head/chinese/fqterm: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 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: Tue, 19 Mar 2013 14:23:15 -0000 Author: makc Date: Tue Mar 19 14:23:14 2013 New Revision: 314651 URL: http://svnweb.freebsd.org/changeset/ports/314651 Log: Convert to USE_CMAKE and while I'm here: - drop depedence on gmake - remove hand crafted install target and scripts - use DESKTOP_ENTRIES - adjust plist according to the changes Approved by: portmgr (bapt) Deleted: head/chinese/fqterm/files/fqterm.desktop.in head/chinese/fqterm/files/pkg-deinstall.in head/chinese/fqterm/files/pkg-install.in Modified: head/chinese/fqterm/Makefile (contents, props changed) head/chinese/fqterm/pkg-plist (contents, props changed) Modified: head/chinese/fqterm/Makefile ============================================================================== --- head/chinese/fqterm/Makefile Tue Mar 19 14:22:04 2013 (r314650) +++ head/chinese/fqterm/Makefile Tue Mar 19 14:23:14 2013 (r314651) @@ -1,24 +1,17 @@ -# New ports collection makefile for: fqterm -# Date created: 1 Jun 2008 -# Whom: Denise H. G. -# +# Created by: Denise H. G. # $FreeBSD$ -# PORTNAME= fqterm PORTVERSION= 0.9.3 -PORTREVISION= 7 +PORTREVISION= 8 CATEGORIES= chinese MASTER_SITES= ${MASTER_SITE_GOOGLE_CODE} MASTER_SITE_SUBDIR= ${PORTNAME} DISTNAME= ${PORTNAME}-${PORTVERSION}-src-r569${SUTRACT_SUFFIX} MAINTAINER= darcsis@gmail.com -COMMENT= FQTerm is a BBS client for BSD/Linux +COMMENT= BBS client for BSD/Linux -PKGINSTALL= ${WRKDIR}/pkg-install -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -SUB_FILES= pkg-install pkg-deinstall ${PORTNAME}.desktop USE_XORG= x11 ice xext xt xaw xpm xi xproto xextproto USE_ZIP= yes USE_QT4= gui network script qt3support imageformats \ @@ -27,35 +20,14 @@ USE_QT4= gui network script qt3support i HAS_CONFIGURE= yes USE_DOS2UNIX= src/ui/popwidget.cpp -USE_GMAKE= yes USE_CMAKE= yes -CMAKE_INSTALL_PREFIX= ${PREFIX} +CMAKE_OUTSOURCE= yes CMAKE_ARGS= -Wno-dev +WRKSRC= ${WRKDIR}/${PORTNAME} -DATADIR= ${PREFIX}/share/FQTerm - -WRKSRC= ${WRKDIR}/${PORTNAME} - -.include - -do-configure: - @cd ${WRKSRC} && ${MKDIR} build - @cd ${WRKSRC}/build && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${WRKSRC} - -do-build: - @cd ${WRKSRC}/build && ${GMAKE} - -do-install: - @cd ${WRKSRC}/build && ${GMAKE} install/strip - @${MKDIR} ${PREFIX}/share/applications - @${INSTALL_DATA} ${WRKDIR}/${PORTNAME}.desktop \ - ${PREFIX}/share/applications - +DESKTOP_ENTRIES= "FQTerm" "BBS client" "${PREFIX}/share/FQTerm/pic/fqterm.png" \ + "fqterm -caption \"%c\" %i %m %u" "Network;Qt;" "" post-install: -.if !defined(PACKAGE_BUILDING) - @${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL -.endif @${CAT} ${PKGMESSAGE} -.include +.include Modified: head/chinese/fqterm/pkg-plist ============================================================================== --- head/chinese/fqterm/pkg-plist Tue Mar 19 14:22:04 2013 (r314650) +++ head/chinese/fqterm/pkg-plist Tue Mar 19 14:23:14 2013 (r314651) @@ -1,130 +1,128 @@ bin/fqterm bin/fqterm.bin -%%DATADIR%%/credits -%%DATADIR%%/cursor/end.xpm -%%DATADIR%%/cursor/enter.xpm -%%DATADIR%%/cursor/exit.xpm -%%DATADIR%%/cursor/hand.xpm -%%DATADIR%%/cursor/home.xpm -%%DATADIR%%/cursor/mac_16x16/end.xpm -%%DATADIR%%/cursor/mac_16x16/enter.xpm -%%DATADIR%%/cursor/mac_16x16/exit.xpm -%%DATADIR%%/cursor/mac_16x16/hand.xpm -%%DATADIR%%/cursor/mac_16x16/home.xpm -%%DATADIR%%/cursor/mac_16x16/next.xpm -%%DATADIR%%/cursor/mac_16x16/pagedown.xpm -%%DATADIR%%/cursor/mac_16x16/pageup.xpm -%%DATADIR%%/cursor/mac_16x16/prev.xpm -%%DATADIR%%/cursor/next.xpm -%%DATADIR%%/cursor/pagedown.xpm -%%DATADIR%%/cursor/pageup.xpm -%%DATADIR%%/cursor/prev.xpm -%%DATADIR%%/default_font.conf -%%DATADIR%%/dict/fqterm_zh_CN.ts -%%DATADIR%%/dict/ui_zh_CN.ts -%%DATADIR%%/fqterm.desktop.in -%%DATADIR%%/fqterm.icns -%%DATADIR%%/fqterm.sh -%%DATADIR%%/pic/address_book.png -%%DATADIR%%/pic/ansi_color.png -%%DATADIR%%/pic/anti_idle.png -%%DATADIR%%/pic/auto_reconnect.png -%%DATADIR%%/pic/auto_reply.png -%%DATADIR%%/pic/beep.png -%%DATADIR%%/pic/change_fonts.png -%%DATADIR%%/pic/connect.png -%%DATADIR%%/pic/copy.png -%%DATADIR%%/pic/copy_with_color.png -%%DATADIR%%/pic/disconnect.png -%%DATADIR%%/pic/fqterm.png -%%DATADIR%%/pic/fqterm_128x128.ico -%%DATADIR%%/pic/fqterm_128x128.png -%%DATADIR%%/pic/fqterm_16x16.ico -%%DATADIR%%/pic/fqterm_16x16.png -%%DATADIR%%/pic/fqterm_256x256.ico -%%DATADIR%%/pic/fqterm_256x256.png -%%DATADIR%%/pic/fqterm_32x32.ico -%%DATADIR%%/pic/fqterm_32x32.png -%%DATADIR%%/pic/fqterm_48x48.ico -%%DATADIR%%/pic/fqterm_48x48.png -%%DATADIR%%/pic/fqterm_64x64.ico -%%DATADIR%%/pic/fqterm_64x64.png -%%DATADIR%%/pic/fqterm_tray.png -%%DATADIR%%/pic/get_article_fulltext.png -%%DATADIR%%/pic/image_viewer.png -%%DATADIR%%/pic/messagebox_critical.png -%%DATADIR%%/pic/messagebox_info.png -%%DATADIR%%/pic/messagebox_warning.png -%%DATADIR%%/pic/mouse.png -%%DATADIR%%/pic/paste.png -%%DATADIR%%/pic/popwidget.png -%%DATADIR%%/pic/preferences.png -%%DATADIR%%/pic/quick_login.png -%%DATADIR%%/pic/rectangle_selection.png -%%DATADIR%%/pic/refresh.png -%%DATADIR%%/pic/setup_shortcuts.png -%%DATADIR%%/pic/shadow.png -%%DATADIR%%/pic/tabpad.png -%%DATADIR%%/pic/view_messages.png -%%DATADIR%%/pic/ViewerButtons/adjustsize.png -%%DATADIR%%/pic/ViewerButtons/next.png -%%DATADIR%%/pic/ViewerButtons/open.png -%%DATADIR%%/pic/ViewerButtons/prev.png -%%DATADIR%%/pic/ViewerButtons/zoomin.png -%%DATADIR%%/pic/ViewerButtons/zoomout.png -%%DATADIR%%/schema/default.schema -%%DATADIR%%/schema/Linux.schema -%%DATADIR%%/schema/Softness.schema -%%DATADIR%%/schema/VIM.schema -%%DATADIR%%/schema/XTerm.schema -%%DATADIR%%/skin/dpstyle/dpstyle.qss -%%DATADIR%%/skin/dpstyle/image/checkbox_checked.png -%%DATADIR%%/skin/dpstyle/image/checkbox_checked_hover.png -%%DATADIR%%/skin/dpstyle/image/checkbox_checked_pressed.png -%%DATADIR%%/skin/dpstyle/image/checkbox_unchecked.png -%%DATADIR%%/skin/dpstyle/image/checkbox_unchecked_hover.png -%%DATADIR%%/skin/dpstyle/image/checkbox_unchecked_pressed.png -%%DATADIR%%/skin/dpstyle/image/down_arrow.png -%%DATADIR%%/skin/dpstyle/image/down_arrow_disabled.png -%%DATADIR%%/skin/dpstyle/image/frame.png -%%DATADIR%%/skin/dpstyle/image/pagefold.png -%%DATADIR%%/skin/dpstyle/image/pushbutton.png -%%DATADIR%%/skin/dpstyle/image/pushbutton_hover.png -%%DATADIR%%/skin/dpstyle/image/pushbutton_pressed.png -%%DATADIR%%/skin/dpstyle/image/radiobutton_checked.png -%%DATADIR%%/skin/dpstyle/image/radiobutton_checked_hover.png -%%DATADIR%%/skin/dpstyle/image/radiobutton_checked_pressed.png -%%DATADIR%%/skin/dpstyle/image/radiobutton_unchecked.png -%%DATADIR%%/skin/dpstyle/image/radiobutton_unchecked_hover.png -%%DATADIR%%/skin/dpstyle/image/radiobutton_unchecked_pressed.png -%%DATADIR%%/skin/dpstyle/image/sizegrip.png -%%DATADIR%%/skin/dpstyle/image/spindown.png -%%DATADIR%%/skin/dpstyle/image/spindown_hover.png -%%DATADIR%%/skin/dpstyle/image/spindown_off.png -%%DATADIR%%/skin/dpstyle/image/spindown_pressed.png -%%DATADIR%%/skin/dpstyle/image/spinup.png -%%DATADIR%%/skin/dpstyle/image/spinup_hover.png -%%DATADIR%%/skin/dpstyle/image/spinup_off.png -%%DATADIR%%/skin/dpstyle/image/spinup_pressed.png -%%DATADIR%%/skin/dpstyle/image/up_arrow.png -%%DATADIR%%/skin/dpstyle/image/up_arrow_disabled.png -%%DATADIR%%/skin/dpstyle/ReadMe.txt -%%DATADIR%%/userconf/address.cfg.orig -%%DATADIR%%/userconf/fqterm.cfg.orig -%%DATADIR%%/userconf/language.cfg.orig -%%DATADIR%%/userconf/README.txt -%%DATADIR%%/dict/fqterm_zh_CN.qm -%%DATADIR%%/dict/ui_zh_CN.qm -share/applications/fqterm.desktop -@dirrm share/applications -@dirrm %%DATADIR%%/cursor/mac_16x16 -@dirrm %%DATADIR%%/cursor -@dirrm %%DATADIR%%/dict -@dirrm %%DATADIR%%/pic/ViewerButtons -@dirrm %%DATADIR%%/pic -@dirrm %%DATADIR%%/schema -@dirrm %%DATADIR%%/skin/dpstyle/image -@dirrm %%DATADIR%%/skin/dpstyle -@dirrm %%DATADIR%%/skin -@dirrm %%DATADIR%%/userconf -@dirrm %%DATADIR%%/ +share/FQTerm/credits +share/FQTerm/cursor/end.xpm +share/FQTerm/cursor/enter.xpm +share/FQTerm/cursor/exit.xpm +share/FQTerm/cursor/hand.xpm +share/FQTerm/cursor/home.xpm +share/FQTerm/cursor/mac_16x16/end.xpm +share/FQTerm/cursor/mac_16x16/enter.xpm +share/FQTerm/cursor/mac_16x16/exit.xpm +share/FQTerm/cursor/mac_16x16/hand.xpm +share/FQTerm/cursor/mac_16x16/home.xpm +share/FQTerm/cursor/mac_16x16/next.xpm +share/FQTerm/cursor/mac_16x16/pagedown.xpm +share/FQTerm/cursor/mac_16x16/pageup.xpm +share/FQTerm/cursor/mac_16x16/prev.xpm +share/FQTerm/cursor/next.xpm +share/FQTerm/cursor/pagedown.xpm +share/FQTerm/cursor/pageup.xpm +share/FQTerm/cursor/prev.xpm +share/FQTerm/default_font.conf +share/FQTerm/dict/fqterm_zh_CN.qm +share/FQTerm/dict/fqterm_zh_CN.ts +share/FQTerm/dict/ui_zh_CN.qm +share/FQTerm/dict/ui_zh_CN.ts +share/FQTerm/fqterm.desktop.in +share/FQTerm/fqterm.icns +share/FQTerm/fqterm.sh +share/FQTerm/pic/ViewerButtons/adjustsize.png +share/FQTerm/pic/ViewerButtons/next.png +share/FQTerm/pic/ViewerButtons/open.png +share/FQTerm/pic/ViewerButtons/prev.png +share/FQTerm/pic/ViewerButtons/zoomin.png +share/FQTerm/pic/ViewerButtons/zoomout.png +share/FQTerm/pic/address_book.png +share/FQTerm/pic/ansi_color.png +share/FQTerm/pic/anti_idle.png +share/FQTerm/pic/auto_reconnect.png +share/FQTerm/pic/auto_reply.png +share/FQTerm/pic/beep.png +share/FQTerm/pic/change_fonts.png +share/FQTerm/pic/connect.png +share/FQTerm/pic/copy.png +share/FQTerm/pic/copy_with_color.png +share/FQTerm/pic/disconnect.png +share/FQTerm/pic/fqterm.png +share/FQTerm/pic/fqterm_128x128.ico +share/FQTerm/pic/fqterm_128x128.png +share/FQTerm/pic/fqterm_16x16.ico +share/FQTerm/pic/fqterm_16x16.png +share/FQTerm/pic/fqterm_256x256.ico +share/FQTerm/pic/fqterm_256x256.png +share/FQTerm/pic/fqterm_32x32.ico +share/FQTerm/pic/fqterm_32x32.png +share/FQTerm/pic/fqterm_48x48.ico +share/FQTerm/pic/fqterm_48x48.png +share/FQTerm/pic/fqterm_64x64.ico +share/FQTerm/pic/fqterm_64x64.png +share/FQTerm/pic/fqterm_tray.png +share/FQTerm/pic/get_article_fulltext.png +share/FQTerm/pic/image_viewer.png +share/FQTerm/pic/messagebox_critical.png +share/FQTerm/pic/messagebox_info.png +share/FQTerm/pic/messagebox_warning.png +share/FQTerm/pic/mouse.png +share/FQTerm/pic/paste.png +share/FQTerm/pic/popwidget.png +share/FQTerm/pic/preferences.png +share/FQTerm/pic/quick_login.png +share/FQTerm/pic/rectangle_selection.png +share/FQTerm/pic/refresh.png +share/FQTerm/pic/setup_shortcuts.png +share/FQTerm/pic/shadow.png +share/FQTerm/pic/tabpad.png +share/FQTerm/pic/view_messages.png +share/FQTerm/schema/Linux.schema +share/FQTerm/schema/Softness.schema +share/FQTerm/schema/VIM.schema +share/FQTerm/schema/XTerm.schema +share/FQTerm/schema/default.schema +share/FQTerm/skin/dpstyle/ReadMe.txt +share/FQTerm/skin/dpstyle/dpstyle.qss +share/FQTerm/skin/dpstyle/image/checkbox_checked.png +share/FQTerm/skin/dpstyle/image/checkbox_checked_hover.png +share/FQTerm/skin/dpstyle/image/checkbox_checked_pressed.png +share/FQTerm/skin/dpstyle/image/checkbox_unchecked.png +share/FQTerm/skin/dpstyle/image/checkbox_unchecked_hover.png +share/FQTerm/skin/dpstyle/image/checkbox_unchecked_pressed.png +share/FQTerm/skin/dpstyle/image/down_arrow.png +share/FQTerm/skin/dpstyle/image/down_arrow_disabled.png +share/FQTerm/skin/dpstyle/image/frame.png +share/FQTerm/skin/dpstyle/image/pagefold.png +share/FQTerm/skin/dpstyle/image/pushbutton.png +share/FQTerm/skin/dpstyle/image/pushbutton_hover.png +share/FQTerm/skin/dpstyle/image/pushbutton_pressed.png +share/FQTerm/skin/dpstyle/image/radiobutton_checked.png +share/FQTerm/skin/dpstyle/image/radiobutton_checked_hover.png +share/FQTerm/skin/dpstyle/image/radiobutton_checked_pressed.png +share/FQTerm/skin/dpstyle/image/radiobutton_unchecked.png +share/FQTerm/skin/dpstyle/image/radiobutton_unchecked_hover.png +share/FQTerm/skin/dpstyle/image/radiobutton_unchecked_pressed.png +share/FQTerm/skin/dpstyle/image/sizegrip.png +share/FQTerm/skin/dpstyle/image/spindown.png +share/FQTerm/skin/dpstyle/image/spindown_hover.png +share/FQTerm/skin/dpstyle/image/spindown_off.png +share/FQTerm/skin/dpstyle/image/spindown_pressed.png +share/FQTerm/skin/dpstyle/image/spinup.png +share/FQTerm/skin/dpstyle/image/spinup_hover.png +share/FQTerm/skin/dpstyle/image/spinup_off.png +share/FQTerm/skin/dpstyle/image/spinup_pressed.png +share/FQTerm/skin/dpstyle/image/up_arrow.png +share/FQTerm/skin/dpstyle/image/up_arrow_disabled.png +share/FQTerm/userconf/README.txt +share/FQTerm/userconf/address.cfg.orig +share/FQTerm/userconf/fqterm.cfg.orig +share/FQTerm/userconf/language.cfg.orig +@dirrm share/FQTerm/userconf +@dirrm share/FQTerm/skin/dpstyle/image +@dirrm share/FQTerm/skin/dpstyle +@dirrm share/FQTerm/skin +@dirrm share/FQTerm/schema +@dirrm share/FQTerm/pic/ViewerButtons +@dirrm share/FQTerm/pic +@dirrm share/FQTerm/dict +@dirrm share/FQTerm/cursor/mac_16x16 +@dirrm share/FQTerm/cursor +@dirrm share/FQTerm