From owner-svn-ports-head@FreeBSD.ORG Fri Jul 5 14:30:00 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) by hub.freebsd.org (Postfix) with ESMTP id EE0AD290; Fri, 5 Jul 2013 14:30:00 +0000 (UTC) (envelope-from danfe@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 E060A1FDC; Fri, 5 Jul 2013 14:30:00 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r65EU0fO057416; Fri, 5 Jul 2013 14:30:00 GMT (envelope-from danfe@svn.freebsd.org) Received: (from danfe@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r65EU0Sm057398; Fri, 5 Jul 2013 14:30:00 GMT (envelope-from danfe@svn.freebsd.org) Message-Id: <201307051430.r65EU0Sm057398@svn.freebsd.org> From: Alexey Dokuchaev Date: Fri, 5 Jul 2013 14:30:00 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r322329 - in head/astro: . celestia celestia-kde 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: Fri, 05 Jul 2013 14:30:01 -0000 Author: danfe Date: Fri Jul 5 14:30:00 2013 New Revision: 322329 URL: http://svnweb.freebsd.org/changeset/ports/322329 Log: - Remove support for the expired KDE3 port - While here convert NOPORTDOCS and USE_GMAKE PR: ports/180265 Submitted by: rene Deleted: head/astro/celestia-kde/ Modified: head/astro/Makefile head/astro/celestia/Makefile head/astro/celestia/pkg-plist Modified: head/astro/Makefile ============================================================================== --- head/astro/Makefile Fri Jul 5 14:10:55 2013 (r322328) +++ head/astro/Makefile Fri Jul 5 14:30:00 2013 (r322329) @@ -12,7 +12,6 @@ SUBDIR += celestia SUBDIR += celestia-gnome SUBDIR += celestia-gtk - SUBDIR += celestia-kde SUBDIR += cfitsio SUBDIR += dgpsip SUBDIR += ephem Modified: head/astro/celestia/Makefile ============================================================================== --- head/astro/celestia/Makefile Fri Jul 5 14:10:55 2013 (r322328) +++ head/astro/celestia/Makefile Fri Jul 5 14:30:00 2013 (r322329) @@ -9,16 +9,15 @@ MASTER_SITES= SF/${PORTNAME}/Celestia-so PKGNAMESUFFIX= -${CELESTIA_UI} MAINTAINER= danfe@FreeBSD.org -COMMENT= Scriptable space flight simulator for X +COMMENT= Scriptable space flight simulator for X11 LICENSE= GPLv2 LIB_DEPENDS= jpeg:${PORTSDIR}/graphics/jpeg \ png15:${PORTSDIR}/graphics/png +USES= gettext gmake USE_AUTOTOOLS= libtool -USE_GMAKE= yes -USES= gettext USE_GL= gl USE_LUA= 5.0+ # should be optional, but the build fails without it WANT_GNOME= yes @@ -27,7 +26,7 @@ CXXFLAGS+= -fsigned-char # fix text rend CPPFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${LOCALBASE}/lib -pthread -UI_LIST= glut gtk gnome kde +UI_LIST= glut gtk gnome CELESTIA_UI?= glut CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|:S|$|-[0-9]*|} @@ -38,11 +37,9 @@ CONFLICTS= ${UI_LIST:S|${CELESTIA_UI}||: # the default one); # gtk Full interface with minimal dependencies: adds menu, configuration # dialog, some other utilities; -# gnome Full GTK interface plus a few Gnome integration goodies, such as +# gnome Full GTK interface plus a few GNOME integration goodies, such as # preference saving in GConf (this looks and works very much like -# the Windows interface); -# kde Probably the richest of all: brings contextual menus, toolbars, -# KDE integration, internationalization, bookmarks, etc. +# the Windows interface). # .if ${CELESTIA_UI} == "glut" CONFIGURE_ARGS+= --with-glut @@ -55,11 +52,6 @@ CATEGORIES+= gnome CONFIGURE_ARGS+= --with-gnome USE_GNOME+= libgnomeui GCONF_SCHEMAS= celestia.schemas -.elif ${CELESTIA_UI} == "kde" -CATEGORIES+= kde -CONFIGURE_ARGS+= --with-kde -USE_KDELIBS_VER= 3 -INSTALLS_ICONS= yes .else IGNORE= requires one of the <${UI_LIST}> values for CELESTIA_UI .endif @@ -73,19 +65,17 @@ PLIST_FILES+= share/celestia/celestia-lo .else STARTUP_NOTIFY= false .endif -.if ${CELESTIA_UI} == "kde" -LIB_DEPENDS+= theora:${PORTSDIR}/multimedia/libtheora -PLIST_SUB+= KDE="" -.else -PLIST_SUB+= KDE="@comment " -.endif PORTDOCS= AUTHORS ChangeLog README -DESKTOP_ENTRIES="Celestia" "Explore space" \ +DESKTOP_ENTRIES="Celestia" "Explore the space" \ "${PREFIX}/share/pixmaps/celestia.png" "celestia" \ "Astronomy;Education;Science;" ${STARTUP_NOTIFY} +OPTIONS_DEFINE= DOCS + +.include + post-patch: # Fix Lua discovery pkg-config(1) calls @${REINPLACE_CMD} -E 's|lua5\.?|lua-5.|' ${WRKSRC}/configure @@ -110,7 +100,7 @@ post-install: # does not hurt and simplifies PLIST handling ${INSTALL_DATA} ${WRKSRC}/src/celestia/gtk/data/celestia.png \ ${PREFIX}/share/pixmaps -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR} .endif Modified: head/astro/celestia/pkg-plist ============================================================================== --- head/astro/celestia/pkg-plist Fri Jul 5 14:10:55 2013 (r322328) +++ head/astro/celestia/pkg-plist Fri Jul 5 14:30:00 2013 (r322329) @@ -555,62 +555,6 @@ share/locale/zh_CN/LC_MESSAGES/celestia_ share/locale/zh_TW/LC_MESSAGES/celestia.mo share/locale/zh_TW/LC_MESSAGES/celestia_constellations.mo share/pixmaps/celestia.png -%%KDE%%share/applnk/Edutainment/Science/celestia.desktop -%%KDE%%share/apps/celestia -%%KDE%%share/celestia/bookmarks.xml -%%KDE%%share/celestia/celestiaui.rc -%%KDE%%share/celestia/favicons/celestia_20020830192652097.png -%%KDE%%share/celestia/favicons/celestia_20020830192655186.png -%%KDE%%share/celestia/favicons/celestia_20021210223316001.png -%%KDE%%share/celestia/favicons/celestia_20021212191412299.png -%%KDE%%share/celestia/favicons/celestia_20021215164511359.png -%%KDE%%share/celestia/favicons/celestia_20021215164726547.png -%%KDE%%share/celestia/favicons/celestia_20021215170159036.png -%%KDE%%share/celestia/favicons/celestia_20030106235954721.png -%%KDE%%share/config/celestiarc -%%KDE%%share/doc/HTML/en/celestia/fig1.jpg -%%KDE%%share/doc/HTML/en/celestia/fig10.jpg -%%KDE%%share/doc/HTML/en/celestia/fig11.jpg -%%KDE%%share/doc/HTML/en/celestia/fig12.jpg -%%KDE%%share/doc/HTML/en/celestia/fig13.jpg -%%KDE%%share/doc/HTML/en/celestia/fig14.jpg -%%KDE%%share/doc/HTML/en/celestia/fig15.jpg -%%KDE%%share/doc/HTML/en/celestia/fig16.jpg -%%KDE%%share/doc/HTML/en/celestia/fig17.jpg -%%KDE%%share/doc/HTML/en/celestia/fig18.jpg -%%KDE%%share/doc/HTML/en/celestia/fig19.jpg -%%KDE%%share/doc/HTML/en/celestia/fig2.jpg -%%KDE%%share/doc/HTML/en/celestia/fig20.jpg -%%KDE%%share/doc/HTML/en/celestia/fig21.jpg -%%KDE%%share/doc/HTML/en/celestia/fig22.jpg -%%KDE%%share/doc/HTML/en/celestia/fig221.jpg -%%KDE%%share/doc/HTML/en/celestia/fig23.jpg -%%KDE%%share/doc/HTML/en/celestia/fig24.jpg -%%KDE%%share/doc/HTML/en/celestia/fig25.jpg -%%KDE%%share/doc/HTML/en/celestia/fig26.jpg -%%KDE%%share/doc/HTML/en/celestia/fig27.jpg -%%KDE%%share/doc/HTML/en/celestia/fig28.jpg -%%KDE%%share/doc/HTML/en/celestia/fig29.jpg -%%KDE%%share/doc/HTML/en/celestia/fig3.jpg -%%KDE%%share/doc/HTML/en/celestia/fig30.jpg -%%KDE%%share/doc/HTML/en/celestia/fig4.jpg -%%KDE%%share/doc/HTML/en/celestia/fig5.jpg -%%KDE%%share/doc/HTML/en/celestia/fig6.jpg -%%KDE%%share/doc/HTML/en/celestia/fig7.jpg -%%KDE%%share/doc/HTML/en/celestia/fig8.jpg -%%KDE%%share/doc/HTML/en/celestia/fig9.jpg -%%KDE%%share/doc/HTML/en/celestia/index.cache.bz2 -%%KDE%%share/doc/HTML/en/celestia/index.docbook -%%KDE%%share/doc/HTML/en/celestia/common -%%KDE%%share/icons/hicolor/16x16/apps/celestia.png -%%KDE%%share/icons/hicolor/22x22/apps/celestia.png -%%KDE%%share/icons/hicolor/32x32/apps/celestia.png -%%KDE%%share/icons/hicolor/48x48/apps/celestia.png -%%KDE%%share/mimelnk/application/x-celestia-script.desktop -%%KDE%%share/services/celestia.protocol -%%KDE%%@dirrm share/doc/HTML/en/celestia -%%KDE%%@dirrm share/celestia/favicons -%%KDE%%@dirrm share/applnk/Edutainment/Science @dirrm share/celestia/textures/medres @dirrm share/celestia/textures/lores @dirrm share/celestia/textures/hires