From nobody@FreeBSD.org  Sat Dec  2 20:54:36 2006
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id C916B16A407
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Dec 2006 20:54:36 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [69.147.83.33])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 4B90B43C9D
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  2 Dec 2006 20:54:14 +0000 (GMT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.13.1/8.13.1) with ESMTP id kB2Ksa0k058038
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 2 Dec 2006 20:54:36 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.13.1/8.13.1/Submit) id kB2KsahU058037;
	Sat, 2 Dec 2006 20:54:36 GMT
	(envelope-from nobody)
Message-Id: <200612022054.kB2KsahU058037@www.freebsd.org>
Date: Sat, 2 Dec 2006 20:54:36 GMT
From: Bartosz Fabianowski<freebsd@chillt.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [PATCH] Add SDL sound support to games/freeciv*
X-Send-Pr-Version: www-3.0

>Number:         106232
>Category:       ports
>Synopsis:       [PATCH] Add SDL sound support to games/freeciv*
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    infofarmer
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Dec 02 21:00:18 GMT 2006
>Closed-Date:    Sat Jul 28 16:02:32 GMT 2007
>Last-Modified:  Sat Jul 28 16:10:03 GMT 2007
>Originator:     Bartosz Fabianowski
>Release:        6.2-PRERELEASE
>Organization:
>Environment:
FreeBSD takahe.local 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #0: Mon Nov 27 19:22:17 GMT 2006     root@takahe.local:/usr/obj/usr/src/sys/TAKAHE  i386
>Description:
Although freeciv is able to play sounds, the FreeBSD port does not enable this functionality. The following patch adds optional sound support and also installs the default sound theme (the only one available on the freeciv site).

Caveats:

* Freeciv supports both SDL and esound. Since I do not have esound installed and have no interest in it, this patch adds SDL support only. However, esound should be trivial to add as the sound theme installation code should work for it as well.

* This patch has only seen limited testing on a single 6.2-PRERELEASE i386 machine. Unfortunately, I do not have access to any other releases or architectures for testing purposes.

* There appears to be no information on the freeciv site regarding the licensing of the default sound theme. Before integrating this patch, the maintainer may want to contact the freeciv developers and clarify the licensing terms.
>How-To-Repeat:

>Fix:
diff -ruN freeciv.orig/Makefile freeciv/Makefile
--- freeciv.orig/Makefile	Tue Sep 26 08:40:33 2006
+++ freeciv/Makefile	Sat Dec  2 20:30:46 2006
@@ -7,16 +7,17 @@
 
 PORTNAME=	freeciv
 PORTVERSION=	2.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	games
-MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ SF
+MASTER_SITES=	ftp://ftp.freeciv.org/pub/freeciv/stable/ SF \
+		ftp://ftp.freeciv.org/freeciv/contrib/sounds/sets/:freeciv_sounds
+DISTFILES+=	${DISTNAME}.tar.bz2 stdsounds3.tar.gz:freeciv_sounds
 
 MAINTAINER=	infofarmer@FreeBSD.org
 COMMENT=	Free turn-based multiplayer strategy
 
 USE_GCC=	3.4+
 USE_GETTEXT=	yes
-USE_BZIP2=	yes
 USE_PYTHON=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -29,12 +30,20 @@
 		png.5:${PORTSDIR}/graphics/png
 USE_XPM=	yes
 WANT_GNOME=	yes
-CONFIGURE_ENV+=	SDL_CONFIG="${SDL_CONFIG}"
+WANT_SDL=	mixer
 PLIST_SUB+=	X11=""
 .endif
 
 .include <bsd.port.pre.mk>
 
+.if !defined(WITHOUT_X11) && (defined(WITH_SDL) || ${HAVE_SDL:Mmixer}!="")
+USE_SDL=	mixer
+SOUND=		yes
+PLIST_SUB+=	SOUND=""
+.else
+PLIST_SUB+=	SOUND="@comment "
+.endif
+
 .if 	!defined(WITH_GTK) && !defined(WITH_GTK12) && !defined(WITH_GTK2) && \
 	!defined(WITHOUT_GNOME) && !defined(WITHOUT_X11)
 AUTO_DEPENDS=	yes
@@ -84,9 +93,17 @@
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -Ee '${CFG_PATCH}' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -Ee '${CFG_PATCH}' -e 's/-lSDL_mixer  /${PTHREAD_LIBS} -lSDL_mixer /g' ${WRKSRC}/configure
 	@${FIND} ${WRKSRC} -name Makefile.in | \
 		${XARGS} ${REINPLACE_CMD} -e 's/@program_transform_name@//'
