4 files changed, 68 insertions, 63 deletions

diff --git a/devel/sdl_sge/Makefile b/devel/sdl_sge/Makefile
index c609cc6c76fd..385e5ef9d56d 100644
--- a/devel/sdl_sge/Makefile
+++ b/devel/sdl_sge/Makefile
@@ -7,62 +7,66 @@
 
 PORTNAME=	sdl_sge
 PORTVERSION=	0.030809
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	devel graphics
-MASTER_SITES=	http://www.etek.chalmers.se/~e8cal1/sge/files/ \
-		http://www.digitalfanatics.org/cal/sge/files/
+MASTER_SITES=	http://www.digitalfanatics.org/cal/sge/files/ \
+		http://www.sourcefiles.org/Programming/Libraries/Graphics/
 DISTNAME=	sge030809
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A graphic library for the Simple DirectMedia Layer (SDL)
 
-DEPRECATED=     Upstream disapear and distfile is no more available
-EXPIRATION_DATE=        2011-05-01
+LICENSE=	LGPL21 LGPL3
+LICENSE_COMB=	dual
 
+OPTIONS=	SDL_IMAGE "Enable support for SDL_image" On \
+		FREETYPE "Enable FreeType support" On \
+		DOCS "Install documentation" On \
+		EXAMPLES "Install examples" On
+
+USE_SDL=	sdl
 USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-
-OPTIONS=	SDL_IMAGE "Enable support for SDL_IMAGE" On \
-		FREETYPE "Enable FreeType support" On \
-		DOCS "Install documentation" Off
+MAKE_JOBS_SAFE=	yes
 
 .include <bsd.port.pre.mk>
 
-.if !defined(WITHOUT_FREETYPE)
-LIB_DEPENDS=	freetype.9:${PORTSDIR}/print/freetype2
+.if defined(WITHOUT_FREETYPE)
+MAKE_ARGS+=	USE_FT=n
+.else
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+MAKE_ARGS+=	USE_FT=y
 .endif
 
 .if defined(WITHOUT_SDL_IMAGE)
-USE_SDL=	sdl
+MAKE_ARGS+=	USE_IMG=n
 .else
-USE_SDL=	image
+USE_SDL+=	image
+MAKE_ARGS+=	USE_IMG=y
 .endif
 
 .if !defined(WITH_DOCS)
 NOPORTDOCS=	yes
 .endif
 
-post-patch:
-.if defined(WITHOUT_SDL_IMAGE)
-	@${REINPLACE_CMD} -e 's|#USE_IMG = n|USE_IMG = n|g' ${WRKSRC}/Makefile.conf
-.else
-	@${REINPLACE_CMD} -e 's|#USE_IMG = n|USE_IMG = y|g' ${WRKSRC}/Makefile.conf
-.endif
-.if defined(WITHOUT_FREETYPE)
-	@${REINPLACE_CMD} -e 's|#USE_FT = n|USE_FT = n|g' ${WRKSRC}/Makefile.conf
-.else
-	@${REINPLACE_CMD} -e 's|#USE_FT = n|USE_FT = y|g' ${WRKSRC}/Makefile.conf
+.if !defined(WITH_EXAMPLES)
+NOPORTEXAMPLES=	yes
 .endif
