Update to 2.0.

PR:		70651
Submitted by:	maintainer

8 files changed, 98 insertions, 52 deletions

diff --git a/net-im/gaim-guifications/Makefile b/net-im/gaim-guifications/Makefile
index c2c167ddf6c9..14dbf35e1774 100644
--- a/net-im/gaim-guifications/Makefile
+++ b/net-im/gaim-guifications/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	guifications
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,5 +22,21 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
+CONFIGURE_ENV+="CPPFLAGS=-I${LOCALBASE}/include" "LIBS=-L${LOCALBASE}/lib"
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-extract:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's#\([@(]\)GAIM_LIBDIR\([@)]\)#\1libdir\2#' \
+		-e 's#\([@(]\)GAIM_DATADIR\([@)]\)#\1datadir\2#'
 
 .include <bsd.port.mk>
diff --git a/net-im/gaim-guifications/distinfo b/net-im/gaim-guifications/distinfo
index 93119c63dd8f..0703972c04b8 100644
--- a/net-im/gaim-guifications/distinfo
+++ b/net-im/gaim-guifications/distinfo
@@ -1,2 +1,2 @@
-MD5 (guifications-1.10.tar.gz) = 91110f09327dcda28b443e544aa5a290
-SIZE (guifications-1.10.tar.gz) = 347924
+MD5 (guifications-2.0.tar.gz) = 7f813600bb9f6d5afe16d07f778cfcf0
+SIZE (guifications-2.0.tar.gz) = 604018
diff --git a/net-im/gaim-guifications/files/patch-src-guifications.c b/net-im/gaim-guifications/files/patch-src-guifications.c
deleted file mode 100644
index fda860161d38..000000000000
--- a/net-im/gaim-guifications/files/patch-src-guifications.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/guifications.c.orig	Sun Jul 11 13:22:37 2004
-+++ src/guifications.c	Mon Aug  9 14:48:46 2004
-@@ -402,7 +402,7 @@
- 	g_object_unref(G_OBJECT(protocol_scaled));
- 
- 	if (gaim_prefs_get_bool(GF_PREF_BEHAVIOR_ALIAS))
--		name = g_strdup(gaim_get_buddy_alias(buddy));
-+		name = g_strdup(gaim_buddy_get_alias(buddy));
- 	else
- 		name = g_strdup(buddy->name);
- 	
diff --git a/net-im/gaim-guifications/pkg-plist b/net-im/gaim-guifications/pkg-plist
index b0a2c79ddab4..29a69d6bd3b1 100644
--- a/net-im/gaim-guifications/pkg-plist
+++ b/net-im/gaim-guifications/pkg-plist
@@ -1,10 +1,11 @@
 lib/gaim/guifications.so
-share/gnome/pixmaps/gaim/guifications/backgrounds/background_default.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_huge.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_large.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_normal.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_small.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_tiny.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_big.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_huge.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_large.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_little.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_normal.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_small.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_tiny.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_center.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_east.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_north.png
@@ -14,10 +15,10 @@ share/gnome/pixmaps/gaim/guifications/conf/item_position_south.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_south_east.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_south_west.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_west.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_ellipsis_end.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_ellipsis_middle.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_ellipsis_start.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_truncate.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_end.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_middle.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_start.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_truncate.png
 share/gnome/pixmaps/gaim/guifications/conf/window_position_north_east.png
 share/gnome/pixmaps/gaim/guifications/conf/window_position_north_west.png
 share/gnome/pixmaps/gaim/guifications/conf/window_position_south_east.png
@@ -25,6 +26,24 @@ share/gnome/pixmaps/gaim/guifications/conf/window_position_south_west.png
 share/gnome/pixmaps/gaim/guifications/conf/window_zoom_in.png
 share/gnome/pixmaps/gaim/guifications/conf/window_zoom_normal.png
 share/gnome/pixmaps/gaim/guifications/conf/window_zoom_out.png
+share/gnome/pixmaps/gaim/guifications/themes/Penguins/penguin.png
+share/gnome/pixmaps/gaim/guifications/themes/Penguins/theme.xml
+share/gnome/pixmaps/gaim/guifications/themes/default/background.png
+share/gnome/pixmaps/gaim/guifications/themes/default/theme.xml
+share/gnome/pixmaps/gaim/guifications/themes/mini/background.png
+share/gnome/pixmaps/gaim/guifications/themes/mini/theme.xml
+%%NLS%%share/locale/de/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/es/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/he/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/no/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/guifications.mo
+@dirrm share/gnome/pixmaps/gaim/guifications/themes/mini
+@dirrm share/gnome/pixmaps/gaim/guifications/themes/default
+@dirrm share/gnome/pixmaps/gaim/guifications/themes/Penguins
+@dirrm share/gnome/pixmaps/gaim/guifications/themes
 @dirrm share/gnome/pixmaps/gaim/guifications/conf
-@dirrm share/gnome/pixmaps/gaim/guifications/backgrounds
 @dirrm share/gnome/pixmaps/gaim/guifications
diff --git a/net-im/pidgin-guifications/Makefile b/net-im/pidgin-guifications/Makefile
index c2c167ddf6c9..14dbf35e1774 100644
--- a/net-im/pidgin-guifications/Makefile
+++ b/net-im/pidgin-guifications/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	guifications
-PORTVERSION=	1.10
-PORTREVISION=	1
+PORTVERSION=	2.0
 CATEGORIES=	misc
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -23,5 +22,21 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gtk20
 USE_LIBTOOL_VER=15
