Attachment #109904 for bug #150967

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




#

PORTNAME=	wesnoth
PORTVERSION=	1.8.5
PORTREVISION=	1
CATEGORIES=	games
MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
		http://files.wesnoth.org/

USE_GNOME=	gnometarget pango
USE_GMAKE=	yes
MAKE_JOBS_SAFE=	yes
WANT_GNOME=	yes
USE_BZIP2=	yes
USE_LUA=	5.1
USE_AUTOTOOLS=	aclocal:111 autoheader:267 automake:111 autoconf:267
ACLOCAL_ARGS=	-Im4
AUTOMAKE_ARGS=	--add-missing --copy
CONFIGURE_ENV=	PKG_CONFIG="${PKG_CONFIG}" \

		--with-localedir=${PREFIX}/share/locale
PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config

MANLANG=	"" cs de en_GB es et fi fr gl hu id it ja lt pl pt_BR sk \
		sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW

MAN6=		wesnoth.6

.endif

.if defined(NOPORTDOCS)
CONFIGURE_ARGS+=	--without-docs
.endif

.if defined(NOPORTDATA)

Lines 1-3 Link Here

(-)games/wesnoth/distinfo (-3 / +3 lines)
1	MD5 (wesnoth-1.8.4.tar.bz2) = 2dce83f835ecce1d505ea60e46b7356f	1	MD5 (wesnoth-1.8.5.tar.bz2) = a800285d1406690755dd0ea22b98b6df
2	SHA256 (wesnoth-1.8.4.tar.bz2) = af29ddf40f83ee016972d6edb8761d7323f8ed5d6bf15005659bff4fd7190eb9	2	SHA256 (wesnoth-1.8.5.tar.bz2) = eca3bdce505480a0cf045d0189df7260c16af9f543a427e7de8690fff9c655fa
3	SIZE (wesnoth-1.8.4.tar.bz2) = 300557790	3	SIZE (wesnoth-1.8.5.tar.bz2) = 301024033




--- Makefile.am~
+++ Makefile.am
@@ -73,6 +73,7 @@ if INSTALLDATA
 	  echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
 	done
+if INSTALLDOCS
 	@echo "Replicate doc directory skeleton under target doc subdirectory"
 	@echo "Then copy all corresponding files."
 	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
@@ -84,6 +85,7 @@ if INSTALLDATA
 	  echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
 	  $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
 	done
+endif
 if TINYGUI
 	@echo "Shrink installed images by a factor of two."
 	(cd $(top_srcdir) && find data/core/images data/campaigns images  \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) | while read p; do \




--- configure.ac~
+++ configure.ac
@@ -213,6 +213,11 @@ esac
 AC_SUBST([FULLLOCALEDIR])
 AC_SUBST([HAS_RELATIVE_LOCALEDIR])
 
