Attachment #123534 for bug #166886

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




#

PORTNAME=	latrine
PORTVERSION=	1.0.0
PORTREVISION=	2
CATEGORIES=	games
MASTER_SITES=	http://alioth.debian.org/frs/download.php/3085/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	Curses-based LAnguage TRaINEr

LICENSE=	GPLv3

BUILD_DEPENDS=	p5-DBI>0:${PORTSDIR}/databases/p5-DBI

WRKSRC=		${WRKDIR}/${DISTNAME}/src

USE_CSTD=	gnu89
USE_SQLITE=	3
USE_PERL5_BUILD=yes
USE_NCURSES=	yes
USE_GETTEXT=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
MAKE_JOBS_SAFE=	yes

CPPFLAGS+=	-I${LOCALBASE}/include -D_XOPEN_SOURCE_EXTENDED
LDFLAGS+=	-L${LOCALBASE}/lib
USE_CSTD=	gnu89
USE_GMAKE=	yes
USE_GETTEXT=	yes
USE_NCURSES=	yes
WRKSRC=		${WRKDIR}/${DISTNAME}/src
MAN1=		latrine.1

MAN1=		latrine.1

post-patch:
	@${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
		's|<ncursesw/|<|'

.include <bsd.port.mk>

Lines 1-2 Link Here

(-)games/latrine/distinfo (-2 / +2 lines)
1	SHA256 (latrine-0.10.0.tar.gz) = aeac80c8d158d9c0a4a269df1de41c51a98013ba21aaab230340d844408edba4	1	SHA256 (latrine-1.0.0.tar.gz) = f2df58e9cf112dd0bfa96a4a46a4be47e65a665188e8b14f8bf707d1b0b45c71
2	SIZE (latrine-0.10.0.tar.gz) = 109040	2	SIZE (latrine-1.0.0.tar.gz) = 128477




--- data.c.orig	2009-07-16 03:10:29.000000000 +0900
+++ data.c	2012-04-10 22:49:26.000000000 +0900
@@ -26,6 +26,17 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <sys/param.h>
+#if __FreeBSD_version < 800067
+#define NO_WCSCASECMP
+#endif
+
+#if defined(NO_WCSCASECMP)
+#include <wchar.h>
+#include <wctype.h>
+#define wcscasecmp __wcscasecmp
+#endif
+
 #include "charset.h"
 #include "latrine.h"
 #include "memory.h"
@@ -912,6 +923,22 @@
 	return 0;
 }
 
