Update to 2.3.1

Changelog:

Version 2.3.1 - The "unobvious evil date" version.
----------
2011-11-11

	btkaos:
		* Show if a client shares its file list in client view

	freddy77:
		* Various optimizations of memory usage
		* Access files for reading/writing via mapped memory
		  (with custom exception handling)
		* Fix download of files > 1GB on ucLibc
		* Fix autogen.sh under Ubuntu
		* Fixed TCP obfuscation negotiation

	Gnucco:
		* Add option to ed2k link parser to display links in
		  emulecollection
		* Added test case for the CTag class

	GonoszTopi:
		* Various fixes to new colour code
		* Allow user to select display of transfer rates
		* Extendable list-control settings save/load code
		* Drop assumption that last search keyword is a filename
		  extension if length == 3
		* Instead of counting unicode characters in a Kad search now we
		  use the UTF-8 byte count to determine whether the keyword is
		  allowed or not
		* Use actual page size in mmap calls instead of a randomly
		  selected number
		* Fix custom Crypto++ path not shown by configure
		* Make <IMG> tags in aMuleWeb HTML 4.01 conforming
		* Fix HTTP proxy authentication
		* Use -static for the tests too, when a static binary is
		  requested to prevent configure succeed where compilation
		  would fail
		* Configure now checks only for the tools and libraries needed
		  for the selected components
		* Fix aMuleGUI looking for undefined switches
		* Fix the "blinking" in aMuleGUI's status line
		* Better reporting of Kad tag reading/parsing errors
		* Fix the unittests
		* Some code reorganization
		* Features/fixes ported from eMule:
			- Implement an alternate method to estimate the real
			  user count in the Kad network, which is not based on
			  our local routing table (0.49b)
			- Add double quote to word-boundary characters (0.50a)
			- Drop support for Kad 1.0 (0.50a)
			- Try to find the closest node alive (0.50a)
			- Fix a bug in Kad which would not enforce the search
			  tolerance in certain cases (0.50a)
			- Change Kad to work better in small LANs (0.50a)
		* Remove the unimplemented "Create backup for preview" option
		* Add variables to preview command like in user event commands
		* Disable 'Show all comments' in the file's context menu if
		  there are no comments/ratings available
		* Enable renaming (completed) shared files
		* Proper handling of %-escaped UTF-8 sequences in ed2k:// URIs
		* Drop support for nodes.dat version 0
		* Fix issue #1621: 'ed2k links containing unicode characters will
		  cause the filename to be truncated'
		* Fix issue #1634: Change charset to UTF-8 in amuleweb template
		* Fix installation with denoiser enabled
		* Add support for automake's --enable-silent-rules feature
		  (original idea by Gerd78)
		* Improved CFormat and enabled reordering of arguments for
		  translators
		* Several fixes and improvements for the sanity checker script
		* Fix bfd detection
		* Add year bumper script
		* Move statistics from config to statistics.dat
		* New preference setting to show application version on the title
		* Fix man page installation for several languages

	Greek:
		* Part number is now an extra column in the download list
		* Improvements to preferences dialogs
		* Redesign skin selection

	Grunt:
		* Sort downloads by time remaining now has shortest time on top and unknown on bottom

	jolz:
		* Fixed file locking between ed2k and aMule on Windows

	Kry:
		* Reworked user interface, separating download and upload views
		* Fix list double-buffering causing artifacts on refresh and when
		  showing a context menu.
		* Fix indexes after removing GUI items
		* Fixes to Windows build
		* Allow compilation with wxCocoa
		* Replace Color.h by new class implementation MuleColour
		* Lower class overhead and use two-level cache for pens/brushes
		* Added aMuleCMD project for MSVC.
		* Fixed UnitTests and aMuleCMD in MSVC to use _CONSOLE subsystem.
		* Preferences changes
		* Fixed problem with uploading to lowid clients (szsuj)
		* Sorting lists (automatically or by user interaction) doesn't clear selection anymore
		* Fix client version display for MLdonkeys
		* Added Xcode project for MacOSX build
		* Fixed the centering of icons and text
		* Enable vertical toolbar orientation on WIN32 too
		* Option to resume next file alphabetically, keeping in mind categories and priority
		* Fixed crash when column gets removed
		* Show remote filename in source list
		* Fixed crash in upload thread on shutdown
		* Dynamic adjustment of threshold for rarity of download files
		* Option to prevent the computer from sleeping while downloading in MSW and MacOSX >= 10.5
		* Mac fixes
		* Fixed "out of memory" crashes caused by wxWidgets - so wxWidgets 2.8.12 is required now!
		* Show warning dialog if "Change language" is selected and no languages are installed
		* Added backtrace support for MacOSX
		* Add locale support in the mac bundle with updated scripts
		  (translations are now supported on MacOSX builds)

	lfroen:
		* php prefix for lex/yacc

	LittleAbacus:
		* Search results can now be sorted by "knownness" state.

	marcell:
		* Fixed issue #892: Show data sizes >= 1.0 GB with three digits.
		* Fixed search 'Stop' button not stopping Kad searches.
		* Check Kademlia search results against original criteria.
		* Allow Kademlia searches with repetitive keywords.
		* Allow adding current chat partner to friend list from tab's context menu.
		* Allow not downloading files via HTTP if the requested file is not newer.
		* Removed white boxes around file rating icons
		* Implemented public shared directory names only containing actually shared subfolders.

	morph:
		* Patch to uniform and fix minor errors on man pages

	myth:
		* Feedback from shared files - add number of clients on queue.
		* New stats server

	Phoenix:
		* Fixed assertion when trying to preview files smaller than
		256 K.

	Skolnick:
		* Fixed autogen.sh for Bourne Shell

	Stu Redman:
		* Sort source list on opening and add file name to A4AF files
		* MSVC: optional GeoIP support
		* Faster progress bars with less overhead (without pens/brushes)
		* Show log messages in remote gui
		* More info in the Kad tab
		* Improved gaplist performance
		* Ported chat captchas (receive and send)
		  and "Advanced Chat Spam Filter" from eMule
		* Allow download of multiple search results if search list
		  is sorted by status (thanks to DarkNRG)
		* Fixed CFile::SetLength for large files
		* Reduce file handle usage by closing part files after idle time
		* Speed up selection of shared directories with many subdirectories,
		  fixed red marking of folders with shared subdirectories
		* Ban clients that uploaded bad data (based on CorruptionBlackBox from eMule)
		* Support wxWidgets 2.9
		* amuled for Windows (with wx 2.9)
		* Friends get recognized in the friend list control even if their IP has changed
		* Don't kick friend upload, don't kick release prio uploads (unless they take more
		  than half of the slots), and don't kick anybody else unless necessary (with GonoszTopi)
		* Fixed crash in remote gui when aMule exits
		* Added more media file types from eMule
		* Allow the user to cancel the app if Temp/Incoming is not found
		* Show downloads as shares in remote gui
		* MANY fixes/implementations for amulegui
		* amuleweb for Windows (with wx 2.9)
		* Show connected friends in blue in the friend list
		* Show total upload/download ratio in statistic tree
		* Fixed category administration in remote gui
		* Implement directory preferences in remote gui
		* MSVC build for alcc, wxCas
		* Fixed errors and crashes on parsing ED2K links with '/' in them
		* Configure option --enable-fileview
		* Bypass amulegui connection dialog with switch -s / --skip
		* Fixed Core Timer
		* Allow passing of ED2K links by command line to aMule, aMuled and aMulegui, making ed2k program obsolete
		* Don't ignore current category in amulegui when pasting a link
		* EC tools (amulegui, amulecmd, amuleweb) can use a local config dir now
		* Fixed crash in file system detection in Solaris
		* Fix: window size/position didn't get saved on some systems
		* More command line options for aMulegui
		* Allow webserver autostart on Windows
		* Fixed crash in "Out of space" user event handler
		* ALCC prints links to stdout now instead of stderr
		* Fixed memory exhaustion on high speed uploads
		  Thanks to RRM for endless patience!
		* Fix: Language English was not recognized and so reverted to "System default" at any change
		* Fixed printf output (unicode2char()) on consoles incapable of UTF8
		* Keep a list of all canceled files (canceled.met) and show them in magenta in the search list
		* Update status/color of search results on events from outside the search window
		  (like download started from EC) and in amulegui
		* Enable update of IP filter list through aMulegui and aMulecmd
		* Enable setting of "Check for new version on startup" through aMulegui
		* Fixed crash in CClientList::ProcessDirectCallbackList that had been around for ages (hopefully)
		* Fixed size of large files in aMuleweb's search results
		* Show completed downloads in aMulegui
		* Fixed international file names on Windows
		* Fixed hangup of EC connection in aMulegui
		* Fixed category deletion in aMuled
		* Fixed several crash bugs in Webserver
		* Improved memory usage, load time and speed of IP filter
		* Load IP filter in the background on startup
		* Show when a Kad search is finished in aMulegui (remove '!')
		* Fixed "pause/cancel/resume all" in aMulecmd
		* EC ZLIB compression can now be turned off in remote.conf with EC/ZLIB=0
		* Terminate HTTP downloads on exit
		* Projects for Visual Studio 2010
		* Fixed crash in http download
		* Speed boost for reload of shared files with large list of known files
		* Resolve MSVC compilation problem with separate strings in GUI
		* Fixed splitter bars in download and share view
		* Allowed creation of ED2K source links in KAD-only mode
		* Make friendlist in chat window resizable
		* Removed lag (caused by language pref) when opening preferences dialog
		* "Swap all A4AF to this (auto)" doesn't block sources with no needed parts any more
		* Don't lock up in an infinite loop if all servers are not resolvable or blocked by IP filter
		* Clients now always get uploaded a full chunk (removed setting)
		* Tell the user that changes of EC settings require a restart
		* Deleted and readded download now get shared
		* Speed improvement for upload queue, and clients never have same rank anymore
		* Fixed ed2k links where '|' has been replaced with '%7C'
		* Fixed multi line stdin redirected as batch into amulecmd
		* Allow enable/disable of IP2Country through GUI
		* "Clear completed" button now only clears downloads in current category
		* Completed downloads can be seen and cleared in amulegui
		* Bold lines in log window now for Windows too
		* Allow setting of friend slot from client list control
		* Fixed saving of splitter bar positions
		* Get rid of "clearlooks_style_draw_box_gap" messages in console
		* Fixed several crash bugs caused by deleted client objects
		* Fix a small memory leak in Kademlia code
		* Fix occasionally sending junk at end of packets
		* Fix child items in search result getting inserted in wrong positions
		* Shared files don't lose all information when they get renamed
		* Fixed crash bug with sources which are incompatible with our encryption setting
		* Allow passing of links > 256 chars to amulecmd
		* Prevent flicker when sorting already sorted lists
		* Prevent creation of more than 99 categories, since that's the limit
		* Fixed saving of sort orders
		* Allow switching through files in file detail dialog
		* Improve performance when many small files are hashed
		* Fix: if a file had more than two copies shared it was hashed on every startup
		* Show directory in search list for "view shared files" searches
		* Safe writing of known.met and nodes.dat (don't overwrite existing until write is finished)
		* Show directory in search list for "view shared files" searches

	Vollstrecker:
		* Unify copyright lines
		* Fixed clean and distclean targets for make
		* Various Updates in debian/ see debian/changelog
		* Added crash handling in command-line tools
		* Fix for autoconf-2.64.
		* Make amulecmd help command work without connection
		* New translation concept for manpages
		* KDE Plasma applet to show stats
		* Fix warnings with latest autoconf (2.67)

	woutermense:
		* Fix 'break/continue [n]' PHP implementation
		* Allow multiple download links in webserver

	Wuischke:
		* Simplify browser selection
		* Use DoIconize() for dclick on tray icon, too
		* Fix minimizing from tray icon
		* Add option to show chat messages in log
		* Add option to specify amuleweb binary location
		* Make EC authentication procedure more secure
		* Add support for categories to ed2k
		* Backup config file on shutdown

	Special Thanks To:
		* Greek for his contributions to aMule's user interface.
		* btkaos for his important work finding the source of bugs.
		* myth for seeing when everyone else was blind and uncovering
		  the grandfather of all fuck-ups
		* mirko.g for being so committed to compile aMule on Snow Leopard.

--------------------------------------------------------------------------------

4 files changed, 152 insertions, 291 deletions

diff --git a/net/amule/Makefile b/net/amule/Makefile
index 7ac04fceea8..e9aff3624ee 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.64 2013/06/12 12:01:18 ryoon Exp $
+# $NetBSD: Makefile,v 1.65 2013/06/15 02:34:19 ryoon Exp $
 
-DISTNAME=	aMule-2.2.6
-PKGNAME=	${DISTNAME:S/aMule/amule/}
-PKGREVISION=	21
+DISTNAME=	aMule-2.3.1
+PKGNAME=	${DISTNAME:tl}
 CATEGORIES=	net
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=amule/}
 EXTRACT_SUFX=	.tar.bz2
