- Fix PORTVERSION

- Fix LIB_DEPENDS
- GNU_CONFIGURE -> USE_LIBTOOL

PR:		40501
Submitted by:	Ports Fury

6 files changed, 62 insertions, 68 deletions

diff --git a/graphics/xtheater/Makefile b/graphics/xtheater/Makefile
index c0b16148e347..272b09e4de55 100644
--- a/graphics/xtheater/Makefile
+++ b/graphics/xtheater/Makefile
@@ -7,27 +7,41 @@
 #
 
 PORTNAME=	xtheater
-PORTVERSION=	1.0.0p1
+PORTVERSION=	1.0.0.p1
+PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	Xtheater-${PORTVERSION:S/p/-pre/}
+DISTNAME=	Xtheater-${PORTVERSION:S/.p/-pre/}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12 \
-		smpeg:${PORTSDIR}/graphics/smpeg \
-		aviplay-0.7:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/deve/sdl12 \
+		smpeg.1:${PORTSDIR}/graphics/smpeg
+
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GTK=	yes
 USE_MESA=	yes
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE} ${PTHREAD_LIBS}"
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ARGS=	--enable-gl
+
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[(]prefix[)]/Xtheater|(libdir)/Xtheater|g ; \
+		 s|-release.*$$|-module -avoid-version|g'
+	@${REINPLACE_CMD} -e 's|PREFIX/Xtheater|PREFIX/lib/Xtheater|g' \
+		${WRKSRC}/Xtheater.conf
+.for file in plugins/player/smpeg/glscreen.c plugins/player/wm/glscreen.c
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/xtheater/files/patch-smpeg::Makefile.in b/graphics/xtheater/files/patch-smpeg::Makefile.in
deleted file mode 100644
index 18c27a29bce0..000000000000
--- a/graphics/xtheater/files/patch-smpeg::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/player/smpeg/Makefile.in.orig	Sat Jun  8 02:47:41 2002
-+++ plugins/player/smpeg/Makefile.in	Sat Jun  8 02:47:57 2002
-@@ -94,7 +94,7 @@
- @USE_GL_TRUE@GL_LIBS = -lGL -lGLU
- @USE_GL_FALSE@GL_LIBS = 
- LIBS = $(SMPEG_LIBS) $(GL_LIBS)
--INCLUDES = -I.. $(SMPEG_CFLAGS) $(GLIB_CFLAGS)
-+INCLUDES = -I.. $(SMPEG_CFLAGS) $(GLIB_CFLAGS) -I${X11BASE}/include
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/graphics/xtheater/pkg-plist b/graphics/xtheater/pkg-plist
index 537163bc4163..6dbd34c99005 100644
--- a/graphics/xtheater/pkg-plist
+++ b/graphics/xtheater/pkg-plist
@@ -1,13 +1,7 @@
 bin/xtheater
-Xtheater/player/libsmpeg-1.0.0-pre1.so
-Xtheater/player/libsmpeg.a
-Xtheater/player/libsmpeg.la
-Xtheater/player/libsmpeg.so
-Xtheater/ui/libgtkui-1.0.0-pre1.so
-Xtheater/ui/libgtkui.a
-Xtheater/ui/libgtkui.la
-Xtheater/ui/libgtkui.so
-Xtheater/config
-@dirrm Xtheater/player
-@dirrm Xtheater/ui
-@dirrm Xtheater
+lib/Xtheater/config
+lib/Xtheater/player/libsmpeg.so
+lib/Xtheater/ui/libgtkui.so
+@dirrm lib/Xtheater/ui
+@dirrm lib/Xtheater/player
+@dirrm lib/Xtheater
diff --git a/multimedia/xtheater/Makefile b/multimedia/xtheater/Makefile
index c0b16148e347..272b09e4de55 100644
--- a/multimedia/xtheater/Makefile
+++ b/multimedia/xtheater/Makefile
@@ -7,27 +7,41 @@
 #
 
 PORTNAME=	xtheater
