1) update to 0.4.3

2) add pkg-message telling users to make sure that Load glx is in
   the modules section of the X config file

Submitted by:	sheldonh(#2)

5 files changed, 64 insertions, 40 deletions

diff --git a/games/glchess/Makefile b/games/glchess/Makefile
index 781ff48075a1..b690ce71befd 100644
--- a/games/glchess/Makefile
+++ b/games/glchess/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glchess
-PORTVERSION=	0.4.2
+PORTVERSION=	0.4.3
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,43 +16,50 @@ MAINTAINER=	pat@FreeBSD.org
 RUN_DEPENDS=	crafty:${PORTSDIR}/games/crafty \
 		gnuchess:${PORTSDIR}/games/gnuchess
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
+BUILD_DEPENDS=	automake14:${PORTSDIR}/devel/automake14 \
+		autoconf213:${PORTSDIR}/devel/autoconf213
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 USE_X_PREFIX=	yes
 USE_GTK=	yes
+USE_GMAKE=	yes
 USE_MESA=	yes
-MAKE_ENV=	PTHREAD_LIBS="${PTHREAD_LIBS}" \
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	PTHREAD_LIBS=${PTHREAD_LIBS} \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}"
 
 MAN6=		${PORTNAME}.6
 
 pre-patch:
 	@${PERL} -pi.orig -e 's!/usr/local/share/games/glchess!${DATADIR}!' \
-		${WRKSRC}/../glchessrc
+		${WRKSRC}/glchessrc
 	@${PERL} -pi.orig -e 's!/etc!${PREFIX}/etc!' \
-		${WRKSRC}/config.c
-	@${PERL} -pi.orig -e 's|VERSION|\"${PORTVERSION}\"|' \
-		${WRKSRC}/dialog.c ${WRKSRC}/interface.c
-	@${PERL} -pi.orig -e 's|VERSION|${PORTVERSION}|; \
-		s|\"DATE\"||' ${WRKSRC}/../man/${PORTNAME}.6
-	@${CP} ${FILESDIR}/Makefile.bsd ${WRKSRC}/Makefile
+		${WRKSRC}/src/config.c
+	@${PERL} -pi.orig -e 's|aclocal|${ACLOCAL}|; s|autoconf|${AUTOCONF}|; \
+		s|automake|${AUTOMAKE}|' ${WRKSRC}/autogen.sh
+
+pre-configure:
+	( cd ${WRKSRC} && ${SH} autogen.sh )
+	@${PERL} -pi.orig -e 's|aclocal|${ACLOCAL}|; s|autoconf|${AUTOCONF}|; \
+		s|automake|${AUTOMAKE}|; s|autoheader|${AUTOHEADER}|' \
+		${WRKSRC}/configure
 
 do-install:
 	@${MKDIR} ${DATADIR}
 	@${MKDIR} ${DATADIR}/textures
-	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} \
+	@${INSTALL_PROGRAM} ${WRKSRC}/src/glchess \
 		${PREFIX}/bin
-	@${INSTALL_DATA} ${WRKSRC}/../glchessrc \
+	@${INSTALL_DATA} ${WRKSRC}/glchessrc \
 		${PREFIX}/etc
-	@${INSTALL_MAN} ${WRKSRC}/../man/${PORTNAME}.6 \
+	@${INSTALL_MAN} ${WRKSRC}/man/${PORTNAME}.6 \
 		${PREFIX}/man/man6
