From owner-freebsd-ports Mon Mar 11 12:50:44 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id 6746E37B41B for ; Mon, 11 Mar 2002 12:50:01 -0800 (PST) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2BKo1F99907; Mon, 11 Mar 2002 12:50:01 -0800 (PST) (envelope-from gnats) Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AE18937B448 for ; Mon, 11 Mar 2002 12:40:26 -0800 (PST) Received: (from nobody@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g2BKeQ998135; Mon, 11 Mar 2002 12:40:26 -0800 (PST) (envelope-from nobody) Message-Id: <200203112040.g2BKeQ998135@freefall.freebsd.org> Date: Mon, 11 Mar 2002 12:40:26 -0800 (PST) From: KATO Tsuguru To: freebsd-gnats-submit@FreeBSD.org X-Send-Pr-Version: www-1.0 Subject: ports/35790: Update port: games/mahjong to 1.3.2 Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 35790 >Category: ports >Synopsis: Update port: games/mahjong to 1.3.2 >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: Mon Mar 11 12:50:01 PST 2002 >Closed-Date: >Last-Modified: >Originator: KATO Tsuguru >Release: 4.4-RELEASE i386 >Organization: >Environment: >Description: - Update to version 1.3.2 Remove file: files/patch-Makefile >How-To-Repeat: >Fix: diff -urN /usr/ports/games/mahjong/Makefile games/mahjong/Makefile --- /usr/ports/games/mahjong/Makefile Fri Jan 11 17:53:27 2002 +++ games/mahjong/Makefile Sun Mar 10 18:13:52 2002 @@ -7,7 +7,7 @@ # PORTNAME= mahjong -PORTVERSION= 1.3.1 +PORTVERSION= 1.3.2 CATEGORIES= games net MASTER_SITES= http://www.stevens-bradfield.com/MahJong/Source/ DISTNAME= mj-${PORTVERSION}-src @@ -16,15 +16,22 @@ USE_GTK= yes USE_GMAKE= yes -MAKE_ENV= PERL="${PERL}" - +MAKE_ENV= CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" \ + DESTDIR="${PREFIX}/" INSTMANFLAGS="${INSTALL_MAN}" \ + INSTPGMFLAGS="${INSTALL_PROGRAM}" PERL="${PERL}" INSTALL_TARGET= install install.man -MAN1= xmj.1 mj-player.1 mj-server.1 +MAN1= xmj.1 +MLINKS= xmj.1 mj-player.1 \ + xmj.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 + @${PERL} -pi -e 's|^CC|#CC|g ; \ + s|^DESTDIR|#DESTDIR|g ; \ + s|^CDEBUGFLAGS|#CDEBUGFLAGS|g ; \ + s|^MAKE|#MAKE|g ; \ + s|^PERL|#PERL|g ; \ + s|^INST|#INST|g ; \ + s|gtk-config|\$$\{GTK_CONFIG\}|g' ${WRKSRC}/Makefile .include diff -urN /usr/ports/games/mahjong/distinfo games/mahjong/distinfo --- /usr/ports/games/mahjong/distinfo Fri Jan 11 17:53:27 2002 +++ games/mahjong/distinfo Sun Mar 10 16:32:13 2002 @@ -1 +1 @@ -MD5 (mj-1.3.1-src.tar.gz) = ce5a7096d4061f3aeabfc5f1b26b75dc +MD5 (mj-1.3.2-src.tar.gz) = 1250df8a76bf0f176d54da8136139424 diff -urN /usr/ports/games/mahjong/files/patch-Makefile games/mahjong/files/patch-Makefile --- /usr/ports/games/mahjong/files/patch-Makefile Sun Jan 6 00:38:36 2002 +++ games/mahjong/files/patch-Makefile Thu Jan 1 09:00:00 1970 @@ -1,29 +0,0 @@ ---- 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.) - # The binaries go into $(DESTDIR)$(BINDIR) --DESTDIR = /usr/local/ -+DESTDIR = ${PREFIX}/ - BINDIR = bin - # The man pages go into $(DESTDIR)$(MANDIR) - MANDIR = man/man1 -@@ -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. -@@ -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. >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message