Attachment 106116 Details for Bug 146670 – file.diff

[patch] file.diff

file.diff (text/plain), 5.60 KB, created by tkato432 on 2010-05-17 21:20:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2010-05-17 21:20:04 UTC

Size: 5.60 KB

patch

obsolete

>diff -urN /usr/ports/deskutils/gtimer/Makefile deskutils/gtimer/Makefile
>--- /usr/ports/deskutils/gtimer/Makefile	2008-06-07 00:19:49.000000000 +0900
>+++ deskutils/gtimer/Makefile	2010-04-01 01:12:32.000000000 +0900
>@@ -6,28 +6,56 @@
> #
> 
> PORTNAME=	gtimer
>-PORTVERSION=	1.1.6
>-PORTREVISION=	4
>+PORTVERSION=	2.0.0
> CATEGORIES=	deskutils
>-MASTER_SITES=	http://www.k5n.us/files/ \
>-		http://www.cknudsen.com/gtimer/
>+MASTER_SITES=	SF/${PORTNAME}/${PORTVERSION}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A timer for your personal activities
> 
>-USE_BZIP2=	yes
>+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=		gtimer.1
>-PLIST_FILES=	bin/gtimer
>+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
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|malloc\.h|stdlib.h|g' \
>-		${WRKSRC}/project.c
>+CPPFLAGS=	-I${LOCALBASE}/include
>+LDFLAGS=	-L${LOCALBASE}/lib
> 
>-post-install:
>-	@${INSTALL_MAN} ${WRKSRC}/gtimer.1 ${PREFIX}/man/man1
>+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>
>diff -urN /usr/ports/deskutils/gtimer/distinfo deskutils/gtimer/distinfo
>--- /usr/ports/deskutils/gtimer/distinfo	2006-01-01 03:03:27.000000000 +0900
>+++ deskutils/gtimer/distinfo	2010-03-29 05:55:13.000000000 +0900
>@@ -1,3 +1,3 @@
>-MD5 (gtimer-1.1.6.tar.bz2) = dd129daf0046ca4de05c67456989d226
>-SHA256 (gtimer-1.1.6.tar.bz2) = 8e6738ddb02803a3af3af50ead427b7a08108fc3ff95cf8a4f8cf459a41e9727
>-SIZE (gtimer-1.1.6.tar.bz2) = 98953
>+MD5 (gtimer-2.0.0.tar.gz) = 1cc0ff18f566b5e497dc34ad9627b062
>+SHA256 (gtimer-2.0.0.tar.gz) = a2dd70793a5b1b4d497be0c4429b8e8cef6910497b6af8fbdedff00764308458
>+SIZE (gtimer-2.0.0.tar.gz) = 199961
>diff -urN /usr/ports/deskutils/gtimer/files/patch-annotation deskutils/gtimer/files/patch-annotation
>--- /usr/ports/deskutils/gtimer/files/patch-annotation	2006-01-01 03:03:28.000000000 +0900
>+++ deskutils/gtimer/files/patch-annotation	1970-01-01 09:00:00.000000000 +0900
>@@ -1,14 +0,0 @@
>---- 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 ) )
>diff -urN /usr/ports/deskutils/gtimer/files/patch-fix-version deskutils/gtimer/files/patch-fix-version
>--- /usr/ports/deskutils/gtimer/files/patch-fix-version	2006-01-01 03:03:28.000000000 +0900
>+++ deskutils/gtimer/files/patch-fix-version	1970-01-01 09:00:00.000000000 +0900
>@@ -1,11 +0,0 @@
>---- configure.orig	Fri Dec 30 18:01:56 2005
>-+++ configure	Fri Dec 30 18:02:16 2005
>-@@ -701,7 +701,7 @@
>- 
>- PACKAGE=gtimer
>- 
>--VERSION=1.1.2
>-+VERSION=1.1.6
>- 
>- if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
>-   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
>diff -urN /usr/ports/deskutils/gtimer/files/patch-gtk deskutils/gtimer/files/patch-gtk
>--- /usr/ports/deskutils/gtimer/files/patch-gtk	2006-01-01 03:03:28.000000000 +0900
>+++ deskutils/gtimer/files/patch-gtk	1970-01-01 09:00:00.000000000 +0900
>@@ -1,15 +0,0 @@
>---- 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",
>diff -urN /usr/ports/deskutils/gtimer/files/patch-malloc deskutils/gtimer/files/patch-malloc
>--- /usr/ports/deskutils/gtimer/files/patch-malloc	2006-01-01 03:03:28.000000000 +0900
>+++ deskutils/gtimer/files/patch-malloc	1970-01-01 09:00:00.000000000 +0900
>@@ -1,10 +0,0 @@
>---- task.c.orig	Thu Mar  9 07:27:50 2000
>-+++ task.c	Sat Apr 29 14:35:16 2000
>-@@ -54,7 +54,6 @@
>- #include <dirent.h>
>- #endif
>- #include <errno.h>
>--#include <malloc.h>
>- #include <string.h>
>- #include <ctype.h>
>- #include <sys/types.h>

Actions: View | Diff

Attachments on bug 146670: 106116