@@ -21,6 +20,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-wx-config=${BUILDLINK_PREFIX.wxGTK28}/bin/wx-config
 CONFIGURE_ARGS+=	--with-crypto-prefix=${BUILDLINK_PREFIX.cryptopp}
 CONFIGURE_ARGS+=	--with-language=all
+CONFIGURE_ARGS+=	--enable-xas
 
 .include "options.mk"
 
diff --git a/net/amule/PLIST b/net/amule/PLIST
index b68ab5a5cd0..0a3d19e4742 100644
--- a/net/amule/PLIST
+++ b/net/amule/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2010/03/30 13:06:53 obache Exp $
+@comment $NetBSD: PLIST,v 1.13 2013/06/15 02:34:19 ryoon Exp $
 ${PLIST.alc}bin/alc
 ${PLIST.alcc}bin/alcc
 ${PLIST.amule}bin/amule
@@ -27,44 +27,63 @@ ${PLIST.alcc}man/es/man1/alcc.1
 ${PLIST.amule}man/es/man1/amule.1
 ${PLIST.cmd}man/es/man1/amulecmd.1
 ${PLIST.daemon}man/es/man1/amuled.1
+${PLIST.gui}man/es/man1/amulegui.1
 ${PLIST.web}man/es/man1/amuleweb.1
 ${PLIST.cas}man/es/man1/cas.1
 ${PLIST.ed2k}man/es/man1/ed2k.1
 ${PLIST.wxcas}man/es/man1/wxcas.1
 ${PLIST.ed2k}man/es/man1/ed2k.1
 man/es/man1/xas.1