+
+post-install:
+.ifdef SOUND
+	${INSTALL_DATA} ${WRKDIR}/data/stdsounds.soundspec ${DATADIR}
+	${MKDIR} ${DATADIR}/stdsounds
+	@cd ${WRKDIR}/data/stdsounds && \
+		${FIND} * -type f -exec ${INSTALL_DATA} "{}" "${DATADIR}/stdsounds/{}" \;
+.endif
 
 .if ${OSVERSION} < 500000
 BROKEN=	Does not build on 4.x
diff -ruN freeciv.orig/distinfo freeciv/distinfo
--- freeciv.orig/distinfo	Sat Apr 29 22:40:45 2006
+++ freeciv/distinfo	Sat Dec  2 20:30:46 2006
@@ -1,3 +1,6 @@
 MD5 (freeciv-2.0.8.tar.bz2) = 9ebd5899c2c78362e0e2c68791673a88
 SHA256 (freeciv-2.0.8.tar.bz2) = 85b396c86f977b85f03fa1309733d21f7cc953e005ff1475f9981b77fa9f28f3
 SIZE (freeciv-2.0.8.tar.bz2) = 8535513
+MD5 (stdsounds3.tar.gz) = 77215914712f2f351092918f5e41e39e
+SHA256 (stdsounds3.tar.gz) = a3cc2be93c006c3a9492349aa4552bf059e45efc94135f09241877c221ae1bfa
+SIZE (stdsounds3.tar.gz) = 118278
diff -ruN freeciv.orig/pkg-plist freeciv/pkg-plist
--- freeciv.orig/pkg-plist	Mon Sep  4 09:45:28 2006
+++ freeciv/pkg-plist	Sat Dec  2 20:30:46 2006
@@ -297,6 +297,23 @@
 %%X11%%%%DATADIR%%/isophex/terrain2.spec
 %%X11%%%%DATADIR%%/isophex/tiles.png
 %%X11%%%%DATADIR%%/isophex/tiles.spec
+%%SOUND%%%%DATADIR%%/stdsounds.soundspec
+%%SOUND%%%%DATADIR%%/stdsounds/LrgCan.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/LrgExpl.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/MedCan.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/MgBar1.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/MgBar2.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/MgHeavy.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/Mortar.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/SmlExpl.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/Splash.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/THover.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/Tread.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/foot3.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/inh2o.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/metbrk.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/wall01.ogg
+%%SOUND%%%%DATADIR%%/stdsounds/woodbrk.ogg
 share/locale/da/LC_MESSAGES/freeciv.mo
 share/locale/ca/LC_MESSAGES/freeciv.mo
 share/locale/cs/LC_MESSAGES/freeciv.mo
@@ -341,6 +358,7 @@
 @dirrmtry share/locale/sk
 @dirrmtry share/locale/uk/LC_MESSAGES
 @dirrmtry share/locale/uk
+%%SOUND%%@dirrm %%DATADIR%%/stdsounds
 %%X11%%@dirrm %%DATADIR%%/trident
 @dirrm %%DATADIR%%/scenario
 @dirrm %%DATADIR%%/nation

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->infofarmer 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Sat Dec 2 21:00:37 UTC 2006 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106232 

