Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 17 Oct 2013 23:51:12 +0000 (UTC)
From:      Dmitry Marakasov <amdmi3@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r330689 - head/devel/sdl_sge
Message-ID:  <201310172351.r9HNpCcH031822@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: amdmi3
Date: Thu Oct 17 23:51:12 2013
New Revision: 330689
URL: http://svnweb.freebsd.org/changeset/ports/330689

Log:
  - Support staging
  - Convert USE_GMAKE to USES
  - Use new LIB_DEPENDS syntax

Modified:
  head/devel/sdl_sge/Makefile
  head/devel/sdl_sge/pkg-plist

Modified: head/devel/sdl_sge/Makefile
==============================================================================
--- head/devel/sdl_sge/Makefile	Thu Oct 17 23:51:02 2013	(r330688)
+++ head/devel/sdl_sge/Makefile	Thu Oct 17 23:51:12 2013	(r330689)
@@ -15,19 +15,21 @@ COMMENT=	A graphic library for the Simpl
 LICENSE=	LGPL21 LGPL3
 LICENSE_COMB=	dual
 
-OPTIONS_DEFINE=	SDL FREETYPE DOCS EXAMPLES
-OPTIONS_DEFAULT=	SDL FREETYPE
-SDL_dESC=	Enable support for SDL_image
-
+USES=		gmake
 USE_SDL=	sdl
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
 
-NO_STAGE=	yes
+PORTDOCS=	*
+PORTEXAMPLES=	*
+
+OPTIONS_DEFINE=	SDL FREETYPE DOCS EXAMPLES
+OPTIONS_DEFAULT=SDL FREETYPE DOCS EXAMPLES
+SDL_DESC=	Enable support for SDL_image
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFREETYPE}
-LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+LIB_DEPENDS+=	libfreetype.so:${PORTSDIR}/print/freetype2
 MAKE_ARGS+=	USE_FT=y
 .else
 MAKE_ARGS+=	USE_FT=n
@@ -42,18 +44,14 @@ MAKE_ARGS+=	USE_IMG=n
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|PREFIX =PREFIX|PREFIX =${PREFIX}|g ; \
-		 s|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL|g ; \
+		's|PREFIX =PREFIX|PREFIX =${STAGEDIR}${PREFIX}|g ; \
+		 s|PREFIX_H =PREFIX_H|PREFIX_H =${STAGEDIR}${PREFIX}/include/SDL|g ; \
 		 s|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
-.endif
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${STAGEDIR}${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>

Modified: head/devel/sdl_sge/pkg-plist
==============================================================================
--- head/devel/sdl_sge/pkg-plist	Thu Oct 17 23:51:02 2013	(r330688)
+++ head/devel/sdl_sge/pkg-plist	Thu Oct 17 23:51:12 2013	(r330689)
@@ -15,50 +15,4 @@ lib/libSGE.a
 lib/libSGE.so
 lib/libSGE.so.0
 lib/libSGE.so.0.030809
-%%PORTDOCS%%%%DOCSDIR%%/blib.html
-%%PORTDOCS%%%%DOCSDIR%%/bmf.html
-%%PORTDOCS%%%%DOCSDIR%%/collision.html
-%%PORTDOCS%%%%DOCSDIR%%/color.html
-%%PORTDOCS%%%%DOCSDIR%%/figures.html
-%%PORTDOCS%%%%DOCSDIR%%/guide.html
-%%PORTDOCS%%%%DOCSDIR%%/index.html
-%%PORTDOCS%%%%DOCSDIR%%/intro.html
-%%PORTDOCS%%%%DOCSDIR%%/macros.html
-%%PORTDOCS%%%%DOCSDIR%%/misc.html
-%%PORTDOCS%%%%DOCSDIR%%/pixels.html
-%%PORTDOCS%%%%DOCSDIR%%/rotate.html
-%%PORTDOCS%%%%DOCSDIR%%/shape.html
-%%PORTDOCS%%%%DOCSDIR%%/surface.html
-%%PORTDOCS%%%%DOCSDIR%%/text_classes.html
-%%PORTDOCS%%%%DOCSDIR%%/thanks.html
-%%PORTDOCS%%%%DOCSDIR%%/toc.html
-%%PORTDOCS%%%%DOCSDIR%%/ttf-input.html
-%%PORTDOCS%%%%DOCSDIR%%/ttf-output.html
-%%PORTDOCS%%%%DOCSDIR%%/ttf.html
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/alpha.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/basics_c.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/bitmapfont.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blib.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/blitting.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/collision.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/fire.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/font.bmp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/font.ttf
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/input.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/inputdeluxe.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/poly.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/rotate.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sfont.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sfont.png
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/smiley.bmp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/speedtest.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sprite.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/sprite2.cpp
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ttf_readme
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/tux.bmp
-%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrmtry include/SDL



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310172351.r9HNpCcH031822>