10 files changed, 5 insertions, 149 deletions

diff --git a/misc/emma/Makefile b/misc/emma/Makefile
index 96603e08a27e..192a52c561dd 100644
--- a/misc/emma/Makefile
+++ b/misc/emma/Makefile
@@ -6,37 +6,24 @@
 #
 
 PORTNAME=	emma
-PORTVERSION=	0.8.1
+PORTVERSION=	0.8.2
 CATEGORIES=	misc gnome python
 MASTER_SITES=	http://rainbow.mimuw.edu.pl/~la181249/emma/packages/
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.1/-1/}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A personal finance manager for Gnome
 
-BUILD_DEPENDS=	automake:${PORTSDIR}/devel/automake
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/DateTime/DateTime.py:${PORTSDIR}/lang/py-mx-base
 
-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S/.1//}
-
 USE_X_PREFIX=	yes
+USE_PYTHON=	yes
+USE_GNOME=	gnomehack gnomelibs gnomeprefix
 USE_GMAKE=	yes
-USE_GNOME=	yes
 USE_LIBTOOL=	yes
-USE_PYTHON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-
 pre-configure:
-.for file in install-sh missing mkinstalldirs
-	${LN} -sf ${LOCALBASE}/share/automake/${file} ${WRKSRC}/${file}
-.endfor
+	@${RM} -f ${WRKSRC}/config.cache
 
 .include <bsd.port.mk>