From: Bartosz Fabianowski <freebsd@chillt.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/106232: [PATCH] Add SDL sound support to games/freeciv*
Date: Sun, 27 May 2007 03:44:25 +0100

 This is a multi-part message in MIME format.
 --------------000302050307010404000302
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Attached is an updated patch against the current version of the port.
 
 This pr has been in limbo for half a year now and I would appreciate a
 quick feedback whether this patch is unwanted (so I can stop maintaining
 it out of tree) or if it's simply been forgotten.
 
 --------------000302050307010404000302
 Content-Type: text/plain;
  name="patch-2.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: inline;
  filename="patch-2.diff"
 
 ZGlmZiAtcnVOIGZyZWVjaXYub3JpZy9NYWtlZmlsZSBmcmVlY2l2L01ha2VmaWxlCi0tLSBm
 cmVlY2l2Lm9yaWcvTWFrZWZpbGUJU2F0IE1heSAxOSAyMTowNTo1OSAyMDA3CisrKyBmcmVl
 Y2l2L01ha2VmaWxlCVN1biBNYXkgMjcgMDM6Mzk6MTUgMjAwNwpAQCAtNywxNiArNywxNyBA
 QAogCiBQT1JUTkFNRT0JZnJlZWNpdgogUE9SVFZFUlNJT049CTIuMC44Ci1QT1JUUkVWSVNJ
 T049CTMKK1BPUlRSRVZJU0lPTj0JNAogQ0FURUdPUklFUz0JZ2FtZXMKLU1BU1RFUl9TSVRF
 Uz0JZnRwOi8vZnRwLmZyZWVjaXYub3JnL3B1Yi9mcmVlY2l2L3N0YWJsZS8gU0YKK01BU1RF
 Ul9TSVRFUz0JZnRwOi8vZnRwLmZyZWVjaXYub3JnL3B1Yi9mcmVlY2l2L3N0YWJsZS8gU0Yg
 XAorCQlmdHA6Ly9mdHAuZnJlZWNpdi5vcmcvZnJlZWNpdi9jb250cmliL2F1ZGlvL3NvdW5k
 c2V0cy86ZnJlZWNpdl9zb3VuZHMKK0RJU1RGSUxFUys9CSR7RElTVE5BTUV9LnRhci5iejIg
 c3Rkc291bmRzMy50YXIuZ3o6ZnJlZWNpdl9zb3VuZHMKIAogTUFJTlRBSU5FUj0JaW5mb2Zh
 cm1lckBGcmVlQlNELm9yZwogQ09NTUVOVD0JRnJlZSB0dXJuLWJhc2VkIG11bHRpcGxheWVy
 IHN0cmF0ZWd5CiAKIFVTRV9HQ0M9CTMuNCsKIFVTRV9HRVRURVhUPQl5ZXMKLVVTRV9CWklQ
 Mj0JeWVzCiBVU0VfUFlUSE9OPQl5ZXMKIEdOVV9DT05GSUdVUkU9CXllcwogQ09ORklHVVJF
 X0VOVj0JQ1BQRkxBR1M9Ii1JJHtMT0NBTEJBU0V9L2luY2x1ZGUiIFwKQEAgLTI5LDEyICsz
 MCwyMCBAQAogCQlwbmcuNToke1BPUlRTRElSfS9ncmFwaGljcy9wbmcKIFVTRV9YUE09CXll
 cwogV0FOVF9HTk9NRT0JeWVzCi1DT05GSUdVUkVfRU5WKz0JU0RMX0NPTkZJRz0iJHtTRExf
 Q09ORklHfSIKK1dBTlRfU0RMPQltaXhlcgogUExJU1RfU1VCKz0JWDExPSIiCiAuZW5kaWYK
 IAogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4KIAorLmlmICFkZWZpbmVkKFdJVEhPVVRf
 WDExKSAmJiAoZGVmaW5lZChXSVRIX1NETCkgfHwgJHtIQVZFX1NETDpNbWl4ZXJ9IT0iIikK
 K1VTRV9TREw9CW1peGVyCitTT1VORD0JCXllcworUExJU1RfU1VCKz0JU09VTkQ9IiIKKy5l
 bHNlCitQTElTVF9TVUIrPQlTT1VORD0iQGNvbW1lbnQgIgorLmVuZGlmCisKIC5pZiAJIWRl
 ZmluZWQoV0lUSF9HVEspICYmICFkZWZpbmVkKFdJVEhfR1RLMTIpICYmICFkZWZpbmVkKFdJ
 VEhfR1RLMikgJiYgXAogCSFkZWZpbmVkKFdJVEhPVVRfR05PTUUpICYmICFkZWZpbmVkKFdJ
 VEhPVVRfWDExKQogQVVUT19ERVBFTkRTPQl5ZXMKQEAgLTg0LDggKzkzLDE2IEBACiAuZW5k
 aWYKIAogcG9zdC1wYXRjaDoKLQlAJHtSRUlOUExBQ0VfQ01EfSAtRWUgJyR7Q0ZHX1BBVENI
 fScgJHtXUktTUkN9L2NvbmZpZ3VyZQorCUAke1JFSU5QTEFDRV9DTUR9IC1FZSAnJHtDRkdf
 UEFUQ0h9JyAtZSAncy8tbFNETF9taXhlciAgLyR7UFRIUkVBRF9MSUJTfSAtbFNETF9taXhl
 ciAvZycgJHtXUktTUkN9L2NvbmZpZ3VyZQogCUAke0ZJTkR9ICR7V1JLU1JDfSAtbmFtZSBN
 YWtlZmlsZS5pbiB8IFwKIAkJJHtYQVJHU30gJHtSRUlOUExBQ0VfQ01EfSAtZSAncy9AcHJv
 Z3JhbV90cmFuc2Zvcm1fbmFtZUAvLycKKworcG9zdC1pbnN0YWxsOgorLmlmZGVmIFNPVU5E
 CisJJHtJTlNUQUxMX0RBVEF9ICR7V1JLRElSfS9kYXRhL3N0ZHNvdW5kcy5zb3VuZHNwZWMg
 JHtEQVRBRElSfQorCSR7TUtESVJ9ICR7REFUQURJUn0vc3Rkc291bmRzCisJQGNkICR7V1JL
 RElSfS9kYXRhL3N0ZHNvdW5kcyAmJiBcCisJCSR7RklORH0gKiAtdHlwZSBmIC1leGVjICR7
 SU5TVEFMTF9EQVRBfSAie30iICIke0RBVEFESVJ9L3N0ZHNvdW5kcy97fSIgXDsKKy5lbmRp
 ZgogCiAuaW5jbHVkZSA8YnNkLnBvcnQucG9zdC5taz4KZGlmZiAtcnVOIGZyZWVjaXYub3Jp
 Zy9kaXN0aW5mbyBmcmVlY2l2L2Rpc3RpbmZvCi0tLSBmcmVlY2l2Lm9yaWcvZGlzdGluZm8J
 U2F0IEFwciAyOSAyMjo0MDo0NSAyMDA2CisrKyBmcmVlY2l2L2Rpc3RpbmZvCVN1biBNYXkg
 MjcgMDM6MzY6MDYgMjAwNwpAQCAtMSwzICsxLDYgQEAKIE1ENSAoZnJlZWNpdi0yLjAuOC50
 YXIuYnoyKSA9IDllYmQ1ODk5YzJjNzgzNjJlMGUyYzY4NzkxNjczYTg4CiBTSEEyNTYgKGZy
 ZWVjaXYtMi4wLjgudGFyLmJ6MikgPSA4NWIzOTZjODZmOTc3Yjg1ZjAzZmExMzA5NzMzZDIx
 ZjdjYzk1M2UwMDVmZjE0NzVmOTk4MWI3N2ZhOWYyOGYzCiBTSVpFIChmcmVlY2l2LTIuMC44
 LnRhci5iejIpID0gODUzNTUxMworTUQ1IChzdGRzb3VuZHMzLnRhci5neikgPSA3NzIxNTkx
 NDcxMmYyZjM1MTA5MjkxOGY1ZTQxZTM5ZQorU0hBMjU2IChzdGRzb3VuZHMzLnRhci5neikg
 PSBhM2NjMmJlOTNjMDA2YzNhOTQ5MjM0OWFhNDU1MmJmMDU5ZTQ1ZWZjOTQxMzVmMDkyNDE4
 NzdjMjIxYWUxYmZhCitTSVpFIChzdGRzb3VuZHMzLnRhci5neikgPSAxMTgyNzgKZGlmZiAt
 cnVOIGZyZWVjaXYub3JpZy9wa2ctcGxpc3QgZnJlZWNpdi9wa2ctcGxpc3QKLS0tIGZyZWVj
 aXYub3JpZy9wa2ctcGxpc3QJU2F0IE1heSAxOSAyMTowNjowMCAyMDA3CisrKyBmcmVlY2l2
 L3BrZy1wbGlzdAlTdW4gTWF5IDI3IDAzOjM2OjA2IDIwMDcKQEAgLTI5Nyw2ICsyOTcsMjMg
 QEAKICUlWDExJSUlJURBVEFESVIlJS9pc29waGV4L3RlcnJhaW4yLnNwZWMKICUlWDExJSUl
 JURBVEFESVIlJS9pc29waGV4L3RpbGVzLnBuZwogJSVYMTElJSUlREFUQURJUiUlL2lzb3Bo
 ZXgvdGlsZXMuc3BlYworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzLnNvdW5kc3Bl
 YworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL0xyZ0Nhbi5vZ2cKKyUlU09VTkQl
 JSUlREFUQURJUiUlL3N0ZHNvdW5kcy9McmdFeHBsLm9nZworJSVTT1VORCUlJSVEQVRBRElS
 JSUvc3Rkc291bmRzL01lZENhbi5vZ2cKKyUlU09VTkQlJSUlREFUQURJUiUlL3N0ZHNvdW5k
 cy9NZ0JhcjEub2dnCislJVNPVU5EJSUlJURBVEFESVIlJS9zdGRzb3VuZHMvTWdCYXIyLm9n
 ZworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL01nSGVhdnkub2dnCislJVNPVU5E
 JSUlJURBVEFESVIlJS9zdGRzb3VuZHMvTW9ydGFyLm9nZworJSVTT1VORCUlJSVEQVRBRElS
 JSUvc3Rkc291bmRzL1NtbEV4cGwub2dnCislJVNPVU5EJSUlJURBVEFESVIlJS9zdGRzb3Vu
 ZHMvU3BsYXNoLm9nZworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL1RIb3Zlci5v
 Z2cKKyUlU09VTkQlJSUlREFUQURJUiUlL3N0ZHNvdW5kcy9UcmVhZC5vZ2cKKyUlU09VTkQl
 JSUlREFUQURJUiUlL3N0ZHNvdW5kcy9mb290My5vZ2cKKyUlU09VTkQlJSUlREFUQURJUiUl
 L3N0ZHNvdW5kcy9pbmgyby5vZ2cKKyUlU09VTkQlJSUlREFUQURJUiUlL3N0ZHNvdW5kcy9t
 ZXRicmsub2dnCislJVNPVU5EJSUlJURBVEFESVIlJS9zdGRzb3VuZHMvd2FsbDAxLm9nZwor
 JSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL3dvb2Ricmsub2dnCiBzaGFyZS9sb2Nh
 bGUvZGEvTENfTUVTU0FHRVMvZnJlZWNpdi5tbwogc2hhcmUvbG9jYWxlL2NhL0xDX01FU1NB
 R0VTL2ZyZWVjaXYubW8KIHNoYXJlL2xvY2FsZS9jcy9MQ19NRVNTQUdFUy9mcmVlY2l2Lm1v
 CkBAIC0zMjMsNiArMzQwLDcgQEAKICUlWDExJSVzaGFyZS9hcHBsaWNhdGlvbnMvZnJlZWNp
 di5kZXNrdG9wCiBAZGlycm10cnkgc2hhcmUvbG9jYWxlL2hlX0lML0xDX01FU1NBR0VTCiBA
 ZGlycm10cnkgc2hhcmUvbG9jYWxlL2hlX0lMCislJVNPVU5EJSVAZGlycm0gJSVEQVRBRElS
 JSUvc3Rkc291bmRzCiAlJVgxMSUlQGRpcnJtICUlREFUQURJUiUlL3RyaWRlbnQKIEBkaXJy
 bSAlJURBVEFESVIlJS9zY2VuYXJpbwogQGRpcnJtICUlREFUQURJUiUlL25hdGlvbgo=
 --------------000302050307010404000302--

