diff options
author | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-01-05 11:52:36 +0000 |
---|---|---|
committer | Ying-Chieh Liao <ijliao@FreeBSD.org> | 2002-01-05 11:52:36 +0000 |
commit | b55bc1f41bd5a7df2d930cbed3189b9b1c1d3835 (patch) | |
tree | 3753ac0552f3dfd0ba60a6f71071055f23698bcd /games/mahjong | |
parent | PKGNAMESUFFIX set for Option OPENSSH_OVERWRITE_BASE (diff) |
upgrade to 1.3
Notes
Notes:
svn path=/head/; revision=52625
Diffstat (limited to 'games/mahjong')
-rw-r--r-- | games/mahjong/Makefile | 7 | ||||
-rw-r--r-- | games/mahjong/distinfo | 2 | ||||
-rw-r--r-- | games/mahjong/files/patch-Makefile | 69 |
3 files changed, 20 insertions, 58 deletions
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile index cb51aa6e1f44..360d37efd173 100644 --- a/games/mahjong/Makefile +++ b/games/mahjong/Makefile @@ -7,7 +7,7 @@ # PORTNAME= mahjong -PORTVERSION= 1.2.3 +PORTVERSION= 1.3 CATEGORIES= games net MASTER_SITES= http://www.stevens-bradfield.com/MahJong/Source/ DISTNAME= mj-${PORTVERSION}-src @@ -22,4 +22,9 @@ INSTALL_TARGET= install install.man MAN1= xmj.1 mj-player.1 mj-server.1 +post-patch: + @${PERL} -pi -e "s,^CC ,#CC ,g ; \ + s,^PERL,#PERL,g ; \ + s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile + .include <bsd.port.mk> diff --git a/games/mahjong/distinfo b/games/mahjong/distinfo index b116a0f42bb1..a67da2ba03cd 100644 --- a/games/mahjong/distinfo +++ b/games/mahjong/distinfo @@ -1 +1 @@ -MD5 (mj-1.2.3-src.tar.gz) = 8f8b6b0b15cd86fa72fe92b29d0d3c5d +MD5 (mj-1.3-src.tar.gz) = a9f8e908f79ef44b7b5f090742aa389c diff --git a/games/mahjong/files/patch-Makefile b/games/mahjong/files/patch-Makefile index f4c3bc412e45..451672405ad6 100644 --- a/games/mahjong/files/patch-Makefile +++ b/games/mahjong/files/patch-Makefile @@ -1,5 +1,5 @@ ---- Makefile.orig Tue Sep 4 21:39:37 2001 -+++ Makefile Thu Sep 6 01:24:46 2001 +--- Makefile.orig Wed Jan 2 23:23:30 2002 ++++ Makefile Sat Jan 5 19:48:56 2002 @@ -35,7 +35,7 @@ # (Don't bother with this on Windows; I don't have an install target # for Windows.) @@ -9,64 +9,21 @@ BINDIR = bin # The man pages go into $(DESTDIR)$(MANDIR) MANDIR = man/man1 -@@ -50,7 +50,6 @@ - # makefile was made by stripping out most of an imake-generated file. - - # It's best to use gcc if you can. --CC = gcc - - # C debugging and optimization flags. - # In development, we turn on all reasonable warnings, thus: -@@ -59,7 +58,6 @@ +@@ -59,7 +59,7 @@ # code (e.g. glib) may provoke warnings. # Also, we do NOT enable optimization by default, because RedHat 6 # Linux distributions have a seriously buggy C compiler. -CDEBUGFLAGS = -g ++#CDEBUGFLAGS = -g # The -Wconversion flag is also useful to detect (more than usual) # abuse of enums, but it generates many superfluous warnings, so # is not on by default. -@@ -101,8 +99,8 @@ - GUILIBS=-LC:/gtk -lgtk-1.3 -lgdk-1.3 -lglib-1.3 -lgmodule-1.3 -Wl,-subsystem,windows - else - # Not Windows. If gtk+ is properly installed, this is all that's needed. --EXTRA_INCLUDES=`gtk-config --cflags` --GUILIBS=`gtk-config --libs` -+EXTRA_INCLUDES=`${GTK_CONFIG} --cflags` -+GUILIBS=`${GTK_CONFIG} --libs` - endif - - # We use gcc to link as well -@@ -125,7 +123,6 @@ - DEPEND = ./makedep - DEPENDFLAGS = - # perl is needed for generating several files --PERL = perl - # suffix of executables - EXE = - # programs used in installation -@@ -144,7 +141,6 @@ - DEPEND = - DEPENDFLAGS = - # perl is needed for generating several files --PERL = perl - # suffix of executables - EXE = .exe - # programs used in installation: not in windows -@@ -259,8 +255,6 @@ - - # version.h is now made from version.h.in by the release script. - # so if we are not making a release, we'd better provide it. --version.h: version.h.in -- $(CP) $< $@ - - # rule to generate the fallback tiles - fbtiles.c: $(FALLBACKTILES) makefallbacktiles Makefile -@@ -304,7 +298,7 @@ - - use.txt rules.txt: xmj.man - $(RM) use.txt rules.txt -- $(PERL) maketxt xmj.man -+ $(xPERL) maketxt xmj.man - chmod 444 use.txt rules.txt - - +@@ -117,7 +117,7 @@ + # don't mess with these + ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES) + ALLDEFINES = $(ALLINCLUDES) $(EXTRA_DEFINES) $(DEFINES) +-CFLAGS = $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) ++CFLAGS += $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES) + LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS) + + # various auxiliary program and settings. |