-${PLIST.alc}man/eu/man1/alc.1
-${PLIST.alcc}man/eu/man1/alcc.1
-${PLIST.amule}man/eu/man1/amule.1
-${PLIST.cmd}man/eu/man1/amulecmd.1
-${PLIST.daemon}man/eu/man1/amuled.1
-${PLIST.web}man/eu/man1/amuleweb.1
-${PLIST.cas}man/eu/man1/cas.1
-${PLIST.ed2k}man/eu/man1/ed2k.1
-${PLIST.wxcas}man/eu/man1/wxcas.1
-man/eu/man1/xas.1
+${PLIST.alc}man/fr/man1/alc.1
+${PLIST.alcc}man/fr/man1/alcc.1
 ${PLIST.alcc}man/fr/man1/alcc.1
 ${PLIST.amule}man/fr/man1/amule.1
 ${PLIST.cmd}man/fr/man1/amulecmd.1
 ${PLIST.daemon}man/fr/man1/amuled.1
+${PLIST.gui}man/fr/man1/amulegui.1
 ${PLIST.web}man/fr/man1/amuleweb.1
+${PLIST.cas}man/fr/man1/cas.1
 ${PLIST.ed2k}man/fr/man1/ed2k.1
+${PLIST.wxcas}man/fr/man1/wxcas.1
 ${PLIST.alc}man/hu/man1/alc.1
 ${PLIST.alcc}man/hu/man1/alcc.1
 ${PLIST.amule}man/hu/man1/amule.1
 ${PLIST.cmd}man/hu/man1/amulecmd.1
 ${PLIST.daemon}man/hu/man1/amuled.1
+${PLIST.gui}man/hu/man1/amulegui.1
 ${PLIST.web}man/hu/man1/amuleweb.1
 ${PLIST.cas}man/hu/man1/cas.1
 ${PLIST.ed2k}man/hu/man1/ed2k.1
 ${PLIST.wxcas}man/hu/man1/wxcas.1
 man/hu/man1/xas.1
+${PLIST.alc}man/it/man1/alc.1
+${PLIST.alcc}man/it/man1/alcc.1
 ${PLIST.amule}man/it/man1/amule.1
 ${PLIST.cmd}man/it/man1/amulecmd.1
 ${PLIST.daemon}man/it/man1/amuled.1
 ${PLIST.gui}man/it/man1/amulegui.1
 ${PLIST.web}man/it/man1/amuleweb.1
+${PLIST.cas}man/it/man1/cas.1
 ${PLIST.ed2k}man/it/man1/ed2k.1
