From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 4 01:10:05 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 8F7091065692 for ; Fri, 4 Sep 2009 01:10:05 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 6B6438FC1E for ; Fri, 4 Sep 2009 01:10:05 +0000 (UTC) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n841A5Rb078307 for ; Fri, 4 Sep 2009 01:10:05 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n841A5iY078306; Fri, 4 Sep 2009 01:10:05 GMT (envelope-from gnats) Resent-Date: Fri, 4 Sep 2009 01:10:05 GMT Resent-Message-Id: <200909040110.n841A5iY078306@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Anonymous Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id E67B9106566C for ; Fri, 4 Sep 2009 01:07:01 +0000 (UTC) (envelope-from swell.k@gmail.com) Received: from mail-ew0-f208.google.com (mail-ew0-f208.google.com [209.85.219.208]) by mx1.freebsd.org (Postfix) with ESMTP id 224D58FC0A for ; Fri, 4 Sep 2009 01:07:00 +0000 (UTC) Received: by ewy4 with SMTP id 4so487151ewy.36 for ; Thu, 03 Sep 2009 18:07:00 -0700 (PDT) Received: by 10.216.1.69 with SMTP id 47mr659495wec.224.1252026419731; Thu, 03 Sep 2009 18:06:59 -0700 (PDT) Received: from localhost (95-24-167-0.broadband.corbina.ru [95.24.167.0]) by mx.google.com with ESMTPS id q9sm1204210gve.6.2009.09.03.18.06.57 (version=TLSv1/SSLv3 cipher=RC4-MD5); Thu, 03 Sep 2009 18:06:58 -0700 (PDT) Message-Id: <86ljkvwma8.fsf@gmail.com> Date: Fri, 04 Sep 2009 05:06:55 +0400 From: Anonymous To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/138518: [patch] games/wesnoth: sync some parts with wesnoth-devel X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Sep 2009 01:10:05 -0000 >Number: 138518 >Category: ports >Synopsis: [patch] games/wesnoth: sync some parts with wesnoth-devel >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: sw-bug >Submitter-Id: current-users >Arrival-Date: Fri Sep 04 01:10:05 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Anonymous >Release: FreeBSD 9.0-CURRENT amd64 >Organization: >Environment: System: FreeBSD 9.0-CURRENT #1 r196788M: Thu Sep 3 18:03:51 UTC 2009 root@luffy:/usr/obj/usr/src/sys/PHOENIX amd64 >Description: - add to plist and (optionally) compress ``stealth'' man pages. While here remove nonexistent man page for russian locale. - use --with-icondir so that icons are installed inside PREFIX (see ports/133071) - use update-desktop-database, because the port installs .desktop files - editor icon file should be only installed when EDITOR option is set (this bug is mine, introduced in wesnoth-devel/pkg-plist@1.54 and merged into wesnoth/pkg-plist@1.52 ;) - rely on -devel package suffix in CONFLICTS. Without it I can install wesnoth when wesnoth-devel already installed in same PREFIX - (cosmetic) remove freetype from dependency, wesnoth uses sdl_ttf that already depends on freetype I'll not touch OPTIONS, they need more testing and a few more choices, e.g. raw-sockets, bandwidth-monitor. Oh, and a few (cosmetic) changes to wesnoth-devel to reduce diff: - sort entries in USE_GNOME - rely on *absence* of -devel package suffix in CONFLICTS >How-To-Repeat: >Fix: --- wesnoth.diff begins here --- Index: games/wesnoth/Makefile =================================================================== RCS file: /home/csup/ports/games/wesnoth/Makefile,v retrieving revision 1.72 diff -u -p -r1.72 Makefile --- games/wesnoth/Makefile 2 Sep 2009 12:12:14 -0000 1.72 +++ games/wesnoth/Makefile 4 Sep 2009 00:36:24 -0000 @@ -7,22 +7,20 @@ PORTNAME= wesnoth PORTVERSION= 1.6.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= games MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-1.6/${PORTNAME}-${PORTVERSION} \ http://www.wesnoth.org/files/ - MAINTAINER= philip@FreeBSD.org COMMENT= A fantasy turn-based strategy game -LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs \ - freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs -CONFLICTS= wesnoth-1.5* wesnoth-1.7* +CONFLICTS= wesnoth-devel-1.* USE_SDL= image mixer net ttf -USE_GNOME= gnometarget pango +USE_GNOME= desktopfileutils gnometarget pango USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_GNOME= yes @@ -31,17 +29,16 @@ USE_AUTOTOOLS= aclocal:110 autoheader:26 ACLOCAL_ARGS= -Im4 AUTOMAKE_ARGS= --add-missing --copy CONFIGURE_ARGS= --localstatedir=/var \ + --with-icondir=${PREFIX}/share/pixmaps \ --with-libiconv-prefix=${LOCALBASE} \ --with-libintl-prefix=${LOCALBASE} \ --with-localedir=${PREFIX}/share/locale +MANLANG_GAME= gl sk MANLANG= "" cs de en_GB es fi fr hu it lt pl sr sr@latin sv tr \ zh_CN zh_TW MAN6= wesnoth.6 -MAN6_GL= wesnoth.6 -MAN6_RU= wesnoth.6 -MAN6_SK= wesnoth.6 OPTIONS= CAMPAIGN "Enable campaign server" On \ EDITOR "Enable map editor" On \ @@ -52,6 +49,17 @@ OPTIONS= CAMPAIGN "Enable campaign serve .include +# workaround: compress and add to plist disobedient man pages +.for manlang in ${MANLANG_GAME} +MAN6_${manlang:U}= wesnoth.6 + +.if defined(NOMANCOMPRESS) +PLIST_FILES+= man/${manlang}/man6/wesnoth.6 +.else +PLIST_FILES+= man/${manlang}/man6/wesnoth.6.gz +.endif +.endfor + .if defined(WITH_DEBUG) CONFIGURE_ARGS+= --enable-debug .endif @@ -103,8 +111,13 @@ PLIST_SUB+= TOOLS="" BROKEN= you need NLS support for `campaignd' or `wesnothd' or tools to link against gettext .endif -post-configure: - @${REINPLACE_CMD} -e 's|[$$][{]datarootdir[}]/icons|${LOCALBASE}/share/pixmaps|' \ - ${WRKSRC}/icons/Makefile +post-install: .SILENT + -update-desktop-database + +.if !defined(NOMANCOMPRESS) +. for manlang in ${MANLANG_GAME} + ${GZIP_CMD} ${PREFIX}/man/${manlang}/man6/wesnoth.6 +. endfor +.endif .include Index: games/wesnoth/pkg-plist =================================================================== RCS file: /home/csup/ports/games/wesnoth/pkg-plist,v retrieving revision 1.55 diff -u -p -r1.55 pkg-plist --- games/wesnoth/pkg-plist 14 Aug 2009 19:56:16 -0000 1.55 +++ games/wesnoth/pkg-plist 4 Sep 2009 00:09:15 -0000 @@ -10,7 +10,7 @@ bin/wesnoth share/applications/wesnoth.desktop %%EDITOR%%share/applications/wesnoth_editor.desktop share/pixmaps/wesnoth-icon.png -share/pixmaps/wesnoth_editor-icon.png +%%EDITOR%%share/pixmaps/wesnoth_editor-icon.png %%DOCSDIR%%/manual/CMakeLists.txt %%DOCSDIR%%/manual/images/de/game-screen-1.5.7.jpg %%DOCSDIR%%/manual/images/de/main-menu-1.5.11.jpg @@ -9763,3 +9763,5 @@ share/pixmaps/wesnoth_editor-icon.png %%NLS%%@dirrmtry share/locale/tl/LC_MESSAGES %%NLS%%@dirrmtry share/locale/tl %%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 +@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true +@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true --- wesnoth.diff ends here --- --- wesnoth-devel.diff begins here --- Index: games/wesnoth-devel/Makefile =================================================================== RCS file: /home/csup/ports/games/wesnoth-devel/Makefile,v retrieving revision 1.73 diff -u -p -r1.73 Makefile --- games/wesnoth-devel/Makefile 2 Sep 2009 07:54:38 -0000 1.73 +++ games/wesnoth-devel/Makefile 4 Sep 2009 00:52:59 -0000 @@ -17,10 +17,10 @@ COMMENT= A fantasy turn-based strategy g LIB_DEPENDS= boost_thread.4:${PORTSDIR}/devel/boost-libs -CONFLICTS= wesnoth-1.[4-6]* +CONFLICTS= wesnoth-1.* USE_SDL= image mixer net ttf -USE_GNOME= gnometarget pango desktopfileutils +USE_GNOME= desktopfileutils gnometarget pango USE_GMAKE= yes MAKE_JOBS_SAFE= yes WANT_GNOME= yes --- wesnoth-devel.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: