Attachment #17245 for bug #31362

View | Details | Raw Unified | Return to bug 31362
Collapse All | Expand All




#

PORTNAME=		gaim
PORTVERSION=		0.46
CATEGORIES=		net
MASTER_SITES=		ftp://ftp.marko.net/pub/gaim/ \
			${MASTER_SITE_SOURCEFORGE}


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

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

		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'

.include <bsd.port.post.mk>

Line 1 Link Here

(-)gaim/distinfo (-1 / +1 lines)
1	MD5 (gaim-0.45.tar.bz2) = 29890833ca0c67fac08f719767347ab9	1	MD5 (gaim-0.46.tar.bz2) = e853d37d578d6087f120b39c90c636f4

Lines 1-9 Link Here

(-)gaim/files/patch-aa (-6 / +6 lines)
1	--- Makefile.in.orig Wed Oct 10 16:33:04 2001	1	--- Makefile.in.orig Thu Oct 18 15:46:35 2001
2	+++ Makefile.in Wed Oct 10 16:34:22 2001	2	+++ Makefile.in Thu Oct 18 15:49:18 2001
3	@@ -191,8 +191,8 @@	3	@@ -171,8 +171,8 @@
4	#bitssound_DATA = gaim.soundlist	4	@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktopdir = $(gnomedata)/applets/Network
5	#	5	@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdesktop_DATA = $(gaim_DESKTOP)
6	#endif	6
7	-pixmapdir = $(datadir)/apps/Internet	7	-pixmapdir = $(datadir)/apps/Internet
8	-pixmap_DATA = gaim.desktop	8	-pixmap_DATA = gaim.desktop
9	+@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet	9	+@GNOMEAPPLET_TRUE@pixmapdir = $(datadir)/apps/Internet

Lines 1-22 Link Here

(-)gaim/files/patch-ab (-13 / +26 lines)
1	--- pixmaps/Makefile.in.orig Tue Oct 3 02:42:15 2000
2	+++ pixmaps/Makefile.in Tue Oct 3 02:48:38 2000
3	@@ -128,8 +128,8 @@
4	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!
5	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	1	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
		2	--- pixmaps/Makefile.in.orig Thu Oct 18 15:51:12 2001
		3	+++ pixmaps/Makefile.in Thu Oct 18 15:59:35 2001
		4	@@ -267,16 +267,16 @@
		5	@DISTRIB_TRUE@distpixmapdir = $(datadir)/pixmaps
		6	@DISTRIB_TRUE@distpixmap_DATA = gaim.xpm
