ports/167808: [maintainer-update] Patch to fix plist for games/netrek-client-cow (and more)
Kevin Zheng
kevinz5000 at gmail.com
Fri May 11 22:00:27 UTC 2012
>Number: 167808
>Category: ports
>Synopsis: [maintainer-update] Patch to fix plist for games/netrek-client-cow (and more)
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri May 11 22:00:25 UTC 2012
>Closed-Date:
>Last-Modified:
>Originator: Kevin Zheng
>Release: 9.0-RELEASE
>Organization:
>Environment:
FreeBSD sigma.local 9.0-RELEASE FreeBSD 9.0-RELEASE #0: Tue Jan 3 07:15:25 UTC 2012 root at obrian.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC i386
>Description:
The current port of games/netrek-client-cow incorrectly removes $PREFIX/pixmaps (if the directory is empty).
In addition, the current port installs to $PREFIX/games instead of $PREFIX/bin. It also uses LIB_DEPENDS to add SDL mixer, while the preferred way of doing it is to use USE_SDL.
>How-To-Repeat:
Install games/netrek-client-cow (but please don't until this is fixed).
>Fix:
Apply the attached patch.
Patch attached with submission follows:
diff -ruN /usr/ports/games/netrek-client-cow/Makefile netrek-client-cow/Makefile
--- /usr/ports/games/netrek-client-cow/Makefile 2012-05-11 15:49:04.000000000 -0500
+++ netrek-client-cow/Makefile 2012-05-11 16:44:44.000000000 -0500
@@ -7,6 +7,7 @@
PORTNAME= netrek-client-cow
PORTVERSION= 3.3.1
+PORTREVISION= 1
CATEGORIES= games
MASTER_SITES= http://www.netrek.org/files/COW/ \
http://quozl.us.netrek.org/netrek/
@@ -14,12 +15,11 @@
MAINTAINER= kevinz5000 at gmail.com
COMMENT= A multi-player battle simulation with a Star Trek theme
-LIB_DEPENDS= Imlib2:${PORTSDIR}/graphics/imlib2 \
- SDL_mixer:${PORTSDIR}/audio/sdl_mixer
+LIB_DEPENDS= Imlib2:${PORTSDIR}/graphics/imlib2
GNU_CONFIGURE= yes
USE_GMAKE= yes
-USE_SDL= sdl
+USE_SDL= sdl mixer
CONFIGURE_ARGS+= NORSA='\#'
post-patch:
@@ -27,5 +27,7 @@
${WRKSRC}/short.c
${REINPLACE_CMD} -e 's|/usr|${PREFIX}|' \
${WRKSRC}/x11sprite.c ${WRKSRC}/netrek-client-cow.desktop
+ ${REINPLACE_CMD} -e 's|games|bin|' \
+ ${WRKSRC}/netrek-client-cow.desktop
.include <bsd.port.mk>
diff -ruN /usr/ports/games/netrek-client-cow/files/patch-parsemeta.c netrek-client-cow/files/patch-parsemeta.c
--- /usr/ports/games/netrek-client-cow/files/patch-parsemeta.c 2012-05-11 15:49:04.000000000 -0500
+++ netrek-client-cow/files/patch-parsemeta.c 2012-04-27 15:59:56.000000000 -0500
@@ -1,5 +1,5 @@
--- ./parsemeta.c.orig 2011-10-18 05:35:34.000000000 -0500
-+++ ./parsemeta.c 2012-04-23 18:10:20.000000000 -0500
++++ ./parsemeta.c 2012-04-27 15:57:56.000000000 -0500
@@ -20,6 +20,7 @@
#include <arpa/inet.h>
#include <netdb.h>
diff -ruN /usr/ports/games/netrek-client-cow/files/patch-system.mk.in netrek-client-cow/files/patch-system.mk.in
--- /usr/ports/games/netrek-client-cow/files/patch-system.mk.in 2012-05-11 15:49:04.000000000 -0500
+++ netrek-client-cow/files/patch-system.mk.in 2012-04-27 15:59:56.000000000 -0500
@@ -1,6 +1,16 @@
--- ./system.mk.in.orig 2011-10-18 05:35:35.000000000 -0500
-+++ ./system.mk.in 2012-04-23 18:10:55.000000000 -0500
-@@ -200,8 +200,6 @@
++++ ./system.mk.in 2012-04-27 15:59:00.000000000 -0500
+@@ -9,8 +9,7 @@
+ datarootdir=@datarootdir@
+
+ DESTDIR=
+-BINDIR=${prefix}/games
+-DOCDIR=${datarootdir}/doc/${PACKAGE}
++BINDIR=${prefix}/bin
+ PIXMAPDIR=${datarootdir}/pixmaps/${PACKAGE}
+ APPDIR=${datarootdir}/applications
+
+@@ -200,8 +199,6 @@
install: netrek-client-cow
mkdir -p $(DESTDIR)$(BINDIR)
install netrek-client-cow $(DESTDIR)$(BINDIR)
diff -ruN /usr/ports/games/netrek-client-cow/pkg-plist netrek-client-cow/pkg-plist
--- /usr/ports/games/netrek-client-cow/pkg-plist 2012-05-11 15:49:04.000000000 -0500
+++ netrek-client-cow/pkg-plist 2012-04-30 22:30:05.000000000 -0500
@@ -1,4 +1,4 @@
-games/netrek-client-cow
+bin/netrek-client-cow
share/applications/netrek-client-cow.desktop
share/pixmaps/netrek-client-cow/Fed/AS.png
share/pixmaps/netrek-client-cow/Fed/AS0.png
@@ -322,6 +322,4 @@
@dirrm share/pixmaps/netrek-client-cow/Rom
@dirrm share/pixmaps/netrek-client-cow/ss
@dirrm share/pixmaps/netrek-client-cow
- at dirrmtry games
@dirrmtry share/applications
- at dirrmtry share/pixmaps
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list