Attachment #20256 for bug #35790

View | Details | Raw Unified | Return to bug 35790
Collapse All | Expand All

Lines 7-13 Link Here

(-)games/mahjong/Makefile (-7 / +14 lines)
7	#	7	#
8		8
9	PORTNAME= mahjong	9	PORTNAME= mahjong
10	PORTVERSION= 1.3.1	10	PORTVERSION= 1.3.2
11	CATEGORIES= games net	11	CATEGORIES= games net
12	MASTER_SITES= http://www.stevens-bradfield.com/MahJong/Source/	12	MASTER_SITES= http://www.stevens-bradfield.com/MahJong/Source/
13	DISTNAME= mj-${PORTVERSION}-src	13	DISTNAME= mj-${PORTVERSION}-src
Lines 16-30 Link Here
16		16
17	USE_GTK= yes	17	USE_GTK= yes
18	USE_GMAKE= yes	18	USE_GMAKE= yes
19	MAKE_ENV= PERL="${PERL}"	19	MAKE_ENV= CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" \
20		20	DESTDIR="${PREFIX}/" INSTMANFLAGS="${INSTALL_MAN}" \
		21	INSTPGMFLAGS="${INSTALL_PROGRAM}" PERL="${PERL}"
21	INSTALL_TARGET= install install.man	22	INSTALL_TARGET= install install.man
22		23
23	MAN1= xmj.1 mj-player.1 mj-server.1	24	MAN1= xmj.1
		25	MLINKS= xmj.1 mj-player.1 \
		26	xmj.1 mj-server.1
24		27
25	post-patch:	28	post-patch:
26	@${PERL} -pi -e "s,^CC ,#CC ,g ; \	29	@${PERL} -pi -e 's\|^CC\|#CC\|g ; \
27	s,^PERL,#PERL,g ; \	30	s\|^DESTDIR\|#DESTDIR\|g ; \
28	s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile	31	s\|^CDEBUGFLAGS\|#CDEBUGFLAGS\|g ; \
		32	s\|^MAKE\|#MAKE\|g ; \
		33	s\|^PERL\|#PERL\|g ; \
		34	s\|^INST\|#INST\|g ; \
		35	s\|gtk-config\|\$$\{GTK_CONFIG\}\|g' ${WRKSRC}/Makefile
29		36
30	.include <bsd.port.mk>	37	.include <bsd.port.mk>

Line 1 Link Here

(-)games/mahjong/distinfo (-1 / +1 lines)
1	MD5 (mj-1.3.1-src.tar.gz) = ce5a7096d4061f3aeabfc5f1b26b75dc	1	MD5 (mj-1.3.2-src.tar.gz) = 1250df8a76bf0f176d54da8136139424




--- 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.

Return to bug 35790

Lines 1-29 Link Here

(-)games/mahjong/files/patch-Makefile (-29 lines)
1	--- Makefile.orig Wed Jan 2 23:23:30 2002
2	+++ Makefile Sat Jan 5 19:48:56 2002
3	@@ -35,7 +35,7 @@
4	# (Don't bother with this on Windows; I don't have an install target
5	# for Windows.)
6	# The binaries go into $(DESTDIR)$(BINDIR)
7	-DESTDIR = /usr/local/
8	+DESTDIR = ${PREFIX}/
9	BINDIR = bin
10	# The man pages go into $(DESTDIR)$(MANDIR)
11	MANDIR = man/man1
12	@@ -59,7 +59,7 @@
13	# code (e.g. glib) may provoke warnings.
14	# Also, we do NOT enable optimization by default, because RedHat 6
15	# Linux distributions have a seriously buggy C compiler.
16	-CDEBUGFLAGS = -g
17	+#CDEBUGFLAGS = -g
18	# The -Wconversion flag is also useful to detect (more than usual)
19	# abuse of enums, but it generates many superfluous warnings, so
20	# is not on by default.
21	@@ -117,7 +117,7 @@
22	# don't mess with these
23	ALLINCLUDES = $(INCLUDES) $(EXTRA_INCLUDES)
24	ALLDEFINES = $(ALLINCLUDES) $(EXTRA_DEFINES) $(DEFINES)
25	-CFLAGS = $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
26	+CFLAGS += $(EXTRA_CFLAGS) $(CDEBUGFLAGS) $(CCOPTIONS) $(ALLDEFINES)
27	LDOPTIONS = $(CDEBUGFLAGS) $(CCOPTIONS) $(EXTRA_LDOPTIONS)
28
29	# various auxiliary program and settings.