Attachment 17245 Details for Bug 31362 – file.diff

[patch] file.diff

file.diff (text/plain), 7.82 KB, created by pat on 2001-10-18 21:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: pat

Created: 2001-10-18 21:40:01 UTC

Size: 7.82 KB

patch

obsolete

>diff -ruN /usr/ports/net/gaim/Makefile gaim/Makefile
>--- /usr/ports/net/gaim/Makefile	Wed Oct 10 20:11:50 2001
>+++ gaim/Makefile	Thu Oct 18 16:11:05 2001
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=		gaim
>-PORTVERSION=		0.45
>+PORTVERSION=		0.46
> CATEGORIES=		net
> MASTER_SITES=		ftp://ftp.marko.net/pub/gaim/ \
> 			${MASTER_SITE_SOURCEFORGE}
>@@ -14,8 +14,6 @@
> 
> MAINTAINER=		jim@FreeBSD.org
> 
>-BUILD_DEPENDS=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
>-
> USE_BZIP2=		yes
> USE_X_PREFIX=		yes
> USE_GMAKE=		yes
>@@ -37,6 +35,7 @@
> CONFIGURE_ARGS+=	--enable-panel
> .else
> CONFIGURE_ARGS+=	--disable-gnome
>+BUILD_DEPENDS=		${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
> .endif
> .if defined(HAVE_ESOUND)
> USE_ESOUND=		yes
>@@ -49,6 +48,6 @@
> 		s|-lpthread|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
> 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
> 		's|\$$$datadir$/gnome/|\$$$datadir$/|g ; \
>-		 s|\$$$datadir$/locale|\$$$prefix$/share/locale|g'
>+		s|\$$$datadir$/locale|\$$$prefix$/share/locale|g'
> 
> .include <bsd.port.post.mk>
>diff -ruN /usr/ports/net/gaim/distinfo gaim/distinfo
>--- /usr/ports/net/gaim/distinfo	Wed Oct 10 20:11:50 2001
>+++ gaim/distinfo	Thu Oct 18 15:43:05 2001
>@@ -1 +1 @@
>-MD5 (gaim-0.45.tar.bz2) = 29890833ca0c67fac08f719767347ab9
>+MD5 (gaim-0.46.tar.bz2) = e853d37d578d6087f120b39c90c636f4
>diff -ruN /usr/ports/net/gaim/files/patch-aa gaim/files/patch-aa
>--- /usr/ports/net/gaim/files/patch-aa	Wed Oct 10 20:11:57 2001
>+++ gaim/files/patch-aa	Thu Oct 18 15:49:35 2001
>@@ -1,9 +1,9 @@
>---- Makefile.in.orig	Wed Oct 10 16:33:04 2001
>-+++ Makefile.in	Wed Oct 10 16:34:22 2001
>-@@ -191,8 +191,8 @@
>- #bitssound_DATA = gaim.soundlist
>- #
>- #endif
>+--- Makefile.in.orig	Thu Oct 18 15:46:35 2001
>++++ Makefile.in	Thu Oct 18 15:49:18 2001
>+@@ -171,8 +171,8 @@
>+ @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktopdir = $(gnomedata)/applets/Network
>+ @DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktop_DATA = $(gaim_DESKTOP)
>+ 
> -pixmapdir = $(datadir)/apps/Internet
> -pixmap_DATA = gaim.desktop
> +@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet
>diff -ruN /usr/ports/net/gaim/files/patch-ab gaim/files/patch-ab
>--- /usr/ports/net/gaim/files/patch-ab	Thu Oct  5 03:22:45 2000
>+++ gaim/files/patch-ab	Thu Oct 18 16:00:11 2001
>@@ -1,22 +1,35 @@
>---- pixmaps/Makefile.in.orig	Tue Oct  3 02:42:15 2000
>-+++ pixmaps/Makefile.in	Tue Oct  3 02:48:38 2000
>-@@ -128,8 +128,8 @@
>- EXTRA_DIST = about_small.xpm					add.xpm						add_small.xpm					admin_icon.xpm					aimicon.xpm					aimicon2.xpm					angel.xpm					aol_icon.xpm					away.xpm					away_icon.xpm					away_small.xpm					bgcolor.xpm					big.xpm						bigsmile.xpm					block.xpm					bold.xpm					bsmile.xpm					buddyadd.xpm					buddychat.xpm					buddydel.xpm					burp.xpm					cancel.xpm					close.xpm					close_small.xpm					crossedlips.xpm					cry.xpm						daemon-buddyadd.xpm				daemon-buddychat.xpm				daemon-buddydel.xpm				daemon-im.xpm					daemon-info.xpm					daemon-permadd.xpm				daemon-permdel.xpm				daemon.xpm					dt_icon.xpm					embarrassed.xpm					exit_small.xpm					export_small.xpm				fgcolor.xpm					fontface.xpm					fontface2.xpm					free_icon.xpm					gaim.xpm					gnome_add.xpm					gnome_close.xpm					gnome_preferences.xpm				gnome_remove.xpm 				gnome/devil-connect.png				gnome/devil-offline.png				gnome/devil-online.png				gnome/penguin-connect.png			gnome/penguin-offline.png			gnome/pengu!
> in-online.png			group.xpm					im.xpm						import_small.xpm				info.xpm					italic.xpm					join.xpm					kiss.xpm					link.xpm					login_icon.xpm					logo.xpm					logout_icon.xpm					luke03.xpm					moneymouth.xpm					msg_pending.xpm					no_icon.xpm					normal.xpm					offline.xpm					ok.xpm						oneeye.xpm					online.xpm					palette.xpm					peng_frown.xpm					peng_smile.xpm					peng_wink.xpm					permadd.xpm					permdel.xpm					plugins_small.xpm				pounce_small.xpm				prefs_small.xpm					refresh.xpm					sad.xpm						save.xpm					scream.xpm					search_small.xpm				signing_on.xpm					small.xpm					smile.xpm					smile8.xpm					smile_happy.xpm					smile_icon.xpm					smile_sad.xpm					smile_wink.xpm					speaker.xpm					strike.xpm					tb_forward.xpm					tb_search.xpm					think.xpm					tmp_send.xpm					tongue.xpm					underline.xpm					warn.xpm					wink.xpm					wood.xpm					yell.xpm			
>+--- pixmaps/Makefile.in.orig	Thu Oct 18 15:51:12 2001
>++++ pixmaps/Makefile.in	Thu Oct 18 15:59:35 2001
>+@@ -267,16 +267,16 @@
>+ @DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
>+ @DISTRIB_TRUE@distpixmap_DATA = gaim.xpm
>  
>+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
>++@DISTRIB_FALSE@gnomedata = `@GNOME_CONFIG@ --datadir`
>  
>--pixmapdir = $(datadir)/pixmaps
>--pixmap_DATA = gaim.xpm
>-+pixmapdir = $(datadir)/pixmaps/gaim
>-+pixmap_DATA = $(EXTRA_DIST)
>+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
>+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
>++@DISTRIB_FALSE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
>++@DISTRIB_FALSE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
>  
>- #gnomesysconf = `@GNOME_CONFIG@ --sysconfdir`
>- @GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
>-@@ -187,7 +187,7 @@
>+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
>+-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
>++@DISTRIB_FALSE@gaimpixmapdir = $(gnomedata)/pixmaps
>++@DISTRIB_FALSE@gaimpixmap_DATA = gaim.xpm
>  
>+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
>+-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.xpm
>++@DISTRIB_FALSE@pixmapdir = $(datadir)/pixmaps/gaim
>++@DISTRIB_FALSE@pixmap_DATA = $(EXTRA_DIST)
>+ subdir = pixmaps
>+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
>+ CONFIG_HEADER = $(top_builddir)/config.h
>+@@ -376,7 +376,7 @@
>+ 	done
>  install-pixmapDATA: $(pixmap_DATA)
>  	@$(NORMAL_INSTALL)
> -	$(mkinstalldirs) $(DESTDIR)$(pixmapdir)
> +	$(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome
>  	@list='$(pixmap_DATA)'; for p in $$list; do \
>- 	  if test -f $(srcdir)/$$p; then \
>- 	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \
>+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
>+ 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
>diff -ruN /usr/ports/net/gaim/pkg-plist gaim/pkg-plist
>--- /usr/ports/net/gaim/pkg-plist	Wed Oct 10 20:11:50 2001
>+++ gaim/pkg-plist	Thu Oct 18 16:23:23 2001
>@@ -28,6 +28,7 @@
> %%DATADIR%%/pixmaps/gaim/available-dnd.xpm
> %%DATADIR%%/pixmaps/gaim/available-xa.xpm
> %%DATADIR%%/pixmaps/gaim/available.xpm
>+%%DATADIR%%/pixmaps/gaim/away.png
> %%DATADIR%%/pixmaps/gaim/away_big.xpm
> %%DATADIR%%/pixmaps/gaim/away_icon.xpm
> %%DATADIR%%/pixmaps/gaim/away_small.xpm
>@@ -40,6 +41,7 @@
> %%DATADIR%%/pixmaps/gaim/cancel.xpm
> %%DATADIR%%/pixmaps/gaim/close.xpm
> %%DATADIR%%/pixmaps/gaim/close_small.xpm
>+%%DATADIR%%/pixmaps/gaim/connect.png
> %%DATADIR%%/pixmaps/gaim/crazy4.xpm
> %%DATADIR%%/pixmaps/gaim/crossedlips.xpm
> %%DATADIR%%/pixmaps/gaim/cry.xpm
>@@ -61,6 +63,7 @@
> %%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm
> %%DATADIR%%/pixmaps/gaim/gnomeicu-na.xpm
> %%DATADIR%%/pixmaps/gaim/gnomeicu-occ.xpm
>+%%DATADIR%%/pixmaps/gaim/gnomeicu-offline.xpm
> %%DATADIR%%/pixmaps/gaim/gnomeicu-online.xpm
> %%DATADIR%%/pixmaps/gaim/gnome_add.xpm
> %%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm
>@@ -78,13 +81,16 @@
> %%DATADIR%%/pixmaps/gaim/luke03.xpm
> %%DATADIR%%/pixmaps/gaim/moneymouth.xpm
> %%DATADIR%%/pixmaps/gaim/mrt.xpm
>+%%DATADIR%%/pixmaps/gaim/msgpend.png
> %%DATADIR%%/pixmaps/gaim/msn_away.xpm
> %%DATADIR%%/pixmaps/gaim/msn_online.xpm
> %%DATADIR%%/pixmaps/gaim/napster.xpm
> %%DATADIR%%/pixmaps/gaim/no_icon.xpm
> %%DATADIR%%/pixmaps/gaim/normal.xpm
>+%%DATADIR%%/pixmaps/gaim/offline.png
> %%DATADIR%%/pixmaps/gaim/ok.xpm
> %%DATADIR%%/pixmaps/gaim/oneeye.xpm
>+%%DATADIR%%/pixmaps/gaim/online.png
> %%DATADIR%%/pixmaps/gaim/panic.xpm
> %%DATADIR%%/pixmaps/gaim/plugins_small.xpm
> %%DATADIR%%/pixmaps/gaim/pounce_small.xpm

Actions: View | Diff

Attachments on bug 31362: 17245