+${PLIST.wxcas}man/it/man1/wxcas.1
+${PLIST.alc}man/ru/man1/alc.1
+${PLIST.alcc}man/ru/man1/alcc.1
+${PLIST.amule}man/ru/man1/amule.1
+${PLIST.cmd}man/ru/man1/amulecmd.1
+${PLIST.daemon}man/ru/man1/amuled.1
+${PLIST.gui}man/ru/man1/amulegui.1
+${PLIST.cas}man/ru/man1/cas.1
+${PLIST.ed2k}man/ru/man1/ed2k.1
+${PLIST.wxcas}man/ru/man1/wxcas.1
+${PLIST.alc}man/tr/man1/alc.1
+${PLIST.alcc}man/tr/man1/alcc.1
+${PLIST.amule}man/tr/man1/amule.1
+${PLIST.cmd}man/tr/man1/amulecmd.1
+${PLIST.daemon}man/tr/man1/amuled.1
+${PLIST.gui}man/tr/man1/amulegui.1
+${PLIST.cas}man/tr/man1/cas.1
+${PLIST.ed2k}man/tr/man1/ed2k.1
+${PLIST.wxcas}man/tr/man1/wxcas.1
 ${PLIST.alc}man/man1/alc.1
 ${PLIST.alcc}man/man1/alcc.1
 ${PLIST.amule}man/man1/amule.1
@@ -76,256 +95,98 @@ ${PLIST.cas}man/man1/cas.1
 ${PLIST.wxcas}man/man1/wxcas.1
 ${PLIST.ed2k}man/man1/ed2k.1
 man/man1/xas.1
+man/fr/man1/xas.1
+man/it/man1/xas.1
+man/ru/man1/xas.1
+man/tr/man1/xas.1
+${PLIST.skins}share/amule/skins/Mac_Gray.zip
 ${PLIST.skins}share/amule/skins/gnome.zip
 ${PLIST.skins}share/amule/skins/kde4.zip
+${PLIST.skins}share/amule/skins/priscilla.zip
 ${PLIST.skins}share/amule/skins/tango.zip
 ${PLIST.skins}share/amule/skins/xfce.zip
-${PLIST.web}share/amule/webserver/chicane/aMule.tmpl
-${PLIST.web}share/amule/webserver/chicane/add_server.gif
-${PLIST.web}share/amule/webserver/chicane/arrow_down.gif
-${PLIST.web}share/amule/webserver/chicane/arrow_down_logout.gif
-${PLIST.web}share/amule/webserver/chicane/arrow_right.gif
-${PLIST.web}share/amule/webserver/chicane/arrow_up.gif
-${PLIST.web}share/amule/webserver/chicane/back.gif
-${PLIST.web}share/amule/webserver/chicane/black.gif
-${PLIST.web}share/amule/webserver/chicane/blank1x1.gif
-${PLIST.web}share/amule/webserver/chicane/blue1.gif
-${PLIST.web}share/amule/webserver/chicane/blue2.gif
-${PLIST.web}share/amule/webserver/chicane/blue3.gif
-${PLIST.web}share/amule/webserver/chicane/blue4.gif
-${PLIST.web}share/amule/webserver/chicane/blue5.gif
-${PLIST.web}share/amule/webserver/chicane/blue6.gif
-${PLIST.web}share/amule/webserver/chicane/cp_download.gif
-${PLIST.web}share/amule/webserver/chicane/cp_kad.gif
-${PLIST.web}share/amule/webserver/chicane/cp_search.gif
-${PLIST.web}share/amule/webserver/chicane/cp_servers.gif
-${PLIST.web}share/amule/webserver/chicane/cp_settings.gif
-${PLIST.web}share/amule/webserver/chicane/cp_shared.gif
-${PLIST.web}share/amule/webserver/chicane/cp_stats.gif
-${PLIST.web}share/amule/webserver/chicane/downloads.php
-${PLIST.web}share/amule/webserver/chicane/emule.gif
-${PLIST.web}share/amule/webserver/chicane/favicon.ico
-${PLIST.web}share/amule/webserver/chicane/green.gif
-${PLIST.web}share/amule/webserver/chicane/greenpercent.gif
-${PLIST.web}share/amule/webserver/chicane/index.php
-${PLIST.web}share/amule/webserver/chicane/l_cancel.gif
-${PLIST.web}share/amule/webserver/chicane/l_connect.gif
-${PLIST.web}share/amule/webserver/chicane/l_down.gif
-${PLIST.web}share/amule/webserver/chicane/l_ed2klink.gif
-${PLIST.web}share/amule/webserver/chicane/l_info.gif
-${PLIST.web}share/amule/webserver/chicane/l_pause.gif
-${PLIST.web}share/amule/webserver/chicane/l_resume.gif
-${PLIST.web}share/amule/webserver/chicane/l_up.gif
-${PLIST.web}share/amule/webserver/chicane/log.gif
-${PLIST.web}share/amule/webserver/chicane/login.php
-${PLIST.web}share/amule/webserver/chicane/login_bottom.gif
-${PLIST.web}share/amule/webserver/chicane/login_downmain.gif
-${PLIST.web}share/amule/webserver/chicane/login_lefttop.gif
-${PLIST.web}share/amule/webserver/chicane/login_righttop.gif
-${PLIST.web}share/amule/webserver/chicane/login_top.gif
-${PLIST.web}share/amule/webserver/chicane/login_topdown.gif
-${PLIST.web}share/amule/webserver/chicane/login_topseperator.gif
-${PLIST.web}share/amule/webserver/chicane/logo.jpg
-${PLIST.web}share/amule/webserver/chicane/main_bg.gif
-${PLIST.web}share/amule/webserver/chicane/main_top_bg.gif
-${PLIST.web}share/amule/webserver/chicane/main_topbar.gif
-${PLIST.web}share/amule/webserver/chicane/main_topbardarker.gif
-${PLIST.web}share/amule/webserver/chicane/main_topbarseperator.gif
-${PLIST.web}share/amule/webserver/chicane/phpamule.png
-${PLIST.web}share/amule/webserver/chicane/preferences.php
-${PLIST.web}share/amule/webserver/chicane/red.gif
-${PLIST.web}share/amule/webserver/chicane/search.php
-${PLIST.web}share/amule/webserver/chicane/servers.php
-${PLIST.web}share/amule/webserver/chicane/shared.php
-${PLIST.web}share/amule/webserver/chicane/stat_graphs.php
-${PLIST.web}share/amule/webserver/chicane/stat_tree.php
-${PLIST.web}share/amule/webserver/chicane/transparent.gif
-${PLIST.web}share/amule/webserver/chicane/tree-closed.gif
-${PLIST.web}share/amule/webserver/chicane/tree-leaf.gif
-${PLIST.web}share/amule/webserver/chicane/tree-open.gif
-${PLIST.web}share/amule/webserver/chicane/yellow.gif
-${PLIST.web}share/amule/webserver/default/aMule.tmpl
-${PLIST.web}share/amule/webserver/default/add_server.gif
-${PLIST.web}share/amule/webserver/default/arrow_down.gif
-${PLIST.web}share/amule/webserver/default/arrow_right.gif
-${PLIST.web}share/amule/webserver/default/arrow_up.gif
-${PLIST.web}share/amule/webserver/default/back.gif
+${PLIST.web}share/amule/webserver/default/amuleweb-main-dload.php
+${PLIST.web}share/amule/webserver/default/amuleweb-main-kad.php
+${PLIST.web}share/amule/webserver/default/amuleweb-main-log.php
+${PLIST.web}share/amule/webserver/default/amuleweb-main-prefs.php
+${PLIST.web}share/amule/webserver/default/amuleweb-main-search.php
+${PLIST.web}share/amule/webserver/default/amuleweb-main-servers.php
+${PLIST.web}share/amule/webserver/default/amuleweb-main-shared.php
+${PLIST.web}share/amule/webserver/default/amuleweb-main-stats.php
 ${PLIST.web}share/amule/webserver/default/black.gif
