Index: head/astro/celestia/Makefile
===================================================================
--- head/astro/celestia/Makefile	(revision 374702)
+++ head/astro/celestia/Makefile	(revision 374703)
@@ -1,104 +1,105 @@
 # Created by: trevor
 # $FreeBSD$
 
 PORTNAME=	celestia
 PORTVERSION=	1.6.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	astro
 MASTER_SITES=	SF/${PORTNAME}/Celestia-source/${PORTVERSION}
 PKGNAMESUFFIX=	-${CELESTIA_UI}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Scriptable space flight simulator for X11
 
 LICENSE=	GPLv2
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng15.so:${PORTSDIR}/graphics/png
 
 USES=		gettext gmake libtool lua pkgconfig
 USE_GL=		gl
 GNU_CONFIGURE=	yes
 EXTRA_PATCHES=	${FILESDIR}/celestia-1.6.1-lua-5.2.patch:-p1 \
+		${FILESDIR}/celestia-lua-52-fix.patch:-p1 \
 		${FILESDIR}/celestia-1.6.1-gcc47.patch:-p1 \
 		${FILESDIR}/celestia-1.6.1-gcc48.patch:-p1
 
 CXXFLAGS+=	-fsigned-char	# fix text rendering (see Gentoo bug 316573)
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -pthread
 
 UI_LIST=	glut gtk gnome
 CELESTIA_UI?=	glut
 CONFLICTS=	${UI_LIST:S|${CELESTIA_UI}||:S|^|celestia-|:S|$|-[0-9]*|}
 
 # Celestia provides different UI frontends; you should pick one that suits
 # you best by setting CELESTIA_UI variable.  Possible values are:
 #
 # glut	Bare-boned minimal GLUT-based core with no toolbar or menu (this is
 #	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
 #	preference saving in GConf (this looks and works very much like
 #	the Windows interface).
 #
 .if ${CELESTIA_UI} == "glut"
 CONFIGURE_ARGS+=	--with-glut
 USE_GL+=	glut
 LDFLAGS+=	-lGL
 .elif ${CELESTIA_UI} == "gtk"
 CONFIGURE_ARGS+=	--with-gtk
 USE_GNOME+=	gtk20
 PLIST_FILES=	share/applications/celestia.desktop
 .elif ${CELESTIA_UI} == "gnome"
 CATEGORIES+=	gnome
 CONFIGURE_ARGS+=	--with-gnome
 USE_GNOME+=	libgnomeui
 GCONF_SCHEMAS=	celestia.schemas
 PLIST_FILES=	share/applications/celestia.desktop
 .else
 IGNORE=		requires one of the <${UI_LIST}> values for CELESTIA_UI
 .endif
 
 .if ${CELESTIA_UI} == "gtk" || ${CELESTIA_UI} == "gnome"
 USES+=		pathfix
 LIB_DEPENDS+=	libgtkglext-x11-1.0.so:${PORTSDIR}/x11-toolkits/gtkglext \
 		libtheora.so:${PORTSDIR}/multimedia/libtheora
 STARTUP_NOTIFY=	true
 PLIST_FILES+=	share/celestia/celestia-logo.png share/celestia/celestiaui.xml
 .else
 STARTUP_NOTIFY=	false
 .endif
 
 PORTDOCS=	AUTHORS ChangeLog README
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 # Fix Lua discovery pkg-config(1) calls
 	@${REINPLACE_CMD} -E 's|lua5\.?|lua-5.|' ${WRKSRC}/configure
 # Remove controversial compiler options (respect our C[XX]FLAGS)
 .for o in O2 ffast-math fexpensive-optimizations fomit-frame-pointer
 	@${REINPLACE_CMD} -e 's|-${o}||g' ${WRKSRC}/configure
 .endfor
 # Allow add-ons to be placed inside user's home directory
 	@${REINPLACE_CMD} -e '/^#/!s|"extras"|& "~/.celestia"|' \
 		${WRKSRC}/celestia.cfg
 # Inhibit installation of copies of GPL (lots of them; use LICENSE framework
 # instead) and remove bogus argument from mv(1)
 	@${REINPLACE_CMD} -e 's|COPYING||g ; s| -b|| ' ${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|=.*COPYING_\*)|=| ; \
 		/KDE_DIST/s|COPYING_[^ ]* ||g' ${WRKSRC}/locale/Makefile.in
 	@${REINPLACE_CMD} -e 's|kde_libs_htmldir|kde_htmldir|' \
 		${WRKSRC}/src/celestia/kde/doc/celestia/Makefile.in
 
 post-install:
 # Technically, we should only install icon explicitly for GLUT UI, since
 # correct icons are properly installed for other cases, but doing it here
 # does not hurt and simplifies PLIST handling
 	${INSTALL_DATA} ${WRKSRC}/src/celestia/gtk/data/celestia.png \
 		${STAGEDIR}${PREFIX}/share/pixmaps
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/astro/celestia/files/celestia-lua-52-fix.patch
===================================================================
--- head/astro/celestia/files/celestia-lua-52-fix.patch	(nonexistent)
+++ head/astro/celestia/files/celestia-lua-52-fix.patch	(revision 374703)
@@ -0,0 +1,16 @@
+--- celestia-1.6.1.orig/src/celestia/celx.cpp	2014-02-09 23:23:10.308810741 +0000
++++ celestia-1.6.1/src/celestia/celx.cpp	2014-02-09 23:24:57.627017784 +0000
+@@ -272,9 +272,13 @@ 
+                            const char* name,
+                            lua_CFunction func)
+ {
++#if LUA_VER >= 0x050200
++    luaL_requiref(l, name, func, 1);
++#else
+     lua_pushcfunction(l, func);
+     lua_pushstring(l, name);
+     lua_call(l, 1, 0);
++#endif
+ }
+ #endif
+ 

Property changes on: head/astro/celestia/files/celestia-lua-52-fix.patch
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property