+#if defined(NO_WCSCASECMP)
+int
+__wcscasecmp(const wchar_t *s1, const wchar_t *s2)
+{
+	wchar_t c1, c2;
+
+	for (; *s1; s1++, s2++) {
+		c1 = towlower(*s1);
+		c2 = towlower(*s2);
+		if (c1 != c2)
+			return ((int)c1 - c2);
+	}
+	return (-*s2);
+}
+#endif
+
 int
 wordcmp(struct word *w[2], const int ignore_case)
 {




Index: screen.c
@@ -23,7 +23,11 @@
 #include <options.h>
 #include <screen.h>
 #include <unistd.h>
+#ifdef __FreeBSD__
+#include <sys/wait.h>
+#else
 #include <wait.h>
+#endif
 
 #define LEFT        10
 #define RIGHT       10

Lines 9-12 Link Here

(-)games/latrine/pkg-descr (-1 / +1 lines)
9	dictionaries for about 50 language combinations, which can be used with	9	dictionaries for about 50 language combinations, which can be used with
10	LaTrine.	10	LaTrine.
11		11
12	WWW: http://www.godisch.de/debian/latrine/	12	WWW: http://alioth.debian.org/projects/latrine/




bin/latrine
share/locale/da/LC_MESSAGES/latrine.mo
share/locale/de/LC_MESSAGES/latrine.mo
share/locale/fr/LC_MESSAGES/latrine.mo
share/locale/ga/LC_MESSAGES/latrine.mo
share/locale/id/LC_MESSAGES/latrine.mo
share/locale/it/LC_MESSAGES/latrine.mo
share/locale/lv/LC_MESSAGES/latrine.mo
share/locale/nl/LC_MESSAGES/latrine.mo
share/locale/pl/LC_MESSAGES/latrine.mo
share/locale/ro/LC_MESSAGES/latrine.mo
share/locale/ru/LC_MESSAGES/latrine.mo
share/locale/sv/LC_MESSAGES/latrine.mo
share/locale/tr/LC_MESSAGES/latrine.mo
share/locale/vi/LC_MESSAGES/latrine.mo
share/locale/zh_CN/LC_MESSAGES/latrine.mo
etc/latrine.conf.sample

Return to bug 166886

Lines 6-33 Link Here

(-)games/latrine/Makefile (-13 / +20 lines)
6	#	6	#
7		7
8	PORTNAME= latrine	8	PORTNAME= latrine
9	PORTVERSION= 0.10.0	9	PORTVERSION= 1.0.0
10	PORTREVISION= 2
11	CATEGORIES= games	10	CATEGORIES= games
12	MASTER_SITES= http://people.debian.org/~godisch/latrine/	11	MASTER_SITES= http://alioth.debian.org/frs/download.php/3085/
13		12
14	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
15	COMMENT= Curses-based LAnguage TRaINEr	14	COMMENT= Curses-based LAnguage TRaINEr
16		15
		16	LICENSE= GPLv3
		17
		18	BUILD_DEPENDS= p5-DBI>0:${PORTSDIR}/databases/p5-DBI
		19
		20	WRKSRC= ${WRKDIR}/${DISTNAME}/src
		21
		22	USE_CSTD= gnu89
		23	USE_SQLITE= 3
		24	USE_PERL5_BUILD=yes
		25	USE_NCURSES= yes
		26	USE_GETTEXT= yes
		27	USE_GMAKE= yes
17	GNU_CONFIGURE= yes	28	GNU_CONFIGURE= yes
		29	MAKE_JOBS_SAFE= yes
		30
18	CPPFLAGS+= -I${LOCALBASE}/include -D_XOPEN_SOURCE_EXTENDED	31	CPPFLAGS+= -I${LOCALBASE}/include -D_XOPEN_SOURCE_EXTENDED
19	LDFLAGS+= -L${LOCALBASE}/lib	32	LDFLAGS+= -L${LOCALBASE}/lib
20	USE_CSTD= gnu89
21	USE_GMAKE= yes
22	USE_GETTEXT= yes
23	USE_NCURSES= yes
24	WRKSRC= ${WRKDIR}/${DISTNAME}/src
25	MAN1= latrine.1
26		33
27	.include <bsd.port.pre.mk>	34	MAN1= latrine.1
28		35
29	post-patch:	36	post-patch:
30	@${REINPLACE_CMD} -e 's,ncursesw/ncurses.h,ncurses.h,' \	37	@${FIND} ${WRKSRC} -name "*.c" \| ${XARGS} ${REINPLACE_CMD} -e \
31	${WRKSRC}/charset.h ${WRKSRC}/screen.c	38	's\|<ncursesw/\|<\|'
32		39
33	.include <bsd.port.post.mk>	40	.include <bsd.port.mk>

Line 0 Link Here

(-)games/latrine/files/patch-data.c (+43 lines)
	1	--- data.c.orig 2009-07-16 03:10:29.000000000 +0900
	2	+++ data.c 2012-04-10 22:49:26.000000000 +0900
	3	@@ -26,6 +26,17 @@
	4	#include <stdlib.h>
	5	#include <string.h>
	6
	7	+#include <sys/param.h>
	8	+#if __FreeBSD_version < 800067
	9	+#define NO_WCSCASECMP
	10	+#endif
	11	+
	12	+#if defined(NO_WCSCASECMP)
	13	+#include <wchar.h>
	14	+#include <wctype.h>
	15	+#define wcscasecmp __wcscasecmp
	16	+#endif
	17	+
	18	#include "charset.h"
	19	#include "latrine.h"
	20	#include "memory.h"
	21	@@ -912,6 +923,22 @@
	22	return 0;
	23	}
	24
	25	+#if defined(NO_WCSCASECMP)
	26	+int
	27	+__wcscasecmp(const wchar_t s1, const wchar_t s2)
	28	+{
	29	+ wchar_t c1, c2;
	30	+
	31	+ for (; *s1; s1++, s2++) {
	32	+ c1 = towlower(*s1);
	33	+ c2 = towlower(*s2);
	34	+ if (c1 != c2)
	35	+ return ((int)c1 - c2);
	36	+ }
	37	+ return (-*s2);
	38	+}
	39	+#endif
	40	+
	41	int
	42	wordcmp(struct word *w[2], const int ignore_case)
	43	{

Lines 1-13 Link Here

(-)games/latrine/files/patch-screen.c (-13 lines)
1	Index: screen.c
2	@@ -23,7 +23,11 @@
3	#include <options.h>
4	#include <screen.h>
5	#include <unistd.h>
6	+#ifdef __FreeBSD__
7	+#include <sys/wait.h>
8	+#else
9	#include <wait.h>
10	+#endif
11
12	#define LEFT 10
13	#define RIGHT 10

Lines 1-11 Link Here

(-)games/latrine/pkg-plist (+6 lines)
1	bin/latrine	1	bin/latrine
		2	share/locale/da/LC_MESSAGES/latrine.mo
2	share/locale/de/LC_MESSAGES/latrine.mo	3	share/locale/de/LC_MESSAGES/latrine.mo
3	share/locale/fr/LC_MESSAGES/latrine.mo	4	share/locale/fr/LC_MESSAGES/latrine.mo
4	share/locale/ga/LC_MESSAGES/latrine.mo	5	share/locale/ga/LC_MESSAGES/latrine.mo
		6	share/locale/id/LC_MESSAGES/latrine.mo
5	share/locale/it/LC_MESSAGES/latrine.mo	7	share/locale/it/LC_MESSAGES/latrine.mo
		8	share/locale/lv/LC_MESSAGES/latrine.mo
6	share/locale/nl/LC_MESSAGES/latrine.mo	9	share/locale/nl/LC_MESSAGES/latrine.mo
		10	share/locale/pl/LC_MESSAGES/latrine.mo
7	share/locale/ro/LC_MESSAGES/latrine.mo	11	share/locale/ro/LC_MESSAGES/latrine.mo
		12	share/locale/ru/LC_MESSAGES/latrine.mo
8	share/locale/sv/LC_MESSAGES/latrine.mo	13	share/locale/sv/LC_MESSAGES/latrine.mo
9	share/locale/tr/LC_MESSAGES/latrine.mo	14	share/locale/tr/LC_MESSAGES/latrine.mo
10	share/locale/vi/LC_MESSAGES/latrine.mo	15	share/locale/vi/LC_MESSAGES/latrine.mo
		16	share/locale/zh_CN/LC_MESSAGES/latrine.mo
11	etc/latrine.conf.sample	17	etc/latrine.conf.sample