+${PLIST.web}share/amule/webserver/default/blank1x1.gif
 ${PLIST.web}share/amule/webserver/default/blue1.gif
 ${PLIST.web}share/amule/webserver/default/blue2.gif
 ${PLIST.web}share/amule/webserver/default/blue3.gif
 ${PLIST.web}share/amule/webserver/default/blue4.gif
 ${PLIST.web}share/amule/webserver/default/blue5.gif
 ${PLIST.web}share/amule/webserver/default/blue6.gif
-${PLIST.web}share/amule/webserver/default/cp_download.gif
-${PLIST.web}share/amule/webserver/default/cp_kad.gif
-${PLIST.web}share/amule/webserver/default/cp_search.gif
-${PLIST.web}share/amule/webserver/default/cp_servers.gif
-${PLIST.web}share/amule/webserver/default/cp_settings.gif
-${PLIST.web}share/amule/webserver/default/cp_shared.gif
-${PLIST.web}share/amule/webserver/default/cp_stats.gif
-${PLIST.web}share/amule/webserver/default/downloads.php
-${PLIST.web}share/amule/webserver/default/emule.gif
+${PLIST.web}share/amule/webserver/default/cancel.gif
+${PLIST.web}share/amule/webserver/default/close.png
+${PLIST.web}share/amule/webserver/default/col.png
+${PLIST.web}share/amule/webserver/default/connect.gif
+${PLIST.web}share/amule/webserver/default/down.png
+${PLIST.web}share/amule/webserver/default/edkserv_0.png
+${PLIST.web}share/amule/webserver/default/edkserv_1.png
 ${PLIST.web}share/amule/webserver/default/favicon.ico
-${PLIST.web}share/amule/webserver/default/green.gif
-${PLIST.web}share/amule/webserver/default/greenpercent.gif
-${PLIST.web}share/amule/webserver/default/index.php
-${PLIST.web}share/amule/webserver/default/l_cancel.gif
-${PLIST.web}share/amule/webserver/default/l_connect.gif
-${PLIST.web}share/amule/webserver/default/l_down.gif
-${PLIST.web}share/amule/webserver/default/l_ed2klink.gif
-${PLIST.web}share/amule/webserver/default/l_info.gif
-${PLIST.web}share/amule/webserver/default/l_pause.gif
-${PLIST.web}share/amule/webserver/default/l_resume.gif
-${PLIST.web}share/amule/webserver/default/l_up.gif
-${PLIST.web}share/amule/webserver/default/log.gif
+${PLIST.web}share/amule/webserver/default/filter.png
+${PLIST.web}share/amule/webserver/default/fond.gif
+${PLIST.web}share/amule/webserver/default/fond_haut.png
+${PLIST.web}share/amule/webserver/default/footer.php
+${PLIST.web}share/amule/webserver/default/index.html
+${PLIST.web}share/amule/webserver/default/log.php
 ${PLIST.web}share/amule/webserver/default/login.php
-${PLIST.web}share/amule/webserver/default/logo.jpg
-${PLIST.web}share/amule/webserver/default/phpamule.png
-${PLIST.web}share/amule/webserver/default/preferences.php
+${PLIST.web}share/amule/webserver/default/loginfond.gif
+${PLIST.web}share/amule/webserver/default/loginfond_haut.png
+${PLIST.web}share/amule/webserver/default/loginlogo.jpg
+${PLIST.web}share/amule/webserver/default/loginlogo.png
+${PLIST.web}share/amule/webserver/default/logo.png
+${PLIST.web}share/amule/webserver/default/maquette.dwt
+${PLIST.web}share/amule/webserver/default/ok.png
+${PLIST.web}share/amule/webserver/default/pause.png
+${PLIST.web}share/amule/webserver/default/play.png
 ${PLIST.web}share/amule/webserver/default/red.gif
