Attachment #106116 for bug #146670

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




#

PORTNAME=	gtimer
PORTVERSION=	2.0.0
PORTREVISION=	4
CATEGORIES=	deskutils
MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
		http://www.cknudsen.com/gtimer/

MAINTAINER=	ports@FreeBSD.org
COMMENT=	A timer for your personal activities

RUN_DEPENDS=	xdg-open:${PORTSDIR}/devel/xdg-utils

USE_XORG=	xscrnsaver
USE_GNOME=	gtk20
USE_PERL5_BUILD=yes
USE_GETTEXT=	yes
USE_GMAKE=	yes
USE_GNOME=	gtk12
GNU_CONFIGURE=	yes
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"

MAN1=		${PORTNAME}.1
PLIST_FILES=	bin/${PORTNAME} \
		share/locale/cs/LC_MESSAGES/${PORTNAME}.mo \
		share/locale/cz/LC_MESSAGES/${PORTNAME}.mo \
		share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
		share/locale/fr/LC_MESSAGES/${PORTNAME}.mo \
		share/locale/sv/LC_MESSAGES/${PORTNAME}.mo

CPPFLAGS=	-I${LOCALBASE}/include
LDFLAGS=	-L${LOCALBASE}/lib
		${WRKSRC}/project.c

post-patch:
	@${REINPLACE_CMD} -e 's|1.1.7|${PORTVERSION}|g' ${WRKSRC}/configure
	@${REINPLACE_CMD} -e 's|"sensible-browser"|"xdg-open"|g' ${WRKSRC}/config.h
.for file in project.c task.c
	@${REINPLACE_CMD} -e 's|<malloc\.h>|<stdlib.h>|g' ${WRKSRC}/${file}
.endfor

pre-build:
	@(cd ${WRKSRC} && ${PERL} ./txt2h.pl < ChangeLog > changelog.h)

post-build:
.for lang in cs cz es fr sv
	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -o ${lang}.mo ${lang}.po
.endfor

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
.for lang in cs cz es fr sv
	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
		${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
.endfor

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)deskutils/gtimer/distinfo (-3 / +3 lines)
1	MD5 (gtimer-1.1.6.tar.bz2) = dd129daf0046ca4de05c67456989d226	1	MD5 (gtimer-2.0.0.tar.gz) = 1cc0ff18f566b5e497dc34ad9627b062
2	SHA256 (gtimer-1.1.6.tar.bz2) = 8e6738ddb02803a3af3af50ead427b7a08108fc3ff95cf8a4f8cf459a41e9727	2	SHA256 (gtimer-2.0.0.tar.gz) = a2dd70793a5b1b4d497be0c4429b8e8cef6910497b6af8fbdedff00764308458
3	SIZE (gtimer-1.1.6.tar.bz2) = 98953	3	SIZE (gtimer-2.0.0.tar.gz) = 199961




--- annotate.c.orig	Fri Dec 30 18:15:44 2005
+++ annotate.c	Fri Dec 30 18:15:57 2005
@@ -95,9 +95,9 @@
     len = GTK_TEXT ( td->text )->gap_position;
     str = (char *) malloc ( len + 1 );
 #if GTK_VERSION < 10100
-    strncpy ( str, (char *) GTK_TEXT ( td->text )->text, len );
+    strncpy ( str, (char *) &GTK_TEXT ( td->text )->text, len );
 #else
-    strncpy ( str, (char *) GTK_TEXT ( td->text )->text.wc, len );
+    strncpy ( str, (char *) &GTK_TEXT ( td->text )->text.wc, len );
 #endif
     str[len] = '\0';
     if ( strlen ( str ) )

Lines 1-11 Link Here

(-)deskutils/gtimer/files/patch-fix-version (-11 lines)
1	--- configure.orig Fri Dec 30 18:01:56 2005
2	+++ configure Fri Dec 30 18:02:16 2005
3	@@ -701,7 +701,7 @@
4
5	PACKAGE=gtimer
6
7	-VERSION=1.1.2
8	+VERSION=1.1.6
9
10	if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
11	{ echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }




--- main.c.orig	Fri Dec 30 18:29:18 2005
+++ main.c	Fri Dec 30 18:30:02 2005
@@ -2455,10 +2455,12 @@
   task_list = create_list_column_def ( 4, task_list_columns );
   gtk_clist_set_selection_mode (GTK_CLIST (task_list), GTK_SELECTION_BROWSE);
   gtk_widget_set_usize (GTK_WIDGET (task_list), 350, 150);
