Attachment 119911 Details for Bug 162603 – file.diff

[patch] file.diff

file.diff (text/plain), 26.67 KB, created by Barbara on 2011-11-16 02:10:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Barbara

Created: 2011-11-16 02:10:09 UTC

Size: 26.67 KB

patch

obsolete

>--- Makefile.orig	2011-09-24 00:24:50.000000000 +0200
>+++ Makefile	2011-11-16 02:49:33.000000000 +0100
>@@ -6,8 +6,7 @@
> #
> 
> PORTNAME=	amule
>-PORTVERSION=	2.2.6
>-PORTREVISION=	2
>+PORTVERSION=	2.3.1
> CATEGORIES=	net-p2p
> MASTER_SITES=	SF/${PORTNAME}/aMule/${PORTVERSION}
> DISTNAME=	aMule-${PORTVERSION}
>@@ -25,6 +24,7 @@
> LICENSE_FILE_GPLv2=${WRKSRC}/docs/COPYING
> 
> USE_BZIP2=	yes
>+USE_BISON=	build
> USE_GNOME=	pkgconfig
> USE_GMAKE=	yes
> USE_WX=		2.8
>@@ -37,30 +37,33 @@
> 
> CPPFLAGS+=	-I${LOCALBASE}/include
> CFLAGS+=	${PTHREAD_CFLAGS}
>-LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib
>+LDFLAGS+=	${PTHREAD_LIBS} -L${LOCALBASE}/lib -lpng
> 
> OPTIONS=	ALC "Compile aMule Link Creator for GUI" on \
> 		ALCC "Compile aMule Link Creator for console" on \
> 		AMULECMD "Compile aMule command line client" on \
> 		AMULEDAEMON "Compile aMule daemon version" on \
>-		AMULEGUI "Compile aMule remote GUI (EXPERIMENTAL)" on \
>+		AMULEGUI "Compile aMule remote GUI" on \
> 		CAS "Compile aMule Statistics for console" on \
> 		ED2K "Compile aMule ed2k links handler" on \
>+		FILEVIEW "Compile file viewer for console (EXPERIMENTAL)" on \
> 		GEOIP "Enable GeoIP IP2Country support" off \
>+		MMAP "Enable using mapped memory" off \
> 		MONOLITHIC "Compile monolithic aMule" on \
>+		PLASMAMULE "Compile aMule plasma applet and engine" off \
> 		UPNP "Enable Universal Plug and Play support" off \
> 		WEBSERVER "Compile aMule WebServer" on \
> 		WXCAS "Compile aMule Statistics for GUI" on \
>-		WXUNICODE "Enable Unicode support" on
>+		WXUNICODE "Enable Unicode support" on \
>+		XAS "Install XChat2 plugin" on
> 
>-PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt \
>-		ED2K-Links.HOWTO INSTALL README TODO \
>-		amule-win32.HOWTO.txt amulesig.txt license.txt socks4.protocol
>+PORTDOCS=	ABOUT-NLS Changelog EC_Protocol.txt INSTALL README TODO \
>+		amulesig.txt license.txt
> 
> FLEX?=		${LOCALBASE}/bin/flex
> PKG_CONFIG?=	${LOCALBASE}/bin/pkg-config
> 
>-.include <bsd.port.pre.mk>
>+.include <bsd.port.options.mk>
> 
> .if !defined(WITH_DEBUG)
> CONFIGURE_ARGS+=--disable-debug
>@@ -133,6 +136,14 @@
> PLIST_SUB+=		ED2K="@comment "
> .endif
> 
>+.if !defined(WITHOUT_FILEVIEW)
>+CONFIGURE_ARGS+=	--enable-fileview
>+PLIST_SUB+=		FILEVIEW=""
>+.else
>+CONFIGURE_ARGS+=	--disable-fileview
>+PLIST_SUB+=		FILEVIEW="@comment "
>+.endif
>+
> .if !defined(WITHOUT_GEOIP)
> CONFIGURE_ARGS+=	--enable-geoip
> LIB_DEPENDS+=		GeoIP.5:${PORTSDIR}/net/GeoIP
>@@ -140,6 +151,12 @@
> CONFIGURE_ARGS+=	--disable-geoip
> .endif
> 
>+.if !defined(WITHOUT_MMAP)
>+CONFIGURE_ARGS+=	--enable-mmap
>+.else
>+CONFIGURE_ARGS+=	--disable-mmap
>+.endif
>+
> .if !defined(WITHOUT_MONOLITHIC)
> CONFIGURE_ARGS+=	--enable-monolithic
> PLIST_SUB+=		MONOLITHIC=""
>@@ -148,6 +165,20 @@
> PLIST_SUB+=		MONOLITHIC="@comment "
> .endif
> 
>+.if !defined(WITHOUT_PLASMAMULE)
>+CONFIGURE_ENV+=		ac_cv_path_KDE4_CONFIG=${KDE4_PREFIX}/bin/kde4-config \
>+			KBUILDSYCOCA=${KDE4_PREFIX}/bin/kbuildsycoca4 \
>+			UPDATE_MIME_DATABASE=/usr/bin/true
>+CONFIGURE_ARGS+=	--enable-plasmamule
>+USE_KDE4=		kdelibs
>+USE_QT_VER=		4
>+QT_COMPONENTS+=		dbus gui moc_build
>+PLIST_SUB+=		PLASMAMULE=""
>+.else
>+CONFIGURE_ARGS+=	--disable-plasmamule
>+PLIST_SUB+=		PLASMAMULE="@comment "
>+.endif
>+
> .if !defined(WITHOUT_UPNP)
> LIB_DEPENDS+=		upnp.7:${PORTSDIR}/devel/upnp
> .else
>@@ -174,19 +205,44 @@
> WX_UNICODE=		yes
> .endif
> 
>+.if !defined(WITHOUT_XAS)
>+CONFIGURE_ARGS+=	--enable-xas
>+PLIST_SUB+=		XAS=""
>+.else
>+CONFIGURE_ARGS+=	--disable-xas
>+PLIST_SUB+=		XAS="@comment "
>+.endif
>+
> # Man pages management
> .include "Makefile.man"
> 
> post-patch:	.SILENT
> 	${REINPLACE_CMD} -e '/LDFLAGS/s/-lpthread/${PTHREAD_LIBS}/' \
> 		-e 's/test.*-print-file-name.*`/true/' \
>+		-e '/if.*test/s/==/=/' \
> 		${WRKSRC}/configure
> .if defined(NOPORTDOCS)
> 	${REINPLACE_CMD} 's/install-data-am:.*/install-data-am:/' \
> 		${WRKSRC}/docs/Makefile.in
> .endif
>+.if !defined(WITHOUT_PLASMAMULE)
>+	${REINPLACE_CMD} -e 's|@prefix@|${KDE4_PREFIX}|' \
>+		-e 's|LDFLAGS =|& -L${KDE4_PREFIX}/lib |' \
>+		${WRKSRC}/src/utils/plasmamule/Makefile.in
>+.endif
> 
> post-install:
>+.if !defined(WITHOUT_FILEVIEW)
>+	${INSTALL_PROGRAM} ${WRKSRC}/src/utils/fileview/mulefileview ${PREFIX}/bin
>+.endif
>+.if exists(${LOCALBASE}/bin/update-desktop-database)
>+. if !defined(WITHOUT_PLASMAMULE)
>+	-update-desktop-database ${KDE4_PREFIX}/share/applications
>+.  if exists(${LOCALBASE}/bin/update-mime-database)
>+	-update-mime-database ${KDE4_PREFIX}/share/mime
>+.  endif
>+. endif
> 	-update-desktop-database ${PREFIX}/share/applications
>+.endif
> 
>-.include <bsd.port.post.mk>
>+.include <bsd.port.mk>
>--- Makefile.man.orig	2010-10-19 07:28:07.000000000 +0200
>+++ Makefile.man	2011-11-16 02:37:43.000000000 +0100
>@@ -1,25 +1,16 @@
>-# TODO : Add fr here when pages are complete
>-MANLANG=	"" de es eu fr hu it
>-#MANCOMPRESSED=	no
>+# no eu for amulegui.1
>+# no fr,ru for xas.1
>+MANLANG=	"" de es fr hu it ru tr
> 
> .if !defined(WITHOUT_NLS)
> . if !defined(WITHOUT_MONOLITHIC)
> MAN1+=		amule.1
> . endif
> . if !defined(WITHOUT_ALC)
>-MAN1_EN+=	alc.1
>-MAN1_DE+=	alc.1
>-MAN1_ES+=	alc.1
>-MAN1_EU+=	alc.1
>-MAN1_HU+=	alc.1
>+MAN1+=		alc.1
> . endif
> . if !defined(WITHOUT_ALCC)
>-MAN1_EN+=	alcc.1
>-MAN1_DE+=	alcc.1
>-MAN1_ES+=	alcc.1
>-MAN1_EU+=	alcc.1
>-MAN1_FR+=	alcc.1
>-MAN1_HU+=	alcc.1
>+MAN1+=		alcc.1
> . endif
> . if !defined(WITHOUT_AMULECMD)
> MAN1+=		amulecmd.1
>@@ -28,16 +19,10 @@
> MAN1+=		amuled.1
> . endif
> . if !defined(WITHOUT_AMULEGUI)
>-MAN1_EN+=	amulegui.1
>-MAN1_DE+=	amulegui.1
>-MAN1_IT+=	amulegui.1
>+MAN1+=		amulegui.1
> . endif
> . if !defined(WITHOUT_CAS)
>-MAN1_EN+=	cas.1
>-MAN1_DE+=	cas.1
>-MAN1_ES+=	cas.1
>-MAN1_EU+=	cas.1
>-MAN1_HU+=	cas.1
>+MAN1+=		cas.1
> . endif
> . if !defined(WITHOUT_ED2K)
> MAN1+=		ed2k.1
>@@ -46,18 +31,10 @@
> MAN1+=		amuleweb.1
> . endif
> . if !defined(WITHOUT_WXCAS)
>-MAN1_EN+=	wxcas.1
>-MAN1_DE+=	wxcas.1
>-MAN1_ES+=	wxcas.1
>-MAN1_EU+=	wxcas.1
>-MAN1_HU+=	wxcas.1
>+MAN1+=		wxcas.1
> . endif
> .endif # !WITHOUT_NLS
> 
> .if !defined(WITHOUT_XAS)
>-MAN1_EN+=	xas.1
>-MAN1_DE+=	xas.1
>-MAN1_ES+=	xas.1
>-MAN1_EU+=	xas.1
>-MAN1_HU+=	xas.1
>+MAN1+=		xas.1
> .endif
>--- distinfo.orig	2011-01-02 15:13:02.000000000 +0100
>+++ distinfo	2011-11-16 00:06:13.000000000 +0100
>@@ -1,2 +1,2 @@
>-SHA256 (aMule-2.2.6.tar.bz2) = 6ce32b5f1d8113a224a8e850639d957656623a04a73fb83d52313c06c3488122
>-SIZE (aMule-2.2.6.tar.bz2) = 4722143
>+SHA256 (aMule-2.3.1.tar.bz2) = d2eda19c34ec574fa123efb95726c7cc241b093c95d074a5161ee7330dece69d
>+SIZE (aMule-2.3.1.tar.bz2) = 4565232
>--- pkg-plist.orig	2010-10-19 07:28:07.000000000 +0200
>+++ pkg-plist	2011-11-16 01:39:22.000000000 +0100
>@@ -1,3 +1,19 @@
>+%%PLASMAMULE%%@cwd %%KDE4_PREFIX%%
>+%%PLASMAMULE%%bin/plasmamule-engine-feeder
>+%%PLASMAMULE%%lib/kde4/plasma-applet-plasmamule.so
>+%%PLASMAMULE%%lib/kde4/plasma-engine-plasmamule.so
>+%%PLASMAMULE%%share/applications/plasmamule-engine-feeder.desktop
>+%%PLASMAMULE%%share/icons/hicolor/scalable/mimetypes/application-x-emulecollection.svg
>+%%PLASMAMULE%%share/kde4/services/ed2k.protocol
>+%%PLASMAMULE%%share/kde4/services/magnet.protocol
>+%%PLASMAMULE%%share/kde4/services/plasma-applet-plasmamule.desktop
>+%%PLASMAMULE%%share/kde4/services/plasma-engine-plasmamule.desktop
>+%%PLASMAMULE%%share/mime/amule.xml
>+%%PLASMAMULE%%@exec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
>+%%PLASMAMULE%%@unexec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
>+%%PLASMAMULE%%@exec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
>+%%PLASMAMULE%%@unexec [ -f %%LOCALBASE%%/bin/update-mime-database ] && %%LOCALBASE%%/bin/update-mime-database %D/share/mime >/dev/null 2>&1 || true
>+%%PLASMAMULE%%@cwd
> %%ALC%%bin/alc
> %%ALCC%%bin/alcc
> %%MONOLITHIC%%bin/amule
>@@ -5,244 +21,86 @@
> %%AMULEDAEMON%%bin/amuled
> %%AMULEGUI%%bin/amulegui
> %%WEBSERVER%%bin/amuleweb
>-bin/autostart-xas
>+%%XAS%%bin/autostart-xas
> %%CAS%%bin/cas
> %%ED2K%%bin/ed2k
>+%%FILEVIEW%%bin/mulefileview
> %%WXCAS%%bin/wxcas
>-lib/xchat/plugins/xas.pl
>+%%XAS%%lib/xchat/plugins/xas.pl
>+%%DATADIR%%/skins/Mac_Gray.zip
> %%DATADIR%%/skins/gnome.zip
> %%DATADIR%%/skins/kde4.zip
>+%%DATADIR%%/skins/priscilla.zip
> %%DATADIR%%/skins/tango.zip
> %%DATADIR%%/skins/xfce.zip
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/aMule.tmpl
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/add_server.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_down.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_down_logout.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_right.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/arrow_up.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/back.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/black.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blank1x1.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue1.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue2.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue3.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue4.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue5.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/blue6.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_download.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_kad.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_search.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_servers.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_settings.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_shared.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/cp_stats.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/downloads.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/emule.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/favicon.ico
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/green.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/greenpercent.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/index.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_cancel.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_connect.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_down.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_ed2klink.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_info.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_pause.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_resume.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/l_up.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/log.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_bottom.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_downmain.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_lefttop.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_righttop.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_top.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_topdown.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/login_topseperator.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/logo.jpg
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_bg.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_top_bg.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_topbar.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_topbardarker.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/main_topbarseperator.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/phpamule.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/preferences.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/red.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/search.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/servers.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/shared.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/stat_graphs.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/stat_tree.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/transparent.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/tree-closed.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/tree-leaf.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/tree-open.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/chicane/yellow.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/aMule.tmpl
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/add_server.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/arrow_down.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/arrow_right.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/arrow_up.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/back.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-dload.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-kad.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-log.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-prefs.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-search.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-servers.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-shared.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/amuleweb-main-stats.php
> %%WEBSERVER%%%%DATADIR%%/webserver/default/black.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/blank1x1.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/blue1.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/blue2.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/blue3.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/blue4.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/blue5.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/blue6.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_download.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_kad.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_search.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_servers.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_settings.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_shared.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/cp_stats.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/downloads.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/emule.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/cancel.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/close.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/col.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/connect.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/down.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/edkserv_0.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/edkserv_1.png
> %%WEBSERVER%%%%DATADIR%%/webserver/default/favicon.ico
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/green.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/greenpercent.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/index.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_cancel.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_connect.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_down.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_ed2klink.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_info.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_pause.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_resume.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/l_up.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/log.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/filter.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/fond.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/fond_haut.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/footer.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/index.html
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/log.php
> %%WEBSERVER%%%%DATADIR%%/webserver/default/login.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/logo.jpg
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/phpamule.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/preferences.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/loginfond.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/loginfond_haut.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/loginlogo.jpg
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/loginlogo.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/logo.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/maquette.dwt
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/ok.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/pause.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/play.png
> %%WEBSERVER%%%%DATADIR%%/webserver/default/red.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/search.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/servers.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/shared.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/stat_graphs.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/stat_tree.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/default/transparent.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/refresh.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/search_0.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/search_1.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/shared_0.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/shared_1.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/sheserv_0.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/sheserv_1.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/stats.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/stats_0.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/stats_1.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/stats_tree.php
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/style.css
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_bottom.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_bottom_left.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_bottom_right.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_left.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_right.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_top.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_top_left.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/tab_top_right.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/transf_0.png
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/transf_1.png
> %%WEBSERVER%%%%DATADIR%%/webserver/default/tree-closed.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/tree-leaf.gif
> %%WEBSERVER%%%%DATADIR%%/webserver/default/tree-open.gif
>+%%WEBSERVER%%%%DATADIR%%/webserver/default/up.png
> %%WEBSERVER%%%%DATADIR%%/webserver/default/yellow.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-dload.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-kad.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-log.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-prefs.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-search.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-servers.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-shared.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/amuleweb-main-stats.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/black.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blank1x1.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue1.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue2.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue3.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue4.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue5.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/blue6.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/cancel.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/close.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/col.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/connect.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/down.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/edkserv_0.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/edkserv_1.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/favicon.ico
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/filter.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/fond.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/fond_haut.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/footer.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/index.html
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/kitty.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/log.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/login.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginfond.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginfond_haut.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginlogo.jpg
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/loginlogo.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/logo.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/maquette.dwt
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/ok.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/pause.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/play.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/red.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/refresh.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/search_0.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/search_1.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/shared_0.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/shared_1.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/sheserv_0.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/sheserv_1.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats_0.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats_1.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/stats_tree.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/style.css
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_bottom.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_bottom_left.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_bottom_right.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_left.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_right.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_top.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_top_left.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tab_top_right.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/transf_0.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/transf_1.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tree-closed.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tree-leaf.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/tree-open.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/up.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/litoral/yellow.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-dload.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-kad.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-prefs.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-search.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-servers.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-shared.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/amuleweb-main-stats.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/apply.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/arrow-r.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/cancel.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/connect.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/delete.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/down.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/favicon.ico
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/footer.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/index.html
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/login.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/pause.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/phpamule.png
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/resume.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/stats.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/stats_tree.php
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-connect.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-download-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-download.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-filter.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-kad-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-kad.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-logout-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-logout.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-reload.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-search-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-search.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-servers-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-servers.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-settings-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-settings.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-shared-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-shared.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-stats-pressed.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/toolbutton-stats.jpeg
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/top.html
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/tree-closed.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/tree-leaf.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/tree-open.gif
>-%%WEBSERVER%%%%DATADIR%%/webserver/php-default/up.jpeg
> %%ALC%%share/applications/alc.desktop
> %%MONOLITHIC%%share/applications/amule.desktop
> %%AMULEGUI%%share/applications/amulegui.desktop
>@@ -289,25 +147,24 @@
> %%MONOLITHIC%%share/pixmaps/amule.xpm
> %%AMULEGUI%%share/pixmaps/amulegui.xpm
> %%WXCAS%%share/pixmaps/wxcas.xpm
>-@dirrmtry lib/xchat/plugins
>-@dirrmtry lib/xchat
>+%%XAS%%@dirrmtry lib/xchat/plugins
>+%%XAS%%@dirrmtry lib/xchat
> @dirrmtry man/de/man1
> @dirrmtry man/de
> @dirrmtry man/es/man1
> @dirrmtry man/es
>-@dirrmtry man/eu/man1
>-@dirrmtry man/eu
> @dirrmtry man/fr/man1
> @dirrmtry man/fr
> @dirrmtry man/hu/man1
> @dirrmtry man/hu
> @dirrmtry man/it/man1
> @dirrmtry man/it
>+@dirrmtry man/ru/man1
>+@dirrmtry man/ru
>+@dirrmtry man/tr/man1
>+@dirrmtry man/tr
> @dirrm %%DATADIR%%/skins
>-%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/chicane
> %%WEBSERVER%%@dirrm %%DATADIR%%/webserver/default
>-%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/litoral
>-%%WEBSERVER%%@dirrm %%DATADIR%%/webserver/php-default
> %%WEBSERVER%%@dirrm %%DATADIR%%/webserver
> @dirrm %%DATADIR%%
> @dirrmtry share/applications
>@@ -320,5 +177,5 @@
> %%NLS%%@dirrmtry share/locale/it_CH
> %%NLS%%@dirrmtry share/locale/ko_KR/LC_MESSAGES
> %%NLS%%@dirrmtry share/locale/ko_KR
>-@exec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
>-@unexec %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
>+@exec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
>+@unexec [ -f %%LOCALBASE%%/bin/update-desktop-database ] && %%LOCALBASE%%/bin/update-desktop-database %D/share/applications 2>/dev/null || true
>--- files/patch-src-utils-wxCas-src-wxcasframe.cpp.orig	2011-11-16 02:51:53.000000000 +0100
>+++ files/patch-src-utils-wxCas-src-wxcasframe.cpp	1970-01-01 01:00:00.000000000 +0100
>@@ -1,16 +0,0 @@
>---- src/utils/wxCas/src/wxcasframe.cpp~
>-+++ src/utils/wxCas/src/wxcasframe.cpp
>-@@ -285,11 +285,11 @@ WxCasFrame::GetStatImage () const
>- #ifdef __WXMSW__
>- 
>- 	memdc.
>--	SetFont ( wxFont::wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
>-+	SetFont ( wxFont ( 6, wxSWISS, wxNORMAL, wxBOLD ) );
>- #else
>- 
>- 	memdc.
>--	SetFont ( wxFont::wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
>-+	SetFont ( wxFont ( 8, wxSWISS, wxNORMAL, wxBOLD ) );
>- #endif
>- 
>- 	memdc.

Actions: View | Diff

Attachments on bug 162603: 119911