From: Bartosz Fabianowski <freebsd@chillt.de>
To: FreeBSD-gnats-submit@FreeBSD.org,  freebsd-ports-bugs@FreeBSD.org, 
 infofarmer@FreeBSD.org
Cc:  
Subject: Re: ports/106232: [PATCH] Add SDL sound support to games/freeciv*
Date: Sun, 27 May 2007 03:41:42 +0100

 This is a multi-part message in MIME format.
 --------------010704090908010701010106
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Attached is an updated patch against the current version of the port.
 
 This pr has been in limbo for half a year now and I would appreciate a 
 quick feedback whether this patch is unwanted (so I can stop maintaining 
 it out of tree) or if it's simply been forgotten.
 
 --------------010704090908010701010106
 Content-Type: text/plain;
  name="patch-2.diff"
 Content-Transfer-Encoding: base64
 Content-Disposition: inline;
  filename="patch-2.diff"
 
 ZGlmZiAtcnVOIGZyZWVjaXYub3JpZy9NYWtlZmlsZSBmcmVlY2l2L01ha2VmaWxlCi0tLSBm
 cmVlY2l2Lm9yaWcvTWFrZWZpbGUJU2F0IE1heSAxOSAyMTowNTo1OSAyMDA3CisrKyBmcmVl
 Y2l2L01ha2VmaWxlCVN1biBNYXkgMjcgMDM6Mzk6MTUgMjAwNwpAQCAtNywxNiArNywxNyBA
 QAogCiBQT1JUTkFNRT0JZnJlZWNpdgogUE9SVFZFUlNJT049CTIuMC44Ci1QT1JUUkVWSVNJ
 T049CTMKK1BPUlRSRVZJU0lPTj0JNAogQ0FURUdPUklFUz0JZ2FtZXMKLU1BU1RFUl9TSVRF
 Uz0JZnRwOi8vZnRwLmZyZWVjaXYub3JnL3B1Yi9mcmVlY2l2L3N0YWJsZS8gU0YKK01BU1RF
 Ul9TSVRFUz0JZnRwOi8vZnRwLmZyZWVjaXYub3JnL3B1Yi9mcmVlY2l2L3N0YWJsZS8gU0Yg
 XAorCQlmdHA6Ly9mdHAuZnJlZWNpdi5vcmcvZnJlZWNpdi9jb250cmliL2F1ZGlvL3NvdW5k
 c2V0cy86ZnJlZWNpdl9zb3VuZHMKK0RJU1RGSUxFUys9CSR7RElTVE5BTUV9LnRhci5iejIg
 c3Rkc291bmRzMy50YXIuZ3o6ZnJlZWNpdl9zb3VuZHMKIAogTUFJTlRBSU5FUj0JaW5mb2Zh
 cm1lckBGcmVlQlNELm9yZwogQ09NTUVOVD0JRnJlZSB0dXJuLWJhc2VkIG11bHRpcGxheWVy
 IHN0cmF0ZWd5CiAKIFVTRV9HQ0M9CTMuNCsKIFVTRV9HRVRURVhUPQl5ZXMKLVVTRV9CWklQ
 Mj0JeWVzCiBVU0VfUFlUSE9OPQl5ZXMKIEdOVV9DT05GSUdVUkU9CXllcwogQ09ORklHVVJF
 X0VOVj0JQ1BQRkxBR1M9Ii1JJHtMT0NBTEJBU0V9L2luY2x1ZGUiIFwKQEAgLTI5LDEyICsz
 MCwyMCBAQAogCQlwbmcuNToke1BPUlRTRElSfS9ncmFwaGljcy9wbmcKIFVTRV9YUE09CXll
 cwogV0FOVF9HTk9NRT0JeWVzCi1DT05GSUdVUkVfRU5WKz0JU0RMX0NPTkZJRz0iJHtTRExf
 Q09ORklHfSIKK1dBTlRfU0RMPQltaXhlcgogUExJU1RfU1VCKz0JWDExPSIiCiAuZW5kaWYK
 IAogLmluY2x1ZGUgPGJzZC5wb3J0LnByZS5taz4KIAorLmlmICFkZWZpbmVkKFdJVEhPVVRf
 WDExKSAmJiAoZGVmaW5lZChXSVRIX1NETCkgfHwgJHtIQVZFX1NETDpNbWl4ZXJ9IT0iIikK
 K1VTRV9TREw9CW1peGVyCitTT1VORD0JCXllcworUExJU1RfU1VCKz0JU09VTkQ9IiIKKy5l
 bHNlCitQTElTVF9TVUIrPQlTT1VORD0iQGNvbW1lbnQgIgorLmVuZGlmCisKIC5pZiAJIWRl
 ZmluZWQoV0lUSF9HVEspICYmICFkZWZpbmVkKFdJVEhfR1RLMTIpICYmICFkZWZpbmVkKFdJ
 VEhfR1RLMikgJiYgXAogCSFkZWZpbmVkKFdJVEhPVVRfR05PTUUpICYmICFkZWZpbmVkKFdJ
 VEhPVVRfWDExKQogQVVUT19ERVBFTkRTPQl5ZXMKQEAgLTg0LDggKzkzLDE2IEBACiAuZW5k
 aWYKIAogcG9zdC1wYXRjaDoKLQlAJHtSRUlOUExBQ0VfQ01EfSAtRWUgJyR7Q0ZHX1BBVENI
 fScgJHtXUktTUkN9L2NvbmZpZ3VyZQorCUAke1JFSU5QTEFDRV9DTUR9IC1FZSAnJHtDRkdf
 UEFUQ0h9JyAtZSAncy8tbFNETF9taXhlciAgLyR7UFRIUkVBRF9MSUJTfSAtbFNETF9taXhl
 ciAvZycgJHtXUktTUkN9L2NvbmZpZ3VyZQogCUAke0ZJTkR9ICR7V1JLU1JDfSAtbmFtZSBN
 YWtlZmlsZS5pbiB8IFwKIAkJJHtYQVJHU30gJHtSRUlOUExBQ0VfQ01EfSAtZSAncy9AcHJv
 Z3JhbV90cmFuc2Zvcm1fbmFtZUAvLycKKworcG9zdC1pbnN0YWxsOgorLmlmZGVmIFNPVU5E
 CisJJHtJTlNUQUxMX0RBVEF9ICR7V1JLRElSfS9kYXRhL3N0ZHNvdW5kcy5zb3VuZHNwZWMg
 JHtEQVRBRElSfQorCSR7TUtESVJ9ICR7REFUQURJUn0vc3Rkc291bmRzCisJQGNkICR7V1JL
 RElSfS9kYXRhL3N0ZHNvdW5kcyAmJiBcCisJCSR7RklORH0gKiAtdHlwZSBmIC1leGVjICR7
 SU5TVEFMTF9EQVRBfSAie30iICIke0RBVEFESVJ9L3N0ZHNvdW5kcy97fSIgXDsKKy5lbmRp
 ZgogCiAuaW5jbHVkZSA8YnNkLnBvcnQucG9zdC5taz4KZGlmZiAtcnVOIGZyZWVjaXYub3Jp
 Zy9kaXN0aW5mbyBmcmVlY2l2L2Rpc3RpbmZvCi0tLSBmcmVlY2l2Lm9yaWcvZGlzdGluZm8J
 U2F0IEFwciAyOSAyMjo0MDo0NSAyMDA2CisrKyBmcmVlY2l2L2Rpc3RpbmZvCVN1biBNYXkg
 MjcgMDM6MzY6MDYgMjAwNwpAQCAtMSwzICsxLDYgQEAKIE1ENSAoZnJlZWNpdi0yLjAuOC50
 YXIuYnoyKSA9IDllYmQ1ODk5YzJjNzgzNjJlMGUyYzY4NzkxNjczYTg4CiBTSEEyNTYgKGZy
 ZWVjaXYtMi4wLjgudGFyLmJ6MikgPSA4NWIzOTZjODZmOTc3Yjg1ZjAzZmExMzA5NzMzZDIx
 ZjdjYzk1M2UwMDVmZjE0NzVmOTk4MWI3N2ZhOWYyOGYzCiBTSVpFIChmcmVlY2l2LTIuMC44
 LnRhci5iejIpID0gODUzNTUxMworTUQ1IChzdGRzb3VuZHMzLnRhci5neikgPSA3NzIxNTkx
 NDcxMmYyZjM1MTA5MjkxOGY1ZTQxZTM5ZQorU0hBMjU2IChzdGRzb3VuZHMzLnRhci5neikg
 PSBhM2NjMmJlOTNjMDA2YzNhOTQ5MjM0OWFhNDU1MmJmMDU5ZTQ1ZWZjOTQxMzVmMDkyNDE4
 NzdjMjIxYWUxYmZhCitTSVpFIChzdGRzb3VuZHMzLnRhci5neikgPSAxMTgyNzgKZGlmZiAt
 cnVOIGZyZWVjaXYub3JpZy9wa2ctcGxpc3QgZnJlZWNpdi9wa2ctcGxpc3QKLS0tIGZyZWVj
 aXYub3JpZy9wa2ctcGxpc3QJU2F0IE1heSAxOSAyMTowNjowMCAyMDA3CisrKyBmcmVlY2l2
 L3BrZy1wbGlzdAlTdW4gTWF5IDI3IDAzOjM2OjA2IDIwMDcKQEAgLTI5Nyw2ICsyOTcsMjMg
 QEAKICUlWDExJSUlJURBVEFESVIlJS9pc29waGV4L3RlcnJhaW4yLnNwZWMKICUlWDExJSUl
 JURBVEFESVIlJS9pc29waGV4L3RpbGVzLnBuZwogJSVYMTElJSUlREFUQURJUiUlL2lzb3Bo
 ZXgvdGlsZXMuc3BlYworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzLnNvdW5kc3Bl
 YworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL0xyZ0Nhbi5vZ2cKKyUlU09VTkQl
 JSUlREFUQURJUiUlL3N0ZHNvdW5kcy9McmdFeHBsLm9nZworJSVTT1VORCUlJSVEQVRBRElS
 JSUvc3Rkc291bmRzL01lZENhbi5vZ2cKKyUlU09VTkQlJSUlREFUQURJUiUlL3N0ZHNvdW5k
 cy9NZ0JhcjEub2dnCislJVNPVU5EJSUlJURBVEFESVIlJS9zdGRzb3VuZHMvTWdCYXIyLm9n
 ZworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL01nSGVhdnkub2dnCislJVNPVU5E
 JSUlJURBVEFESVIlJS9zdGRzb3VuZHMvTW9ydGFyLm9nZworJSVTT1VORCUlJSVEQVRBRElS
 JSUvc3Rkc291bmRzL1NtbEV4cGwub2dnCislJVNPVU5EJSUlJURBVEFESVIlJS9zdGRzb3Vu
 ZHMvU3BsYXNoLm9nZworJSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL1RIb3Zlci5v
 Z2cKKyUlU09VTkQlJSUlREFUQURJUiUlL3N0ZHNvdW5kcy9UcmVhZC5vZ2cKKyUlU09VTkQl
 JSUlREFUQURJUiUlL3N0ZHNvdW5kcy9mb290My5vZ2cKKyUlU09VTkQlJSUlREFUQURJUiUl
 L3N0ZHNvdW5kcy9pbmgyby5vZ2cKKyUlU09VTkQlJSUlREFUQURJUiUlL3N0ZHNvdW5kcy9t
 ZXRicmsub2dnCislJVNPVU5EJSUlJURBVEFESVIlJS9zdGRzb3VuZHMvd2FsbDAxLm9nZwor
 JSVTT1VORCUlJSVEQVRBRElSJSUvc3Rkc291bmRzL3dvb2Ricmsub2dnCiBzaGFyZS9sb2Nh
 bGUvZGEvTENfTUVTU0FHRVMvZnJlZWNpdi5tbwogc2hhcmUvbG9jYWxlL2NhL0xDX01FU1NB
 R0VTL2ZyZWVjaXYubW8KIHNoYXJlL2xvY2FsZS9jcy9MQ19NRVNTQUdFUy9mcmVlY2l2Lm1v
 CkBAIC0zMjMsNiArMzQwLDcgQEAKICUlWDExJSVzaGFyZS9hcHBsaWNhdGlvbnMvZnJlZWNp
 di5kZXNrdG9wCiBAZGlycm10cnkgc2hhcmUvbG9jYWxlL2hlX0lML0xDX01FU1NBR0VTCiBA
 ZGlycm10cnkgc2hhcmUvbG9jYWxlL2hlX0lMCislJVNPVU5EJSVAZGlycm0gJSVEQVRBRElS
 JSUvc3Rkc291bmRzCiAlJVgxMSUlQGRpcnJtICUlREFUQURJUiUlL3RyaWRlbnQKIEBkaXJy
 bSAlJURBVEFESVIlJS9zY2VuYXJpbwogQGRpcnJtICUlREFUQURJUiUlL25hdGlvbgo=
 --------------010704090908010701010106--