-PORTVERSION=	1.0.0p1
+PORTVERSION=	1.0.0.p1
+PORTEPOCH=	1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-DISTNAME=	Xtheater-${PORTVERSION:S/p/-pre/}
+DISTNAME=	Xtheater-${PORTVERSION:S/.p/-pre/}
 
 MAINTAINER=	ports@FreeBSD.org
 
-LIB_DEPENDS=	SDL-1.1:${PORTSDIR}/devel/sdl12 \
-		smpeg:${PORTSDIR}/graphics/smpeg \
-		aviplay-0.7:${PORTSDIR}/graphics/avifile
+LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/deve/sdl12 \
+		smpeg.1:${PORTSDIR}/graphics/smpeg
+
+SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
 USE_BZIP2=	yes
-USE_XLIB=	yes
 USE_GTK=	yes
 USE_MESA=	yes
-SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
-GNU_CONFIGURE=	yes
-CONFIGURE_ENV=	SDL_CONFIG="${SDL_CONFIG}" \
-		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE} ${PTHREAD_CFLAGS}" \
-		LDFLAGS="-L${LOCALBASE} ${PTHREAD_LIBS}"
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
+USE_LIBTOOL=	yes
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
+		SDL_CONFIG="${SDL_CONFIG}"
+CONFIGURE_ARGS=	--enable-gl
+
+CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib ${PTHREAD_LIBS}
+
+post-patch:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|[(]prefix[)]/Xtheater|(libdir)/Xtheater|g ; \
+		 s|-release.*$$|-module -avoid-version|g'
+	@${REINPLACE_CMD} -e 's|PREFIX/Xtheater|PREFIX/lib/Xtheater|g' \
+		${WRKSRC}/Xtheater.conf
+.for file in plugins/player/smpeg/glscreen.c plugins/player/wm/glscreen.c
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/${file}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/multimedia/xtheater/files/patch-smpeg::Makefile.in b/multimedia/xtheater/files/patch-smpeg::Makefile.in
deleted file mode 100644
index 18c27a29bce0..000000000000
--- a/multimedia/xtheater/files/patch-smpeg::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- plugins/player/smpeg/Makefile.in.orig	Sat Jun  8 02:47:41 2002
-+++ plugins/player/smpeg/Makefile.in	Sat Jun  8 02:47:57 2002
-@@ -94,7 +94,7 @@
- @USE_GL_TRUE@GL_LIBS = -lGL -lGLU
- @USE_GL_FALSE@GL_LIBS = 
- LIBS = $(SMPEG_LIBS) $(GL_LIBS)
--INCLUDES = -I.. $(SMPEG_CFLAGS) $(GLIB_CFLAGS)
-+INCLUDES = -I.. $(SMPEG_CFLAGS) $(GLIB_CFLAGS) -I${X11BASE}/include
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_HEADER = ../../../config.h
- CONFIG_CLEAN_FILES = 
diff --git a/multimedia/xtheater/pkg-plist b/multimedia/xtheater/pkg-plist
index 537163bc4163..6dbd34c99005 100644
--- a/multimedia/xtheater/pkg-plist
+++ b/multimedia/xtheater/pkg-plist
@@ -1,13 +1,7 @@
 bin/xtheater
-Xtheater/player/libsmpeg-1.0.0-pre1.so
-Xtheater/player/libsmpeg.a
-Xtheater/player/libsmpeg.la
-Xtheater/player/libsmpeg.so
-Xtheater/ui/libgtkui-1.0.0-pre1.so
-Xtheater/ui/libgtkui.a
-Xtheater/ui/libgtkui.la
-Xtheater/ui/libgtkui.so
-Xtheater/config
-@dirrm Xtheater/player
-@dirrm Xtheater/ui
-@dirrm Xtheater
+lib/Xtheater/config
+lib/Xtheater/player/libsmpeg.so
+lib/Xtheater/ui/libgtkui.so
+@dirrm lib/Xtheater/ui
+@dirrm lib/Xtheater/player
+@dirrm lib/Xtheater