+AC_ARG_WITH([docs],
+	         AS_HELP_STRING([--without-docs], [don't install wesnoth manual]),
+	      [docs=$withval],
+	      [docs=yes])
+AM_CONDITIONAL([INSTALLDOCS], [test x$docs = xyes])
 
 AC_ARG_ENABLE([game],
               AS_HELP_STRING([--disable-game], [disable compilation of game]),

Return to bug 150967

Lines 6-13 Link Here

(-)games/wesnoth/Makefile (-6 / +4 lines)
6	#	6	#
7		7
8	PORTNAME= wesnoth	8	PORTNAME= wesnoth
9	PORTVERSION= 1.8.4	9	PORTVERSION= 1.8.5
10	PORTREVISION= 1
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-${PORTVERSION:R}/${PORTNAME}-${PORTVERSION} \
13	http://files.wesnoth.org/	12	http://files.wesnoth.org/
Lines 27-36 USE_SDL= image mixer net ttf Link Here
27	USE_GNOME= gnometarget pango	26	USE_GNOME= gnometarget pango
28	USE_GMAKE= yes	27	USE_GMAKE= yes
29	MAKE_JOBS_SAFE= yes	28	MAKE_JOBS_SAFE= yes
30	WANT_GNOME= yes
31	USE_BZIP2= yes	29	USE_BZIP2= yes
32	USE_LUA= 5.1	30	USE_LUA= 5.1
33	USE_AUTOTOOLS= aclocal:110 autoheader:267 automake:110 autoconf:267	31	USE_AUTOTOOLS= aclocal:111 autoheader:267 automake:111 autoconf:267
34	ACLOCAL_ARGS= -Im4	32	ACLOCAL_ARGS= -Im4
35	AUTOMAKE_ARGS= --add-missing --copy	33	AUTOMAKE_ARGS= --add-missing --copy
36	CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \	34	CONFIGURE_ENV= PKG_CONFIG="${PKG_CONFIG}" \
Lines 43-49 CONFIGURE_ARGS= --localstatedir=/var \ Link Here
43	--with-localedir=${PREFIX}/share/locale	41	--with-localedir=${PREFIX}/share/locale
44	PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config	42	PKG_CONFIG?= ${LOCALBASE}/bin/pkg-config
45		43
46	MANLANG= "" cs de en_GB es et fi fr gl hu it ja lt pl pt_BR sk \	44	MANLANG= "" cs de en_GB es et fi fr gl hu id it ja lt pl pt_BR sk \
47	sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW	45	sr sr@ijekavian sr@ijekavianlatin sr@latin tr zh_CN zh_TW
48		46
49	MAN6= wesnoth.6	47	MAN6= wesnoth.6
Lines 192-198 PLIST_SUB+= TOOLS="" Link Here
192	.endif	190	.endif
193		191
194	.if defined(NOPORTDOCS)	192	.if defined(NOPORTDOCS)
195	CONFIGURE_ARGS+= --docdir=${WRKDIR}/docs	193	CONFIGURE_ARGS+= --without-docs
196	.endif	194	.endif
197		195
198	.if defined(NOPORTDATA)	196	.if defined(NOPORTDATA)

Added Link Here

(-)games/wesnoth/files/patch-Makefile.am (+18 lines)
1	--- Makefile.am~
2	+++ Makefile.am
3	@@ -73,6 +73,7 @@ if INSTALLDATA
4	echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
5	$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pkgdatadir)/$$f"; \
6	done
7	+if INSTALLDOCS
8	@echo "Replicate doc directory skeleton under target doc subdirectory"
9	@echo "Then copy all corresponding files."
10	test -z "$(docdir)" \|\| $(mkdir_p) "$(DESTDIR)$(docdir)"
11	@@ -84,6 +85,7 @@ if INSTALLDATA
12	echo $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
13	$(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; cd ..; \
14	done
15	+endif
16	if TINYGUI
17	@echo "Shrink installed images by a factor of two."
18	(cd $(top_srcdir) && find data/core/images data/campaigns images \( $(findfilterflags) -a -name '*.png' -and -not -name 'bar-energy-tinygui.png' -print \) ) \| while read p; do \

Lines 1-11 Link Here

(-)games/wesnoth/files/patch-configure.ac (-8 / +11 lines)
1	--- configure.ac~	1	--- configure.ac~
2	+++ configure.ac	2	+++ configure.ac
3	@@ -111,7 +111,7 @@ then	3	@@ -213,6 +213,11 @@ esac
4	fi	4	AC_SUBST([FULLLOCALEDIR])
		5	AC_SUBST([HAS_RELATIVE_LOCALEDIR])
5		6
6	# Make tests default in svn version	7	+AC_ARG_WITH([docs],
7	-svn_in_version=`expr match "$WESNOTH_VERSION" '.*svn'`	8	+ AS_HELP_STRING([--without-docs], [don't install wesnoth manual]),
8	+svn_in_version=`expr "$WESNOTH_VERSION" : '.*svn'`	9	+ [docs=$withval],
9	test_build=yes	10	+ [docs=yes])
10	if test $svn_in_version = 0	11	+AM_CONDITIONAL([INSTALLDOCS], [test x$docs = xyes])
11	then	12
		13	AC_ARG_ENABLE([game],
		14	AS_HELP_STRING([--disable-game], [disable compilation of game]),