diff --git a/misc/emma/distinfo b/misc/emma/distinfo
index 3e9a4b6804c8..938364fdcd64 100644
--- a/misc/emma/distinfo
+++ b/misc/emma/distinfo
@@ -1 +1 @@
-MD5 (emma-0.8-1.tar.gz) = 7dc37a41b9fb2cfc69a3c1a3ac22f102
+MD5 (emma-0.8.2.tar.gz) = 1ccdcc70f57f256d08b35714e0540e96
diff --git a/misc/emma/files/patch-aa b/misc/emma/files/patch-aa
deleted file mode 100644
index de34a1c5b9fc..000000000000
--- a/misc/emma/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/date_entry.c	2000/11/07 11:19:50	1.1
-+++ ./src/date_entry.c	2000/11/07 11:19:59
-@@ -3,7 +3,6 @@
- #include <gnome.h>
- #include "gnome-ucombo.h"
- 
--#include <langinfo.h>
- #include <time.h>
- 
- #include "misc.h"
diff --git a/misc/emma/files/patch-ab b/misc/emma/files/patch-ab
deleted file mode 100644
index 8479d52331bf..000000000000
--- a/misc/emma/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/interface.c	2000/11/07 11:20:32	1.1
-+++ ./src/interface.c	2000/11/07 11:20:40
-@@ -3,7 +3,6 @@
- 
- #include <gnome.h>
- 
--#include <langinfo.h>
- #include <stdio.h>
- 
- #include <ctype.h>
diff --git a/misc/emma/files/patch-ac b/misc/emma/files/patch-ac
deleted file mode 100644
index e7660afe27d4..000000000000
--- a/misc/emma/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/limit_dlg.c	2000/11/07 11:23:56	1.1
-+++ ./src/limit_dlg.c	2000/11/07 11:24:08
-@@ -2,8 +2,6 @@
- 
- #include <gnome.h>
- 
--#include <langinfo.h>
--
- #include "acc_entry.h"
- #include "date_entry.h"
- #include "py_module.h"
diff --git a/misc/emma/files/patch-ad b/misc/emma/files/patch-ad
deleted file mode 100644
index e6923f45a7e6..000000000000
--- a/misc/emma/files/patch-ad
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./src/misc.c	2000/11/07 11:24:41	1.1
-+++ ./src/misc.c	2000/11/07 11:24:49
-@@ -2,7 +2,6 @@
- 
- #include <ctype.h>
- #include <time.h>
--#include <langinfo.h>
- 
- #include "data.h"
- 
diff --git a/misc/emma/files/patch-ae b/misc/emma/files/patch-ae
deleted file mode 100644
index 0c366dc127ff..000000000000
--- a/misc/emma/files/patch-ae
+++ /dev/null
@@ -1,19 +0,0 @@
---- ./src/prefs.c	2000/11/07 11:25:16	1.1
-+++ ./src/prefs.c	2000/11/07 12:11:29
-@@ -3,7 +3,6 @@
- #include <gnome.h>
- 
- #include <ctype.h>
--#include <langinfo.h>
- 
- #include "interface.h"
- #include "actions.h"
-@@ -116,7 +115,7 @@
-   gchar *path;
-   gchar *format;
- 
--  path = g_strdup_printf("/emma/Misc/DateFormat=%s", nl_langinfo(D_FMT));
-+  path = g_strdup_printf("/emma/Misc/DateFormat=%s", "%D");
-   format = gnome_config_get_string(path);
- 
-   strncpy(misc_date_fmt, format, MISC_DATE_FMT_SIZE-1);
diff --git a/misc/emma/files/patch-af b/misc/emma/files/patch-af
deleted file mode 100644
index ea0d8c90adb2..000000000000
--- a/misc/emma/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/prefs_dlg.c	2000/11/07 12:12:14	1.1
-+++ ./src/prefs_dlg.c	2000/11/07 12:12:23
-@@ -2,8 +2,6 @@
- 
- #include <gnome.h>
- 
--#include <langinfo.h>
--
- #include "limit_dlg.h"
- #include "py_module.h"
- #include "misc.h"
diff --git a/misc/emma/files/patch-ag b/misc/emma/files/patch-ag
deleted file mode 100644
index 08210f036a82..000000000000
--- a/misc/emma/files/patch-ag
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/py_module.c.orig	Wed Nov  1 10:10:18 2000
-+++ src/py_module.c	Tue Nov  7 15:14:32 2000
-@@ -1,7 +1,6 @@
- #include <config.h>
- 
- #include <ctype.h>
--#include <langinfo.h>
- #include <stdio.h>
- #include <time.h>
- #include <unistd.h>
-@@ -100,6 +99,8 @@
-      strcpy(tmp, g_get_home_dir());
-      strcat(tmp, "/.emma.py");
-      py_module_include_file(tmp, FALSE);
-+
-+     py_module_include_file(PREFIX "/share/gnome/emma/emma.py", FALSE);
- 
-      py_module_include_file("/usr/share/emma.py", FALSE);
-      py_module_include_file("/usr/local/share/emma.py", FALSE);
diff --git a/misc/emma/files/patch-ah b/misc/emma/files/patch-ah
deleted file mode 100644
index f063d227450b..000000000000
--- a/misc/emma/files/patch-ah
+++ /dev/null
@@ -1,41 +0,0 @@
---- src/report_druid.c.orig	Thu Nov  2 15:20:59 2000
-+++ src/report_druid.c	Tue Nov  7 15:02:22 2000
-@@ -1,6 +1,5 @@
- #include <config.h>
- 
--#include <langinfo.h>
- #include <math.h>
- 
- #include "date_entry.h"
-@@ -12,6 +11,10 @@
- 
- #include "report_druid.h"
- 
-+char *daynames[]={"Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"};
-+char *monthnames[]={"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", \
-+			"Aug", "Sep", "Oct", "Nov", "Dec"};
-+
- /*
- 0123456789012345678901234567890123456789012345678901234567890123456789012345678
- */
-@@ -693,9 +696,9 @@
-     rgd = g_new(ReportGroupData, 1);
-     
-     if (i == 6)
--      strcpy(rgd->label, nl_langinfo(ABDAY_1));
-+      strcpy(rgd->label, daynames[6]);
-     else
--      strcpy(rgd->label, nl_langinfo(ABDAY_2 + i));
-+      strcpy(rgd->label, daynames[i]);
- 
-     snprintf(rgd->expr, PY_EXPRESSION_MAX_SIZE, "Weekday() == %d", i+1);
- 
-@@ -711,7 +714,7 @@
-     ReportGroupData *rgd;
-     rgd = g_new(ReportGroupData, 1);
-     
--    strcpy(rgd->label, nl_langinfo(ABMON_1+i));
-+    strcpy(rgd->label, monthnames[i]);
- 
-     snprintf(rgd->expr, PY_EXPRESSION_MAX_SIZE, "Month() == %d", i+1);
-