+/*
 #if GTK_VERSION < 10100
   gtk_clist_set_policy (GTK_CLIST (task_list),
     GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 #endif
+*/
   gtk_signal_connect (GTK_OBJECT (task_list), "click_column",
     GTK_SIGNAL_FUNC (column_selected_callback), NULL);
   gtk_signal_connect (GTK_OBJECT (task_list), "event",

Lines 1-10 Link Here

(-)deskutils/gtimer/files/patch-malloc (-10 lines)
1	--- task.c.orig Thu Mar 9 07:27:50 2000
2	+++ task.c Sat Apr 29 14:35:16 2000
3	@@ -54,7 +54,6 @@
4	#include <dirent.h>
5	#endif
6	#include <errno.h>
7	-#include <malloc.h>
8	#include <string.h>
9	#include <ctype.h>
10	#include <sys/types.h>

Return to bug 146670

Lines 6-33 Link Here

(-)deskutils/gtimer/Makefile (-13 / +41 lines)
6	#	6	#
7		7
8	PORTNAME= gtimer	8	PORTNAME= gtimer
9	PORTVERSION= 1.1.6	9	PORTVERSION= 2.0.0
10	PORTREVISION= 4
11	CATEGORIES= deskutils	10	CATEGORIES= deskutils
12	MASTER_SITES= http://www.k5n.us/files/ \	11	MASTER_SITES= SF/${PORTNAME}/${PORTVERSION}
13	http://www.cknudsen.com/gtimer/
14		12
15	MAINTAINER= ports@FreeBSD.org	13	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A timer for your personal activities	14	COMMENT= A timer for your personal activities
17		15
18	USE_BZIP2= yes	16	RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
		17
		18	USE_XORG= xscrnsaver
		19	USE_GNOME= gtk20
		20	USE_PERL5_BUILD=yes
		21	USE_GETTEXT= yes
19	USE_GMAKE= yes	22	USE_GMAKE= yes
20	USE_GNOME= gtk12
21	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
		24	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
22		25
23	MAN1= gtimer.1	26	MAN1= ${PORTNAME}.1
24	PLIST_FILES= bin/gtimer	27	PLIST_FILES= bin/${PORTNAME} \
		28	share/locale/cs/LC_MESSAGES/${PORTNAME}.mo \
		29	share/locale/cz/LC_MESSAGES/${PORTNAME}.mo \
		30	share/locale/es/LC_MESSAGES/${PORTNAME}.mo \
		31	share/locale/fr/LC_MESSAGES/${PORTNAME}.mo \
		32	share/locale/sv/LC_MESSAGES/${PORTNAME}.mo
25		33
26	post-patch:	34	CPPFLAGS= -I${LOCALBASE}/include
27	@${REINPLACE_CMD} -e 's\|malloc\.h\|stdlib.h\|g' \	35	LDFLAGS= -L${LOCALBASE}/lib
28	${WRKSRC}/project.c
29		36
30	post-install:	37	post-patch:
31	@${INSTALL_MAN} ${WRKSRC}/gtimer.1 ${PREFIX}/man/man1	38	@${REINPLACE_CMD} -e 's\|1.1.7\|${PORTVERSION}\|g' ${WRKSRC}/configure
		39	@${REINPLACE_CMD} -e 's\|"sensible-browser"\|"xdg-open"\|g' ${WRKSRC}/config.h
		40	.for file in project.c task.c
		41	@${REINPLACE_CMD} -e 's\|<malloc\.h>\|<stdlib.h>\|g' ${WRKSRC}/${file}
		42	.endfor
		43
		44	pre-build:
		45	@(cd ${WRKSRC} && ${PERL} ./txt2h.pl < ChangeLog > changelog.h)
		46
		47	post-build:
		48	.for lang in cs cz es fr sv
		49	cd ${WRKSRC}/po && ${LOCALBASE}/bin/msgfmt -o ${lang}.mo ${lang}.po
		50	.endfor
		51
		52	do-install:
		53	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
		54	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${MANPREFIX}/man/man1
		55	.for lang in cs cz es fr sv
		56	@${MKDIR} ${PREFIX}/share/locale/${lang}/LC_MESSAGES
		57	${INSTALL_DATA} ${WRKSRC}/po/${lang}.mo \
		58	${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
		59	.endfor
32		60
33	.include <bsd.port.mk>	61	.include <bsd.port.mk>

Lines 1-14 Link Here

(-)deskutils/gtimer/files/patch-annotation (-14 lines)
1	--- annotate.c.orig Fri Dec 30 18:15:44 2005
2	+++ annotate.c Fri Dec 30 18:15:57 2005
3	@@ -95,9 +95,9 @@
4	len = GTK_TEXT ( td->text )->gap_position;
5	str = (char *) malloc ( len + 1 );
6	#if GTK_VERSION < 10100
7	- strncpy ( str, (char *) GTK_TEXT ( td->text )->text, len );
8	+ strncpy ( str, (char *) &GTK_TEXT ( td->text )->text, len );
9	#else
10	- strncpy ( str, (char *) GTK_TEXT ( td->text )->text.wc, len );
11	+ strncpy ( str, (char *) &GTK_TEXT ( td->text )->text.wc, len );
12	#endif
13	str[len] = '\0';
14	if ( strlen ( str ) )

Lines 1-15 Link Here

(-)deskutils/gtimer/files/patch-gtk (-15 lines)
1	--- main.c.orig Fri Dec 30 18:29:18 2005
2	+++ main.c Fri Dec 30 18:30:02 2005
3	@@ -2455,10 +2455,12 @@
4	task_list = create_list_column_def ( 4, task_list_columns );
5	gtk_clist_set_selection_mode (GTK_CLIST (task_list), GTK_SELECTION_BROWSE);
6	gtk_widget_set_usize (GTK_WIDGET (task_list), 350, 150);
7	+/*
8	#if GTK_VERSION < 10100
9	gtk_clist_set_policy (GTK_CLIST (task_list),
10	GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
11	#endif
12	+*/
13	gtk_signal_connect (GTK_OBJECT (task_list), "click_column",
14	GTK_SIGNAL_FUNC (column_selected_callback), NULL);
15	gtk_signal_connect (GTK_OBJECT (task_list), "event",