-	@${REINPLACE_CMD} -e 's|PREFIX =PREFIX|PREFIX =${PREFIX}|g' ${WRKSRC}/Makefile.conf
-	@${REINPLACE_CMD} -e 's|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL|g' ${WRKSRC}/Makefile.conf
-	@${REINPLACE_CMD} -e 's|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|PREFIX =PREFIX|PREFIX =${PREFIX}|g ; \
+		 s|PREFIX_H =PREFIX_H|PREFIX_H =${PREFIX}/include/SDL|g ; \
+		 s|sdl-config|${SDL_CONFIG}|g' ${WRKSRC}/Makefile.conf
 
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	@${INSTALL_MAN} ${WRKSRC}/docs/* ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docs/* ${DOCSDIR}
+.endif
+.if !defined(NOPORTEXAMPLES)
 	@${MKDIR} ${EXAMPLESDIR}
-	@${INSTALL_MAN} ${WRKSRC}/examples/* ${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/devel/sdl_sge/files/patch-Makefile.conf b/devel/sdl_sge/files/patch-Makefile.conf
index cbe111883a44..eae89fe5544e 100644
--- a/devel/sdl_sge/files/patch-Makefile.conf
+++ b/devel/sdl_sge/files/patch-Makefile.conf
@@ -1,5 +1,5 @@
---- work/sge030809/Makefile.conf	Tue Aug 12 00:43:35 2003
-+++ Makefile.conf	Fri Aug  4 15:20:41 2006
+--- Makefile.conf.orig	2003-08-12 07:43:35.000000000 +0900
++++ Makefile.conf	2011-08-23 21:00:48.000000000 +0900
 @@ -7,11 +7,6 @@
  #USE_IMG = n
  #QUIET = y
@@ -12,7 +12,7 @@
  # Make sure sdl-config is available
  HAVE_SDL =$(shell if (sdl-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
  ifeq ($(HAVE_SDL),n)
-@@ -19,45 +14,24 @@
+@@ -19,27 +14,17 @@
  endif
  
  # Where should SGE be installed?
@@ -25,25 +25,26 @@
  
  # Flags passed to the compiler
 -CFLAGS =-Wall -O3 -ffast-math
-+CFLAGS +=-Wall -O3 -ffast-math
++#CFLAGS =-Wall -O3 -ffast-math
  SGE_CFLAGS =$(shell sdl-config --cflags)
 -# Uncomment to make some more optimizations
 -#CFLAGS =-Wall -O9 -ffast-math -march=i686
 -
  
  # Libs config
- SGE_LIBS =$(shell sdl-config --libs) -lstdc++
- 
+-SGE_LIBS =$(shell sdl-config --libs) -lstdc++
+-
 -
 -# Is freetype-config available?
 -HAVE_FT =$(shell if (freetype-config --version) < /dev/null > /dev/null 2>&1; then echo "y"; else echo "n"; fi;)
 -ifeq ($(HAVE_FT),n)
 -  USE_FT = n
 -endif
--
++SGE_LIBS =$(shell sdl-config --libs)
+ 
  ifneq ($(USE_FT),n)
    USE_FT = y
-   SGE_LIBS +=$(shell freetype-config --libs)
+@@ -47,17 +32,6 @@
    FT_CFLAGS =$(shell freetype-config --cflags)
  endif
  
diff --git a/devel/sdl_sge/pkg-descr b/devel/sdl_sge/pkg-descr
index a4b2e117d237..235ca3474323 100644
--- a/devel/sdl_sge/pkg-descr
+++ b/devel/sdl_sge/pkg-descr
@@ -11,4 +11,4 @@ Some of SGE:s features are:
  -Basic texture mapping
  -Filled and gourand shaded polygons (with antialiasing or alpha blending)
 
-WWW: http://www.etek.chalmers.se/~e8cal1/sge/
+WWW: http://www.digitalfanatics.org/cal/sge/
diff --git a/devel/sdl_sge/pkg-plist b/devel/sdl_sge/pkg-plist
index 312ed4f6dcff..cc498c61ac68 100644
--- a/devel/sdl_sge/pkg-plist
+++ b/devel/sdl_sge/pkg-plist
@@ -35,30 +35,30 @@ lib/libSGE.so.0.030809
 %%PORTDOCS%%%%DOCSDIR%%/ttf-input.html
 %%PORTDOCS%%%%DOCSDIR%%/ttf-output.html
 %%PORTDOCS%%%%DOCSDIR%%/ttf.html
-%%PORTDOCS%%%%EXAMPLESDIR%%/Makefile
-%%PORTDOCS%%%%EXAMPLESDIR%%/README
-%%PORTDOCS%%%%EXAMPLESDIR%%/alpha.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/basics.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/basics_c.c
-%%PORTDOCS%%%%EXAMPLESDIR%%/bitmapfont.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/blib.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/blitting.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/collision.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/fire.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/font.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/font.ttf
-%%PORTDOCS%%%%EXAMPLESDIR%%/input.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/inputdeluxe.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/poly.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/rotate.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/sfont.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/sfont.png
-%%PORTDOCS%%%%EXAMPLESDIR%%/smiley.bmp
-%%PORTDOCS%%%%EXAMPLESDIR%%/speedtest.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/sprite.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/sprite2.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/ttf_readme
-%%PORTDOCS%%%%EXAMPLESDIR%%/tux.bmp
-@dirrmtry include/SDL
+%%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%%
-%%PORTDOCS%%@dirrm %%EXAMPLESDIR%%
+@dirrmtry include/SDL