-${PLIST.web}share/amule/webserver/default/search.php
-${PLIST.web}share/amule/webserver/default/servers.php
-${PLIST.web}share/amule/webserver/default/shared.php
-${PLIST.web}share/amule/webserver/default/stat_graphs.php
-${PLIST.web}share/amule/webserver/default/stat_tree.php
-${PLIST.web}share/amule/webserver/default/transparent.gif
+${PLIST.web}share/amule/webserver/default/refresh.png
+${PLIST.web}share/amule/webserver/default/search_0.png
+${PLIST.web}share/amule/webserver/default/search_1.png
+${PLIST.web}share/amule/webserver/default/shared_0.png
+${PLIST.web}share/amule/webserver/default/shared_1.png
+${PLIST.web}share/amule/webserver/default/sheserv_0.png
+${PLIST.web}share/amule/webserver/default/sheserv_1.png
+${PLIST.web}share/amule/webserver/default/stats.php
+${PLIST.web}share/amule/webserver/default/stats_0.png
+${PLIST.web}share/amule/webserver/default/stats_1.png
+${PLIST.web}share/amule/webserver/default/stats_tree.php
+${PLIST.web}share/amule/webserver/default/style.css
+${PLIST.web}share/amule/webserver/default/tab_bottom.png
+${PLIST.web}share/amule/webserver/default/tab_bottom_left.png
+${PLIST.web}share/amule/webserver/default/tab_bottom_right.png
+${PLIST.web}share/amule/webserver/default/tab_left.png
+${PLIST.web}share/amule/webserver/default/tab_right.png
+${PLIST.web}share/amule/webserver/default/tab_top.png
+${PLIST.web}share/amule/webserver/default/tab_top_left.png
+${PLIST.web}share/amule/webserver/default/tab_top_right.png
+${PLIST.web}share/amule/webserver/default/transf_0.png
+${PLIST.web}share/amule/webserver/default/transf_1.png
 ${PLIST.web}share/amule/webserver/default/tree-closed.gif
 ${PLIST.web}share/amule/webserver/default/tree-leaf.gif
 ${PLIST.web}share/amule/webserver/default/tree-open.gif
+${PLIST.web}share/amule/webserver/default/up.png
 ${PLIST.web}share/amule/webserver/default/yellow.gif
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-dload.php
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-kad.php
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-log.php
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-prefs.php
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-search.php
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-servers.php
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-shared.php
-${PLIST.web}share/amule/webserver/litoral/amuleweb-main-stats.php
-${PLIST.web}share/amule/webserver/litoral/black.gif
-${PLIST.web}share/amule/webserver/litoral/blank1x1.gif
-${PLIST.web}share/amule/webserver/litoral/blue1.gif
-${PLIST.web}share/amule/webserver/litoral/blue2.gif
-${PLIST.web}share/amule/webserver/litoral/blue3.gif
-${PLIST.web}share/amule/webserver/litoral/blue4.gif
-${PLIST.web}share/amule/webserver/litoral/blue5.gif
-${PLIST.web}share/amule/webserver/litoral/blue6.gif
-${PLIST.web}share/amule/webserver/litoral/cancel.gif
-${PLIST.web}share/amule/webserver/litoral/close.png
-${PLIST.web}share/amule/webserver/litoral/col.png
-${PLIST.web}share/amule/webserver/litoral/connect.gif
-${PLIST.web}share/amule/webserver/litoral/down.png
-${PLIST.web}share/amule/webserver/litoral/edkserv_0.png
-${PLIST.web}share/amule/webserver/litoral/edkserv_1.png
-${PLIST.web}share/amule/webserver/litoral/favicon.ico
-${PLIST.web}share/amule/webserver/litoral/filter.png
-${PLIST.web}share/amule/webserver/litoral/fond.gif
-${PLIST.web}share/amule/webserver/litoral/fond_haut.png
-${PLIST.web}share/amule/webserver/litoral/footer.php
-${PLIST.web}share/amule/webserver/litoral/index.html
-${PLIST.web}share/amule/webserver/litoral/kitty.gif
-${PLIST.web}share/amule/webserver/litoral/log.php
-${PLIST.web}share/amule/webserver/litoral/login.php
-${PLIST.web}share/amule/webserver/litoral/loginfond.gif
-${PLIST.web}share/amule/webserver/litoral/loginfond_haut.png
-${PLIST.web}share/amule/webserver/litoral/loginlogo.jpg
-${PLIST.web}share/amule/webserver/litoral/loginlogo.png
-${PLIST.web}share/amule/webserver/litoral/logo.png
-${PLIST.web}share/amule/webserver/litoral/maquette.dwt
-${PLIST.web}share/amule/webserver/litoral/ok.png
-${PLIST.web}share/amule/webserver/litoral/pause.png
-${PLIST.web}share/amule/webserver/litoral/play.png
-${PLIST.web}share/amule/webserver/litoral/red.gif
-${PLIST.web}share/amule/webserver/litoral/refresh.png
-${PLIST.web}share/amule/webserver/litoral/search_0.png
-${PLIST.web}share/amule/webserver/litoral/search_1.png
-${PLIST.web}share/amule/webserver/litoral/shared_0.png
-${PLIST.web}share/amule/webserver/litoral/shared_1.png
-${PLIST.web}share/amule/webserver/litoral/sheserv_0.png
-${PLIST.web}share/amule/webserver/litoral/sheserv_1.png
-${PLIST.web}share/amule/webserver/litoral/stats.php
-${PLIST.web}share/amule/webserver/litoral/stats_0.png
-${PLIST.web}share/amule/webserver/litoral/stats_1.png
-${PLIST.web}share/amule/webserver/litoral/stats_tree.php
-${PLIST.web}share/amule/webserver/litoral/style.css
-${PLIST.web}share/amule/webserver/litoral/tab_bottom.png
-${PLIST.web}share/amule/webserver/litoral/tab_bottom_left.png
-${PLIST.web}share/amule/webserver/litoral/tab_bottom_right.png
-${PLIST.web}share/amule/webserver/litoral/tab_left.png
-${PLIST.web}share/amule/webserver/litoral/tab_right.png
-${PLIST.web}share/amule/webserver/litoral/tab_top.png
-${PLIST.web}share/amule/webserver/litoral/tab_top_left.png
-${PLIST.web}share/amule/webserver/litoral/tab_top_right.png
-${PLIST.web}share/amule/webserver/litoral/transf_0.png
-${PLIST.web}share/amule/webserver/litoral/transf_1.png
-${PLIST.web}share/amule/webserver/litoral/tree-closed.gif
-${PLIST.web}share/amule/webserver/litoral/tree-leaf.gif
-${PLIST.web}share/amule/webserver/litoral/tree-open.gif
-${PLIST.web}share/amule/webserver/litoral/up.png
-${PLIST.web}share/amule/webserver/litoral/yellow.gif
-${PLIST.web}share/amule/webserver/php-default/amuleweb-main-dload.php
-${PLIST.web}share/amule/webserver/php-default/amuleweb-main-kad.php
-${PLIST.web}share/amule/webserver/php-default/amuleweb-main-prefs.php
-${PLIST.web}share/amule/webserver/php-default/amuleweb-main-search.php
-${PLIST.web}share/amule/webserver/php-default/amuleweb-main-servers.php
-${PLIST.web}share/amule/webserver/php-default/amuleweb-main-shared.php
-${PLIST.web}share/amule/webserver/php-default/amuleweb-main-stats.php
-${PLIST.web}share/amule/webserver/php-default/apply.jpeg
-${PLIST.web}share/amule/webserver/php-default/arrow-r.png
-${PLIST.web}share/amule/webserver/php-default/cancel.gif
-${PLIST.web}share/amule/webserver/php-default/connect.gif
-${PLIST.web}share/amule/webserver/php-default/delete.jpeg
-${PLIST.web}share/amule/webserver/php-default/down.jpeg
-${PLIST.web}share/amule/webserver/php-default/favicon.ico
-${PLIST.web}share/amule/webserver/php-default/footer.php
-${PLIST.web}share/amule/webserver/php-default/index.html
-${PLIST.web}share/amule/webserver/php-default/login.php
-${PLIST.web}share/amule/webserver/php-default/pause.jpeg
-${PLIST.web}share/amule/webserver/php-default/phpamule.png
-${PLIST.web}share/amule/webserver/php-default/resume.jpeg
-${PLIST.web}share/amule/webserver/php-default/stats.php
-${PLIST.web}share/amule/webserver/php-default/stats_tree.php
-${PLIST.web}share/amule/webserver/php-default/toolbutton-connect.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-download-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-download.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-filter.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-kad-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-kad.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-logout-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-logout.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-reload.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-search-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-search.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-servers-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-servers.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-settings-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-settings.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-shared-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-shared.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-stats-pressed.jpeg
-${PLIST.web}share/amule/webserver/php-default/toolbutton-stats.jpeg
-${PLIST.web}share/amule/webserver/php-default/top.html
-${PLIST.web}share/amule/webserver/php-default/tree-closed.gif
-${PLIST.web}share/amule/webserver/php-default/tree-leaf.gif
-${PLIST.web}share/amule/webserver/php-default/tree-open.gif
-${PLIST.web}share/amule/webserver/php-default/up.jpeg
 ${PLIST.alc}share/applications/alc.desktop
 ${PLIST.amule}share/applications/amule.desktop
 ${PLIST.gui}share/applications/amulegui.desktop
 ${PLIST.wxcas}share/applications/wxcas.desktop
 ${PLIST.cas}share/cas/stat.png
 ${PLIST.cas}share/cas/tmp.html
