Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 2 Aug 2003 00:33:48 +0900
From:      KATO Tsuguru <tkato@prontomail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/55152: Update port: misc/emma to 0.8.2
Message-ID:  <20030802003348.650876b5.tkato@prontomail.com>
Resent-Message-ID: <200308011540.h71FeE5p052975@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         55152
>Category:       ports
>Synopsis:       Update port: misc/emma to 0.8.2
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Fri Aug 01 08:40:13 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 4.8-RELEASE i386
>Organization:
>Environment:
>Description:
- Update to version 0.8.2

Remove file:
files/patch-aa
files/patch-ab
files/patch-ac
files/patch-ad
files/patch-ae
files/patch-af
files/patch-ah

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/misc/emma/Makefile misc/emma/Makefile
--- /usr/ports/misc/emma/Makefile	Tue Jul 29 21:32:50 2003
+++ misc/emma/Makefile	Fri Aug  1 23:51:27 2003
@@ -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 -urN /usr/ports/misc/emma/distinfo misc/emma/distinfo
--- /usr/ports/misc/emma/distinfo	Wed Nov  8 00:36:54 2000
+++ misc/emma/distinfo	Thu Jul 31 12:59:28 2003
@@ -1 +1 @@
-MD5 (emma-0.8-1.tar.gz) = 7dc37a41b9fb2cfc69a3c1a3ac22f102
+MD5 (emma-0.8.2.tar.gz) = 1ccdcc70f57f256d08b35714e0540e96
diff -urN /usr/ports/misc/emma/files/patch-aa misc/emma/files/patch-aa
--- /usr/ports/misc/emma/files/patch-aa	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-aa	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/misc/emma/files/patch-ab misc/emma/files/patch-ab
--- /usr/ports/misc/emma/files/patch-ab	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-ab	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/misc/emma/files/patch-ac misc/emma/files/patch-ac
--- /usr/ports/misc/emma/files/patch-ac	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-ac	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/misc/emma/files/patch-ad misc/emma/files/patch-ad
--- /usr/ports/misc/emma/files/patch-ad	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-ad	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/misc/emma/files/patch-ae misc/emma/files/patch-ae
--- /usr/ports/misc/emma/files/patch-ae	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-ae	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/misc/emma/files/patch-af misc/emma/files/patch-af
--- /usr/ports/misc/emma/files/patch-af	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-af	Thu Jan  1 09:00:00 1970
@@ -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 -urN /usr/ports/misc/emma/files/patch-ag misc/emma/files/patch-ag
--- /usr/ports/misc/emma/files/patch-ag	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-ag	Thu Jul 31 13:11:23 2003
@@ -1,13 +1,5 @@
 --- 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");
diff -urN /usr/ports/misc/emma/files/patch-ah misc/emma/files/patch-ah
--- /usr/ports/misc/emma/files/patch-ah	Wed Nov  8 00:36:55 2000
+++ misc/emma/files/patch-ah	Thu Jan  1 09:00:00 1970
@@ -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);
- 
>Release-Note:
>Audit-Trail:
>Unformatted:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030802003348.650876b5.tkato>