Date: Sun, 23 Dec 2001 14:35:33 -0800 (PST) From: KATO Tsuguru <tkato@prontomail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/33128: Update port: games/gltron Message-ID: <200112232235.fBNMZXS62147@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 33128
>Category: ports
>Synopsis: Update port: games/gltron
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Sun Dec 23 14:40:01 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: KATO Tsuguru
>Release: 4.4-RELEASE i386
>Organization:
>Environment:
>Description:
- Fix compilation error
- Support PORTDOCS PLIST_SUB
>How-To-Repeat:
>Fix:
diff -urN /usr/ports/games/gltron/Makefile games/gltron/Makefile
--- /usr/ports/games/gltron/Makefile Tue Sep 11 18:44:44 2001
+++ games/gltron/Makefile Sat Dec 22 08:56:06 2001
@@ -23,27 +23,26 @@
USE_X_PREFIX= yes
USE_MESA= yes
-GNU_CONFIGURE= yes
USE_GMAKE= yes
-CONFIGURE_ENV= X11BASE="${X11BASE}" \
- LOCALBASE="${LOCALBASE}" \
- PTHREAD_LIBS="${PTHREAD_LIBS}" \
+GNU_CONFIGURE= yes
+CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
SDL_CONFIG="${SDL_CONFIG}"
-pre-build:
+CPPFLAGS= -I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
+LDFLAGS= -L${LOCALBASE}/lib -L${X11BASE}/lib -lXext ${PTHREAD_LIBS}
+
+post-patch:
${PERL} -pi -e "s+#include <SDL\/+#include <+g" ${WRKSRC}/*.[ch]
do-install:
- @${MKDIR} ${PREFIX}/share/gltron
- (cd ${WRKSRC} && ${TAR} -c -f - art data sounds) \
- | (cd ${PREFIX}/share/gltron && ${TAR} --unlink -x -f -)
${INSTALL_PROGRAM} ${WRKSRC}/gltron ${PREFIX}/bin
-
-post-install:
+ @${MKDIR} ${DATADIR}
+ ${TAR} -C ${WRKSRC} -cf - art data sounds | \
+ ${TAR} -C ${DATADIR} --unlink -xf -
.if !defined(NOPORTDOCS)
- @${MKDIR} ${PREFIX}/share/doc/gltron
+ @${MKDIR} ${DOCSDIR}
.for file in CHANGELOG CREDITS README
- ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/gltron
+ ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
.endfor
.endif
diff -urN /usr/ports/games/gltron/files/patch-ad games/gltron/files/patch-ad
--- /usr/ports/games/gltron/files/patch-ad Sat Apr 28 03:56:10 2001
+++ games/gltron/files/patch-ad Sat Dec 22 08:58:20 2001
@@ -8,7 +8,7 @@
-LIBS='-L/usr/X11R6/lib'
-+LIBS="-L${X11BASE}/lib -L${LOCALBASE}/lib"
++LIBS="$LIBS $LDFLAGS"
# Extract the first word of "gcc", so it can be a program name with args.
set dummy gcc; ac_word=$2
@@ -17,7 +17,7 @@
-CFLAGS=""
-+CFLAGS="$CFLAGS -I${X11BASE}/include -I${LOCALBASE}/include"
++CFLAGS="$CFLAGS $CPPFLAGS"
# Check whether --enable-warn or --disable-warn was given.
if test "${enable_warn+set}" = set; then
@@ -26,7 +26,7 @@
if test "x$enable_optimize" ; then
- CFLAGS="$CFLAGS -O$enable_optimize"
-+# CFLAGS="$CFLAGS -O$enable_optimize"
++ CFLAGS="$CFLAGS"
fi
# Check whether --enable-network or --disable-network was given.
diff -urN /usr/ports/games/gltron/pkg-plist games/gltron/pkg-plist
--- /usr/ports/games/gltron/pkg-plist Sat Apr 28 03:56:09 2001
+++ games/gltron/pkg-plist Thu Dec 20 03:34:21 2001
@@ -1,7 +1,7 @@
bin/gltron
-share/doc/gltron/CHANGELOG
-share/doc/gltron/CREDITS
-share/doc/gltron/README
+%%PORTDOCS%%share/doc/gltron/CHANGELOG
+%%PORTDOCS%%share/doc/gltron/CREDITS
+%%PORTDOCS%%share/doc/gltron/README
share/gltron/art/arcade_spots/gltron_floor.png
share/gltron/art/arcade_spots/gltron_traildecal.png
share/gltron/art/arcade_spots/gltron_wall_1.png
@@ -99,4 +99,4 @@
@dirrm share/gltron/art/arcade_spots
@dirrm share/gltron/art
@dirrm share/gltron
-@dirrm share/doc/gltron
+%%PORTDOCS%%@dirrm share/doc/gltron
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200112232235.fBNMZXS62147>