-share/doc/aMule-${PKGVERSION}/ABOUT-NLS
-share/doc/aMule-${PKGVERSION}/Changelog
-share/doc/aMule-${PKGVERSION}/EC_Protocol.txt
-share/doc/aMule-${PKGVERSION}/ED2K-Links.HOWTO
-share/doc/aMule-${PKGVERSION}/INSTALL
-share/doc/aMule-${PKGVERSION}/README
-share/doc/aMule-${PKGVERSION}/TODO
-share/doc/aMule-${PKGVERSION}/amule-win32.HOWTO.txt
-share/doc/aMule-${PKGVERSION}/amulesig.txt
-share/doc/aMule-${PKGVERSION}/license.txt
-share/doc/aMule-${PKGVERSION}/socks4.protocol
+share/doc/amule/ABOUT-NLS
+share/doc/amule/Changelog
+share/doc/amule/EC_Protocol.txt
+share/doc/amule/INSTALL
+share/doc/amule/README
+share/doc/amule/TODO
+share/doc/amule/amulesig.txt
+share/doc/amule/license.txt
 share/locale/ar/LC_MESSAGES/amule.mo
 share/locale/ast/LC_MESSAGES/amule.mo
 share/locale/bg/LC_MESSAGES/amule.mo
diff --git a/net/amule/distinfo b/net/amule/distinfo
index efefdf25428..09cabe9c87b 100644
--- a/net/amule/distinfo
+++ b/net/amule/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.18 2013/05/04 12:59:47 joerg Exp $
+$NetBSD: distinfo,v 1.19 2013/06/15 02:34:19 ryoon Exp $
 
-SHA1 (aMule-2.2.6.tar.bz2) = 369bb950897c3f1f59fc1190ac7034113ac253d0
-RMD160 (aMule-2.2.6.tar.bz2) = 9483eb1907803d3a6ac375c4d85a7b0cbd895daa
-Size (aMule-2.2.6.tar.bz2) = 4722143 bytes
-SHA1 (patch-aa) = 64b0812f361cfda37c19849b428b6ce1e31ca885
+SHA1 (aMule-2.3.1.tar.bz2) = 25bcef92b06cb34849afaf052e2cd66b4a8454c2
+RMD160 (aMule-2.3.1.tar.bz2) = 7bc5ceea196f9ba0aa0687a694cc82354a0210fc
+Size (aMule-2.3.1.tar.bz2) = 4565232 bytes
+SHA1 (patch-aa) = adf28d4ef0f693fea3e103c02c632ac91423b303
 SHA1 (patch-src_OScopeCtrl.cpp) = d9ee907eeb49c3f54972b4d1cabdd64c6d4b88d5
 SHA1 (patch-src_ObservableQueue.h) = 7d6b402662a3b9b67f0324d1b6d3119623d8ea77