+USE_REINPLACE=	yes
+
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT=	yes
+CONFIGURE_ARGS+=--with-libintl-prefix=${LOCALBASE}
+CONFIGURE_ENV+="CPPFLAGS=-I${LOCALBASE}/include" "LIBS=-L${LOCALBASE}/lib"
+PLIST_SUB+=	NLS=""
+.else
+CONFIGURE_ARGS+=--disable-nls
+PLIST_SUB+=	NLS="@comment "
+.endif
+
+post-extract:
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's#\([@(]\)GAIM_LIBDIR\([@)]\)#\1libdir\2#' \
+		-e 's#\([@(]\)GAIM_DATADIR\([@)]\)#\1datadir\2#'
 
 .include <bsd.port.mk>
diff --git a/net-im/pidgin-guifications/distinfo b/net-im/pidgin-guifications/distinfo
index 93119c63dd8f..0703972c04b8 100644
--- a/net-im/pidgin-guifications/distinfo
+++ b/net-im/pidgin-guifications/distinfo
@@ -1,2 +1,2 @@
-MD5 (guifications-1.10.tar.gz) = 91110f09327dcda28b443e544aa5a290
-SIZE (guifications-1.10.tar.gz) = 347924
+MD5 (guifications-2.0.tar.gz) = 7f813600bb9f6d5afe16d07f778cfcf0
+SIZE (guifications-2.0.tar.gz) = 604018
diff --git a/net-im/pidgin-guifications/files/patch-src-guifications.c b/net-im/pidgin-guifications/files/patch-src-guifications.c
deleted file mode 100644
index fda860161d38..000000000000
--- a/net-im/pidgin-guifications/files/patch-src-guifications.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/guifications.c.orig	Sun Jul 11 13:22:37 2004
-+++ src/guifications.c	Mon Aug  9 14:48:46 2004
-@@ -402,7 +402,7 @@
- 	g_object_unref(G_OBJECT(protocol_scaled));
- 
- 	if (gaim_prefs_get_bool(GF_PREF_BEHAVIOR_ALIAS))
--		name = g_strdup(gaim_get_buddy_alias(buddy));
-+		name = g_strdup(gaim_buddy_get_alias(buddy));
- 	else
- 		name = g_strdup(buddy->name);
- 	
diff --git a/net-im/pidgin-guifications/pkg-plist b/net-im/pidgin-guifications/pkg-plist
index b0a2c79ddab4..29a69d6bd3b1 100644
--- a/net-im/pidgin-guifications/pkg-plist
+++ b/net-im/pidgin-guifications/pkg-plist
@@ -1,10 +1,11 @@
 lib/gaim/guifications.so
-share/gnome/pixmaps/gaim/guifications/backgrounds/background_default.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_huge.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_large.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_normal.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_small.png
-share/gnome/pixmaps/gaim/guifications/conf/icon_size_tiny.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_big.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_huge.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_large.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_little.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_normal.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_small.png
+share/gnome/pixmaps/gaim/guifications/conf/item_icon_size_tiny.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_center.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_east.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_north.png
@@ -14,10 +15,10 @@ share/gnome/pixmaps/gaim/guifications/conf/item_position_south.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_south_east.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_south_west.png
 share/gnome/pixmaps/gaim/guifications/conf/item_position_west.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_ellipsis_end.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_ellipsis_middle.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_ellipsis_start.png
-share/gnome/pixmaps/gaim/guifications/conf/text_clipping_truncate.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_end.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_middle.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_ellipsis_start.png
+share/gnome/pixmaps/gaim/guifications/conf/item_text_clipping_truncate.png
 share/gnome/pixmaps/gaim/guifications/conf/window_position_north_east.png
 share/gnome/pixmaps/gaim/guifications/conf/window_position_north_west.png
 share/gnome/pixmaps/gaim/guifications/conf/window_position_south_east.png
@@ -25,6 +26,24 @@ share/gnome/pixmaps/gaim/guifications/conf/window_position_south_west.png
 share/gnome/pixmaps/gaim/guifications/conf/window_zoom_in.png
 share/gnome/pixmaps/gaim/guifications/conf/window_zoom_normal.png
 share/gnome/pixmaps/gaim/guifications/conf/window_zoom_out.png
+share/gnome/pixmaps/gaim/guifications/themes/Penguins/penguin.png
+share/gnome/pixmaps/gaim/guifications/themes/Penguins/theme.xml
+share/gnome/pixmaps/gaim/guifications/themes/default/background.png
+share/gnome/pixmaps/gaim/guifications/themes/default/theme.xml
+share/gnome/pixmaps/gaim/guifications/themes/mini/background.png
+share/gnome/pixmaps/gaim/guifications/themes/mini/theme.xml
+%%NLS%%share/locale/de/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/en_AU/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/en_GB/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/es/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/fr/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/he/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/no/LC_MESSAGES/guifications.mo
+%%NLS%%share/locale/zh_TW/LC_MESSAGES/guifications.mo
+@dirrm share/gnome/pixmaps/gaim/guifications/themes/mini
+@dirrm share/gnome/pixmaps/gaim/guifications/themes/default
+@dirrm share/gnome/pixmaps/gaim/guifications/themes/Penguins
+@dirrm share/gnome/pixmaps/gaim/guifications/themes
 @dirrm share/gnome/pixmaps/gaim/guifications/conf
-@dirrm share/gnome/pixmaps/gaim/guifications/backgrounds
 @dirrm share/gnome/pixmaps/gaim/guifications