-	@${INSTALL_DATA} ${WRKSRC}/../textures/*.rgb \
+	@${INSTALL_DATA} ${WRKSRC}/textures/*.rgb \
 		${DATADIR}/textures
 .ifndef(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for file in ChangeLog README TODO
-	@${INSTALL_DATA} ${WRKSRC}/../${file} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
 .endfor
 .endif #NOPORTDOCS
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/games/glchess/distinfo b/games/glchess/distinfo
index 4195fea5cd5a..e5dbb4811f96 100644
--- a/games/glchess/distinfo
+++ b/games/glchess/distinfo
@@ -1 +1 @@
-MD5 (glchess-0.4.2.tar.gz) = 36e037279d233ba18ae00b9966dc054b
+MD5 (glchess-0.4.3.tar.gz) = 056bd6a55d393453744486b33f83acc0
diff --git a/games/glchess/files/Makefile.bsd b/games/glchess/files/Makefile.bsd
deleted file mode 100644
index bebdc6bb70d3..000000000000
--- a/games/glchess/files/Makefile.bsd
+++ /dev/null
@@ -1,24 +0,0 @@
-CFLAGS += `${GTK_CONFIG} --cflags` $(INCLDIR) ${PTHREAD_CFLAGS}
-LIBS = `${GTK_CONFIG} --libs` -lgtkgl -lGL -lGLU -lm -lXi -lXmu ${PTHREAD_LIBS}
-
-OBJS =	main.o \
-	anim.o \
-	config.o \
-	draw.o \
-	dialog.o \
-	engine.o \
-	game.o \
-	global.o \
-	image.o \
-	interface.o \
-	menu.o \
-	models.o \
-	move.o \
-	player.o \
-	prefs.o \
-	san.o \
-	splash.o \
-	texture.o \
-
-all: $(OBJS)
-	$(CC) $(CFLAGS) $(OBJS) -o glchess $(LIBS)
diff --git a/games/glchess/files/patch-configure.in b/games/glchess/files/patch-configure.in
new file mode 100644
index 000000000000..bdb4094594f8
--- /dev/null
+++ b/games/glchess/files/patch-configure.in
@@ -0,0 +1,33 @@
+--- configure.in.orig	Thu Jan 10 15:36:21 2002
++++ configure.in	Fri Jan 11 16:47:02 2002
+@@ -21,8 +21,8 @@
+   GL_LDOPTS="-L$with_GL_prefix/lib"
+ fi
+ 
+-AC_CHECK_LIB(MesaGL, glBegin, have_MesaGL=yes, , $GTK_LIBS $GL_LDOPTS)
+-AC_CHECK_LIB(GL,     glBegin, have_GL=yes,     , $GTK_LIBS $GL_LDOPTS)
++AC_CHECK_LIB(MesaGL, glBegin, have_MesaGL=yes, , $GTK_LIBS $GL_LDOPTS $PTHREAD_LIBS)
++AC_CHECK_LIB(GL,     glBegin, have_GL=yes,     , $GTK_LIBS $GL_LDOPTS $PTHREAD_LIBS)
+ 
+ if test "$with_lib_GL" = yes; then
+ 
+@@ -62,7 +62,7 @@
+ fi
+ 
+ AC_CHECK_LIB(gtkgl, gtk_gl_area_make_current, gtkgl_ok=yes, ,
+-  ${GTKGL_LDOPTS} ${GTK_LIBS} ${GL_LIBS})
++  ${GTKGL_LDOPTS} ${GTK_LIBS} ${GL_LIBS} $PTHREAD_LIBS)
+ 
+ if test "$gtkgl_ok" = yes; then
+   GTKGL_LIBS="${GTKGL_LDOPTS} -lgtkgl"
+@@ -75,8 +75,8 @@
+ AC_C_CONST
+ AC_TYPE_SIZE_T
+ 
+-CFLAGS="$GTK_CFLAGS $GL_CFLAGS $GTKGL_CFLAGS"
+-LIBS="$GTKGL_LIBS $GTK_LIBS $GL_LIBS $IMG_LIBS"
++CFLAGS="$GTK_CFLAGS $GL_CFLAGS $GTKGL_CFLAGS $PTHREAD_CFLAGS"
++LIBS="$GTKGL_LIBS $GTK_LIBS $GL_LIBS $IMG_LIBS $PTHREAD_LIBS"
+ 
+ AC_OUTPUT(src/Makefile man/Makefile textures/Makefile Makefile)
+ 
diff --git a/games/glchess/pkg-message b/games/glchess/pkg-message
new file mode 100644
index 000000000000..7bc2ffcd7fdb
--- /dev/null
+++ b/games/glchess/pkg-message
@@ -0,0 +1,8 @@
+
+Please make sure that
+
+Load        "glx"
+
+is in the Module section
+of your X config file.
+