diff --git a/net/amule/patches/patch-aa b/net/amule/patches/patch-aa
index a7452059945..dd723fbc99f 100644
--- a/net/amule/patches/patch-aa
+++ b/net/amule/patches/patch-aa
@@ -1,116 +1,116 @@
-$NetBSD: patch-aa,v 1.9 2009/06/06 13:08:27 obache Exp $
+$NetBSD: patch-aa,v 1.10 2013/06/15 02:34:19 ryoon Exp $
 
 * pthread flags portabilities
 * avoid check for gettext>=0.11.5
 * fixes to install all supported L10N man pages
 
---- configure.orig	2009-05-16 07:38:31.000000000 +0000
+--- configure.orig	2011-11-11 20:59:26.000000000 +0000
 +++ configure
-@@ -1998,7 +1998,8 @@ echo "${ECHO_T}yes" >&6
+@@ -3364,7 +3364,8 @@ case $host_os in *\ *) host_os=`echo "$h
+ $as_echo_n "checking if this is a FreeBSD 4 or earlier system... " >&6; }
+ 		if test x"`uname -s`" = xFreeBSD && test 0`uname -r | cut -c 1` -lt 5; then :
  
- else
- 
--			MULELDFLAGS="$MULELDFLAGS -lpthread"
+-			MULELDFLAGS="$MULELDFLAGS -pthread"
 +			MULELDFLAGS="$MULELDFLAGS ${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}"
 +			MULECFLAGS="$MULECFLAGS ${PTHREAD_CFLAGS}"
- 			echo "$as_me:$LINENO: result: no" >&5
- echo "${ECHO_T}no" >&6
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
  
-@@ -18080,7 +18081,7 @@ _ACEOF
+@@ -13760,7 +13761,7 @@ $as_echo "#define HAVE_DCGETTEXT 1" >>co
+   INCINTL=-I\${top_builddir}/intl
  fi
  
+-	if test x$USE_NLS = xyes; then :
++	if test xno = xyes; then :
  
--	if test x$USE_NLS = xyes; then
-+	if test xno = xyes; then
- 
- 	echo "$as_me:$LINENO: checking for autopoint" >&5
- echo $ECHO_N "checking for autopoint... $ECHO_C" >&6
-@@ -18116,7 +18117,7 @@ echo $ECHO_N "checking for requested lan
+ 	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for autopoint" >&5
+ $as_echo_n "checking for autopoint... " >&6; }
+@@ -13800,7 +13801,7 @@ $as_echo_n "checking for requested langu
  
- 	if test "$AMULE_DAEMON" = "yes"; then
+ 	if test ${enable_amule_daemon:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    AMULE_DAEMON_MANPAGES=`ls -1 ${srcdir}/docs/man/amuled.* | sed -e 's:.*/::g'`
  else
  
-@@ -18136,7 +18137,7 @@ fi
+@@ -13818,7 +13819,7 @@ fi
  
- 	if test "$AMULECMD" = "yes"; then
+ 	if test ${enable_amulecmd:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    AMULECMD_MANPAGES=`ls -1 ${srcdir}/docs/man/amulecmd.* | sed -e 's:.*/::g'`
  else
  
-@@ -18156,7 +18157,7 @@ fi
+@@ -13836,7 +13837,7 @@ fi
  
- 	if test "$WEB" = "yes"; then
+ 	if test ${enable_webserver:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
-   WEB_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g'`
+   WEBSERVER_MANPAGES=`ls -1 ${srcdir}/docs/man/amuleweb.* | sed -e 's:.*/::g'`
  else
  
-@@ -18176,7 +18177,7 @@ fi
+@@ -13854,7 +13855,7 @@ fi
  
- 	if test "$AMULE_GUI" = "yes"; then
+ 	if test ${enable_amule_gui:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    AMULE_GUI_MANPAGES=`ls -1 ${srcdir}/docs/man/amulegui.* | sed -e 's:.*/::g'`
  else
  
-@@ -18196,7 +18197,7 @@ fi
+@@ -13872,7 +13873,7 @@ fi
  
- 	if test "$CAS" = "yes"; then
+ 	if test ${enable_cas:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    CAS_MANPAGES=`ls -1 ${srcdir}/src/utils/cas/docs/cas.* | sed -e 's:.*/::g'`
  else
  
-@@ -18216,7 +18217,7 @@ fi
+@@ -13890,7 +13891,7 @@ fi
  
- 	if test "$WXCAS" = "yes"; then
+ 	if test ${enable_wxcas:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    WXCAS_MANPAGES=`ls -1 ${srcdir}/src/utils/wxCas/docs/wxcas.* | sed -e 's:.*/::g'`
  else
  
-@@ -18236,7 +18237,7 @@ fi
+@@ -13908,7 +13909,7 @@ fi
  
- 	if test "$ED2K" = "yes"; then
+ 	if test ${enable_ed2k:-yes} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    ED2K_MANPAGES=`ls -1 ${srcdir}/docs/man/ed2k.* | sed -e 's:.*/::g'`
  else
  
-@@ -18256,7 +18257,7 @@ fi
+@@ -13926,7 +13927,7 @@ fi
  
- 	if test "$ALC" = "yes"; then
+ 	if test ${enable_alc:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    ALC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alc.* | sed -e 's:.*/::g'`
  else
  
-@@ -18276,7 +18277,7 @@ fi
+@@ -13944,7 +13945,7 @@ fi
  
- 	if test "$ALCC" = "yes"; then
+ 	if test ${enable_alcc:-no} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    ALCC_MANPAGES=`ls -1 ${srcdir}/src/utils/aLinkCreator/docs/alcc.* | sed -e 's:.*/::g'`
  else
  
-@@ -18296,7 +18297,7 @@ fi
+@@ -13962,7 +13963,7 @@ fi
  
- 	if test "$MONOLITHIC" = "yes"; then
+ 	if test ${enable_monolithic:-yes} = yes; then :
  
--		if test -z "$LINGUAS"; then
+-		if test -z "$LINGUAS"; then :
 +		if test -z "$LINGUAS" -o "$LINGUAS" = "%UNSET%"; then
    MONOLITHIC_MANPAGES=`ls -1 ${srcdir}/docs/man/amule.* | sed -e 's:.*/::g'`
  else