diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2006-10-14 08:54:54 +0000 |
commit | 29747f458a1eb2ce23b4594b09d0256dd62760b8 (patch) | |
tree | 1b71ba5d9ffdd308b6c18130f7c116f5bab5dc12 /games/wesnoth | |
parent | - Add goocanvas (diff) |
Chase the GNOME X11BASE to LOCALBASE move, and fix the build with the
new freetype2 where needed.
Submitted by: mezz, ahze, pav, and many others
Approved by: portmgr (implicit, kris)
Notes
Notes:
svn path=/head/; revision=175261
Diffstat (limited to 'games/wesnoth')
-rw-r--r-- | games/wesnoth/Makefile | 6 | ||||
-rw-r--r-- | games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c | 19 | ||||
-rw-r--r-- | games/wesnoth/pkg-plist | 6 |
3 files changed, 25 insertions, 6 deletions
diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index b31e3523d092..1483a9691371 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -7,7 +7,7 @@ PORTNAME= wesnoth PORTVERSION= 1.0.2 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= games MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} \ http://www.wesnoth.org/files/ @@ -110,8 +110,8 @@ pre-everything:: .endif post-patch: - @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${X11BASE}/share/gnome/applications|g ; \ - s|[$$][(]datadir[)]/icons|${X11BASE}/share/gnome/pixmaps|g' \ + @${REINPLACE_CMD} -e 's|[$$][(]datadir[)]/applications|${LOCALBASE}/share/gnome/applications|g ; \ + s|[$$][(]datadir[)]/icons|${LOCALBASE}/share/gnome/pixmaps|g' \ ${WRKSRC}/icons/Makefile.in .include <bsd.port.post.mk> diff --git a/games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c b/games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c new file mode 100644 index 000000000000..ee4f8be540e1 --- /dev/null +++ b/games/wesnoth/files/patch-src_sdl_ttf_SDL_ttf.c @@ -0,0 +1,19 @@ +--- src/sdl_ttf/SDL_ttf.c.orig Wed Oct 4 16:45:59 2006 ++++ src/sdl_ttf/SDL_ttf.c Wed Oct 4 16:46:32 2006 +@@ -48,7 +48,6 @@ + #include <freetype/ftoutln.h> + #include <freetype/ttnameid.h> + */ +-#include <freetype/internal/ftobjs.h> + + #ifndef FT_OPEN_STREAM + #define FT_OPEN_STREAM ft_open_stream +@@ -282,7 +281,7 @@ + } + memset(stream, 0, sizeof(*stream)); + +- stream->memory = library->memory; ++ stream->memory = NULL; + stream->read = RWread; + stream->descriptor.pointer = src; + stream->pos = (unsigned long)position; diff --git a/games/wesnoth/pkg-plist b/games/wesnoth/pkg-plist index 4028e099c5b7..b495531ad338 100644 --- a/games/wesnoth/pkg-plist +++ b/games/wesnoth/pkg-plist @@ -4015,18 +4015,18 @@ share/locale/tr/LC_MESSAGES/wesnoth.mo @dirrm %%DATADIR%%/data/campaigns @dirrm %%DATADIR%%/data @dirrm %%DATADIR%% -@dirrmtry share/locale/la/LC_MESSAGES -@dirrmtry share/locale/la @dirrmtry man/sv/man6 @dirrmtry man/sv @dirrmtry man/hu/man6 @dirrmtry man/hu @dirrmtry man/de/man6 @dirrmtry man/de +%%GNOME:%%@cwd %%LOCALBASE%% %%GNOME:%%share/gnome/applications/wesnoth.desktop %%GNOME:%%share/gnome/pixmaps/wesnoth-icon.png - %%KDE:%%@cwd %%LOCALBASE%% %%KDE:%%share/applnk/Games/TacticStrategy/wesnoth.desktop %%KDE:%%share/icons/wesnoth-icon.png %%SERVER:%%@unexec rmdir /var/run/wesnothd 2>/dev/null || echo "If you are permanently removing this port, you should do a 'rm -rf /var/run/wesnothd' to remove it." | fmt +@dirrmtry share/locale/la/LC_MESSAGES +@dirrmtry share/locale/la |