From: "Andrew Pantyukhin" <infofarmer@FreeBSD.org>
To: "Bartosz Fabianowski" <freebsd@chillt.de>, bug-followup@freebsd.org
Cc:  
Subject: Re: ports/106232: [PATCH] Add SDL sound support to games/freeciv*
Date: Sun, 27 May 2007 11:14:36 +0400

 On 5/27/07, Bartosz Fabianowski <freebsd@chillt.de> wrote:
 >Attached is an updated patch against the current version of the port.
 >
 >This pr has been in limbo for half a year now and I would appreciate a
 >quick feedback whether this patch is unwanted (so I can stop maintaining
 >it out of tree) or if it's simply been forgotten.
 
 Your work is much appreciated. I think making it a separate
 freeciv-sounds port would be a bit cleaner, I can work it
 out.
 
 Could you please check for any licensing issues yourself?
 
 Sorry for the long wait.
 
 Thanks!

From: Bartosz Fabianowski <freebsd@chillt.de>
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/106232: [PATCH] Add SDL sound support to games/freeciv*
Date: Sun, 27 May 2007 15:45:19 +0100

 I just received the following reply from a Freeciv developer:
 
 > Hello!
 > 
 > Thank you for your interest. The licensing conditions of each file can
 > be found in the file "stdsounds.soundspec". Quote this file:
 > 
 > artists = "\
 > OpenQuartz - Ali Jackson (alister667@hotmail.com) [ali]\
 > OpenQuartz - Frank Condello (pox@planetquake.com) [pox]\
 > Warzone - Eidos Entertainment (GPL release) [warzone]"
 > 
 > These are all supposedly released as GPL. However, there is some
 > lingering uncertainty hanging by both sources. I heard there were some
 > sounds that were pulled from OpenQuartz because they originated in
 > Quake, but I have not had time to investigate whether this impacts us
 > in any way. It should be solvable by simply fetching the relevant
 > sounds from a newer OpenQuartz snapshot. The licensing situation for
 > the Warzone data remains unclear , and may remain so possibly forever.
 > 
 > Quote Warzone's COPYING.README:
 > 
 > "Concerning the license on the original data files: (basically
 > everything in data/)
 > 
 > The literal meaning of the release statement is ambiguous in the case
 > of the original data that is included in the released package. Despite
 > several attempts to get a clarification, we have received no response.
 > 
 > We have chosen to interpret the original release statement as putting
 > the original data under a GPL license. Since in the absence of a
 > license the released data could not be distributed, we find that
 > interpreting the license for the data as being under the same license
 > as the source to be the best interpretation to fit the intention
 > behind the release."
 > 
 >  - Per
 
 While the files are likely to be OK for redistribution, I would still 
 flag the package as RESTRICTED just to make sure.