6		7
		8	-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`
		9	+@DISTRIB_FALSE@gnomedata = `@GNOME_CONFIG@ --datadir`
7		10
8	-pixmapdir = $(datadir)/pixmaps	11	-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
9	-pixmap_DATA = gaim.xpm	12	-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
10	+pixmapdir = $(datadir)/pixmaps/gaim	13	+@DISTRIB_FALSE@gaimdistpmdir = $(gnomedata)/pixmaps/gaim
11	+pixmap_DATA = $(EXTRA_DIST)	14	+@DISTRIB_FALSE@gaimdistpm_DATA = away.png connect.png msgpend.png offline.png online.png
12		15
13	#gnomesysconf = `@GNOME_CONFIG@ --sysconfdir`	16	-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmapdir = $(gnomedata)/pixmaps
14	@GNOMEAPPLET_TRUE@gnomedata = `@GNOME_CONFIG@ --datadir`	17	-@DISTRIB_FALSE@@GNOMEAPPLET_TRUE@gaimpixmap_DATA = gaim.xpm
15	@@ -187,7 +187,7 @@	18	+@DISTRIB_FALSE@gaimpixmapdir = $(gnomedata)/pixmaps
		19	+@DISTRIB_FALSE@gaimpixmap_DATA = gaim.xpm
16		20
		21	-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmapdir = $(datadir)/pixmaps
		22	-@DISTRIB_FALSE@@GNOMEAPPLET_FALSE@pixmap_DATA = gaim.xpm
		23	+@DISTRIB_FALSE@pixmapdir = $(datadir)/pixmaps/gaim
		24	+@DISTRIB_FALSE@pixmap_DATA = $(EXTRA_DIST)
		25	subdir = pixmaps
		26	mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
		27	CONFIG_HEADER = $(top_builddir)/config.h
		28	@@ -376,7 +376,7 @@
		29	done
17	install-pixmapDATA: $(pixmap_DATA)	30	install-pixmapDATA: $(pixmap_DATA)
18	@$(NORMAL_INSTALL)	31	@$(NORMAL_INSTALL)
19	- $(mkinstalldirs) $(DESTDIR)$(pixmapdir)	32	- $(mkinstalldirs) $(DESTDIR)$(pixmapdir)
20	+ $(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome	33	+ $(mkinstalldirs) $(DESTDIR)$(pixmapdir) $(DESTDIR)$(pixmapdir)/gnome
21	@list='$(pixmap_DATA)'; for p in $$list; do \	34	@list='$(pixmap_DATA)'; for p in $$list; do \
22	if test -f $(srcdir)/$$p; then \	35	if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
23	echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pixmapdir)/$$p"; \	36	f="`echo $$p \| sed -e 's\|^.*/\|\|'`"; \




%%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

%%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

%%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

%%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

Return to bug 31362

Lines 6-12 Link Here

(-)gaim/Makefile (-4 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= gaim	8	PORTNAME= gaim
9	PORTVERSION= 0.45	9	PORTVERSION= 0.46
10	CATEGORIES= net	10	CATEGORIES= net
11	MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \	11	MASTER_SITES= ftp://ftp.marko.net/pub/gaim/ \
12	${MASTER_SITE_SOURCEFORGE}	12	${MASTER_SITE_SOURCEFORGE}
Lines 14-21 Link Here
14		14
15	MAINTAINER= jim@FreeBSD.org	15	MAINTAINER= jim@FreeBSD.org
16		16
17	BUILD_DEPENDS= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
18
19	USE_BZIP2= yes	17	USE_BZIP2= yes
20	USE_X_PREFIX= yes	18	USE_X_PREFIX= yes
21	USE_GMAKE= yes	19	USE_GMAKE= yes
Lines 37-42 Link Here
37	CONFIGURE_ARGS+= --enable-panel	35	CONFIGURE_ARGS+= --enable-panel
38	.else	36	.else
39	CONFIGURE_ARGS+= --disable-gnome	37	CONFIGURE_ARGS+= --disable-gnome
		38	BUILD_DEPENDS= ${X11BASE}/bin/gdk-pixbuf-config:${PORTSDIR}/graphics/gdk-pixbuf
40	.endif	39	.endif
41	.if defined(HAVE_ESOUND)	40	.if defined(HAVE_ESOUND)
42	USE_ESOUND= yes	41	USE_ESOUND= yes
Lines 49-54 Link Here
49	s\|-lpthread\|${PTHREAD_LIBS:S/"//g}\|g' ${WRKSRC}/configure	48	s\|-lpthread\|${PTHREAD_LIBS:S/"//g}\|g' ${WRKSRC}/configure
50	@find ${WRKSRC} -name "Makefile.in" \| xargs ${PERL} -pi -e \	49	@find ${WRKSRC} -name "Makefile.in" \| xargs ${PERL} -pi -e \
51	's\|\$$\(datadir\)/gnome/\|\$$\(datadir\)/\|g ; \	50	's\|\$$\(datadir\)/gnome/\|\$$\(datadir\)/\|g ; \
52	s\|\$$\(datadir\)/locale\|\$$\(prefix\)/share/locale\|g'	51	s\|\$$\(datadir\)/locale\|\$$\(prefix\)/share/locale\|g'
53		52
54	.include <bsd.port.post.mk>	53	.include <bsd.port.post.mk>

Lines 28-33 Link Here

(-)gaim/pkg-plist (+6 lines)
28	%%DATADIR%%/pixmaps/gaim/available-dnd.xpm	28	%%DATADIR%%/pixmaps/gaim/available-dnd.xpm
29	%%DATADIR%%/pixmaps/gaim/available-xa.xpm	29	%%DATADIR%%/pixmaps/gaim/available-xa.xpm
30	%%DATADIR%%/pixmaps/gaim/available.xpm	30	%%DATADIR%%/pixmaps/gaim/available.xpm
		31	%%DATADIR%%/pixmaps/gaim/away.png
31	%%DATADIR%%/pixmaps/gaim/away_big.xpm	32	%%DATADIR%%/pixmaps/gaim/away_big.xpm
32	%%DATADIR%%/pixmaps/gaim/away_icon.xpm	33	%%DATADIR%%/pixmaps/gaim/away_icon.xpm
33	%%DATADIR%%/pixmaps/gaim/away_small.xpm	34	%%DATADIR%%/pixmaps/gaim/away_small.xpm
Lines 40-45 Link Here
40	%%DATADIR%%/pixmaps/gaim/cancel.xpm	41	%%DATADIR%%/pixmaps/gaim/cancel.xpm
41	%%DATADIR%%/pixmaps/gaim/close.xpm	42	%%DATADIR%%/pixmaps/gaim/close.xpm
42	%%DATADIR%%/pixmaps/gaim/close_small.xpm	43	%%DATADIR%%/pixmaps/gaim/close_small.xpm
		44	%%DATADIR%%/pixmaps/gaim/connect.png
43	%%DATADIR%%/pixmaps/gaim/crazy4.xpm	45	%%DATADIR%%/pixmaps/gaim/crazy4.xpm
44	%%DATADIR%%/pixmaps/gaim/crossedlips.xpm	46	%%DATADIR%%/pixmaps/gaim/crossedlips.xpm
45	%%DATADIR%%/pixmaps/gaim/cry.xpm	47	%%DATADIR%%/pixmaps/gaim/cry.xpm
Lines 61-66 Link Here
61	%%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm	63	%%DATADIR%%/pixmaps/gaim/gnomeicu-ffc.xpm
62	%%DATADIR%%/pixmaps/gaim/gnomeicu-na.xpm	64	%%DATADIR%%/pixmaps/gaim/gnomeicu-na.xpm
63	%%DATADIR%%/pixmaps/gaim/gnomeicu-occ.xpm	65	%%DATADIR%%/pixmaps/gaim/gnomeicu-occ.xpm
		66	%%DATADIR%%/pixmaps/gaim/gnomeicu-offline.xpm
64	%%DATADIR%%/pixmaps/gaim/gnomeicu-online.xpm	67	%%DATADIR%%/pixmaps/gaim/gnomeicu-online.xpm
65	%%DATADIR%%/pixmaps/gaim/gnome_add.xpm	68	%%DATADIR%%/pixmaps/gaim/gnome_add.xpm
66	%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm	69	%%DATADIR%%/pixmaps/gaim/gnome_preferences.xpm
Lines 78-90 Link Here
78	%%DATADIR%%/pixmaps/gaim/luke03.xpm	81	%%DATADIR%%/pixmaps/gaim/luke03.xpm
79	%%DATADIR%%/pixmaps/gaim/moneymouth.xpm	82	%%DATADIR%%/pixmaps/gaim/moneymouth.xpm
80	%%DATADIR%%/pixmaps/gaim/mrt.xpm	83	%%DATADIR%%/pixmaps/gaim/mrt.xpm
		84	%%DATADIR%%/pixmaps/gaim/msgpend.png
81	%%DATADIR%%/pixmaps/gaim/msn_away.xpm	85	%%DATADIR%%/pixmaps/gaim/msn_away.xpm
82	%%DATADIR%%/pixmaps/gaim/msn_online.xpm	86	%%DATADIR%%/pixmaps/gaim/msn_online.xpm
83	%%DATADIR%%/pixmaps/gaim/napster.xpm	87	%%DATADIR%%/pixmaps/gaim/napster.xpm
84	%%DATADIR%%/pixmaps/gaim/no_icon.xpm	88	%%DATADIR%%/pixmaps/gaim/no_icon.xpm
85	%%DATADIR%%/pixmaps/gaim/normal.xpm	89	%%DATADIR%%/pixmaps/gaim/normal.xpm
		90	%%DATADIR%%/pixmaps/gaim/offline.png
86	%%DATADIR%%/pixmaps/gaim/ok.xpm	91	%%DATADIR%%/pixmaps/gaim/ok.xpm
87	%%DATADIR%%/pixmaps/gaim/oneeye.xpm	92	%%DATADIR%%/pixmaps/gaim/oneeye.xpm
		93	%%DATADIR%%/pixmaps/gaim/online.png
88	%%DATADIR%%/pixmaps/gaim/panic.xpm	94	%%DATADIR%%/pixmaps/gaim/panic.xpm
89	%%DATADIR%%/pixmaps/gaim/plugins_small.xpm	95	%%DATADIR%%/pixmaps/gaim/plugins_small.xpm
90	%%DATADIR%%/pixmaps/gaim/pounce_small.xpm	96	%%DATADIR%%/pixmaps/gaim/pounce_small.xpm