From ab6e7da0ad516166e39d8730c3b9cb76f4bfb35b Mon Sep 17 00:00:00 2001 From: "Tobias C. Berner" Date: Sun, 17 Mar 2019 00:01:52 +0000 Subject: [PATCH] games/allacrost: remove EDITOR option (Qt4 deprecation) --- games/allacrost/Makefile | 26 +++----------------------- games/allacrost/pkg-plist | 1 - 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/games/allacrost/Makefile b/games/allacrost/Makefile index 2c6e8d2c64fb..aaa9d66d5e74 100644 --- a/games/allacrost/Makefile +++ b/games/allacrost/Makefile @@ -3,7 +3,7 @@ PORTNAME= allacrost PORTVERSION= 1.0.2 -PORTREVISION= 25 +PORTREVISION= 26 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-demo/${PORTVERSION} DISTNAME= ${PORTNAME}_demo_source_${PORTVERSION} @@ -25,7 +25,7 @@ USE_SDL= sdl ttf net USE_GL= gl glu USE_XORG= x11 -CONFIGURE_ARGS= --datadir=${DATADIR} +CONFIGURE_ARGS= --datadir=${DATADIR} --enable-editor=no CPPFLAGS+= -I${LOCALBASE}/include -I${LUA_INCDIR} LDFLAGS+= -L${LOCALBASE}/lib -L${LUA_LIBDIR} CXXFLAGS+= -Wno-c++11-narrowing @@ -36,23 +36,9 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION} PORTDOCS= * PORTDATA= * -OPTIONS_DEFINE= EDITOR DOCS +OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes -EDITOR_DESC= Enable editor - -EDITOR_USES= qmake:no_env qt:4 -EDITOR_USE= QT=corelib,gui,moc_build,opengl,qt3support -EDITOR_CONFIGURE_ON= --enable-editor=yes -EDITOR_CONFIGURE_OFF= --enable-editor=no - -.include - -.if ${PORT_OPTIONS:MEDITOR} -DEPRECATED= Qt4 has been EOL since december 2015 -EXPIRATION_DATE= 2019-03-15 -.endif - post-patch: @${REINPLACE_CMD} -e 's|-I/usr/include/|-I${LOCALBASE}/include/|g' \ ${WRKSRC}/Makefile.in @@ -65,12 +51,6 @@ post-patch: s/-llua /-llua-${LUA_VER} /g;' \ ${WRKSRC}/configure -post-patch-EDITOR-on: - @${REINPLACE_CMD} -e '/^INCLUDES = / s|=|= -I${QT_INCDIR}/QtGui \ - -I${QT_INCDIR}/QtOpenGL -I${QT_INCDIR}/Qt3Support \ - -I${QT_INCDIR}/QtCore -I${QT_INCDIR}|' \ - ${WRKSRC}/Makefile.in - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/MANUAL ${STAGEDIR}${DOCSDIR}/ diff --git a/games/allacrost/pkg-plist b/games/allacrost/pkg-plist index 0254ee8aee63..5699cc281e2e 100644 --- a/games/allacrost/pkg-plist +++ b/games/allacrost/pkg-plist @@ -1,5 +1,4 @@ bin/allacrost -%%EDITOR%%bin/allacrost-editor share/locale/de/LC_MESSAGES/allacrost.mo share/locale/en@quot/LC_MESSAGES/allacrost.mo share/locale/es/LC_MESSAGES/allacrost.mo