State-Changed-From-To: open->closed 
State-Changed-By: sat 
State-Changed-When: Sat Jul 28 16:02:06 UTC 2007 
State-Changed-Why:  
Committed as games/freeciv-sounds. Thanks for your work and 
patience! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=106232 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/106232: commit references a PR
Date: Sat, 28 Jul 2007 16:00:41 +0000 (UTC)

 sat         2007-07-28 16:00:36 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    MOVED 
     games                Makefile 
     games/freeciv        Makefile distinfo pkg-plist 
   Added files:
     games/freeciv-sounds Makefile distinfo pkg-descr pkg-plist 
   Removed files:
     games/freeciv/files  patch-common__packets.c 
                          patch-server__unithand.c 
     games/freeciv-gtk    Makefile 
     games/freeciv-gtk2   Makefile 
   Log:
   - Update to 2.0.9
   - Drop support for xaw and gtk1
   - Remove -gtk and -gtk2 slave ports
   - Add freeciv-sounds - the standard sound set [1]
   
   PR:             ports/106232 (based on) [1]
   Submitted by:   Bartosz Fabianowski <freebsd@chillt.de> [1]
   
   Revision  Changes    Path
   1.1435    +3 -1      ports/MOVED
   1.1123    +1 -2      ports/games/Makefile
   1.10      +0 -11     ports/games/freeciv-gtk/Makefile (dead)
   1.59      +0 -11     ports/games/freeciv-gtk2/Makefile (dead)
   1.1       +24 -0     ports/games/freeciv-sounds/Makefile (new)
   1.1       +3 -0      ports/games/freeciv-sounds/distinfo (new)
   1.1       +3 -0      ports/games/freeciv-sounds/pkg-descr (new)
   1.1       +19 -0     ports/games/freeciv-sounds/pkg-plist (new)
   1.82      +21 -60    ports/games/freeciv/Makefile
   1.30      +3 -3      ports/games/freeciv/distinfo
   1.2       +0 -10     ports/games/freeciv/files/patch-common__packets.c (dead)
   1.2       +0 -12     ports/games/freeciv/files/patch-server__unithand.c (dead)
   1.29      +5 -2      ports/games/freeciv/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
