ports/100927: [PATCH] lang/lafontaine: update to 0.4.1, take maintainership
Stanislav Sedov
ssedov at mbsd.msk.ru
Thu Jul 27 19:10:17 UTC 2006
>Number: 100927
>Category: ports
>Synopsis: [PATCH] lang/lafontaine: update to 0.4.1, take maintainership
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Jul 27 19:10:15 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Stanislav Sedov
>Release: FreeBSD 7.0-CURRENT i386
>Organization:
MBSD labs, Inc.
>Environment:
System: FreeBSD fonon.realnet 7.0-CURRENT FreeBSD 7.0-CURRENT #7: Sun Jun 18 20:51:36 MSD 2006
>Description:
- Update to 0.4.1
- Introduce NLS magic
- Take maintainership
Added file(s):
- files/patch-configure
- files/patch-src_lexer.en.l
- files/patch-src_lexer.fr.l
- files/patch-src_main.c
- files/patch-src_proc.c
- files/patch-src_rc.c
Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:
--- lafontaine-0.4.1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/Makefile /var/tmp/lafontaine/Makefile
--- /usr/ports/lang/lafontaine/Makefile Wed May 10 00:52:16 2006
+++ /var/tmp/lafontaine/Makefile Thu Jul 27 22:59:36 2006
@@ -7,35 +7,28 @@
#
PORTNAME= lafontaine
-PORTVERSION= 0.3R3
-PORTREVISION= 2
+PORTVERSION= 0.4.1
+PORTREVISION= 0
CATEGORIES= lang
MASTER_SITES= http://www.nongnu.org/lafontaine/archives/
-DISTNAME= ${PORTNAME}-${PORTVERSION}-20020715
+DISTNAME= ${PORTNAME}_0.4-1
-MAINTAINER= ports at FreeBSD.org
+MAINTAINER= ssedov at mbsd.msk.ru
COMMENT= Graphical logo interpreter
-WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
+WRKSRC= ${WRKDIR}/${PORTNAME}-0.4
-USE_BZIP2= yes
-USE_GNOME= gdkpixbuf gnometarget
+USE_X_PREFIX= yes
+USE_GNOME= gnomehack gnometarget gtk20
USE_GMAKE= yes
GNU_CONFIGURE= yes
-MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
- AUTOHEADER="${TRUE}"
-post-patch:
- @${REINPLACE_CMD} -e 's|pixmaps/$$PACKAGE|$$PACKAGE|g ; \
- s|-O3|$$CFLAGS|g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e \
- 's|"\./pixmaps/|PIXMAPDIR "/|g' ${WRKSRC}/src/callbacks.c
- @${REINPLACE_CMD} -e \
- 's|exit()|exit(0)|g' ${WRKSRC}/src/proc.c
- @${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
- 's|/share/pixmaps|/share|g'
-.for file in src/lexer.en.l src/lexer.fr.l
- @${REINPLACE_CMD} -e 's|\.##|.|g' ${WRKSRC}/${file}
-.endfor
+.if !defined(WITHOUT_NLS)
+USE_GETTEXT= yes
+PLIST_SUB+= NLS=""
+.else
+CONFIGURE_ARGS= --disable-nls
+PLIST_SUB+= NLS="@comment "
+.endif
.include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/distinfo /var/tmp/lafontaine/distinfo
--- /usr/ports/lang/lafontaine/distinfo Fri Nov 25 03:33:36 2005
+++ /var/tmp/lafontaine/distinfo Thu Jul 27 22:36:52 2006
@@ -1,3 +1,3 @@
-MD5 (lafontaine-0.3R3-20020715.tar.bz2) = 77e06e8b5acafa9cd210090afece8c00
-SHA256 (lafontaine-0.3R3-20020715.tar.bz2) = fe65fd4e69939a0c232679ef777838d4fad3f342475bc1a422dc1cfd393b36d7
-SIZE (lafontaine-0.3R3-20020715.tar.bz2) = 233738
+MD5 (lafontaine_0.4-1.tar.gz) = 6d47af1cf65c183487cd0ad2c803dd48
+SHA256 (lafontaine_0.4-1.tar.gz) = 9741e9fefc2b36fe858085d58684293d15a3bc379085acffc4cd479908d82d1e
+SIZE (lafontaine_0.4-1.tar.gz) = 510463
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/files/patch-configure /var/tmp/lafontaine/files/patch-configure
--- /usr/ports/lang/lafontaine/files/patch-configure Thu Jan 1 03:00:00 1970
+++ /var/tmp/lafontaine/files/patch-configure Thu Jul 27 22:52:51 2006
@@ -0,0 +1,12 @@
+--- configure.orig Thu Jul 27 22:51:55 2006
++++ configure Thu Jul 27 22:52:37 2006
+@@ -5630,9 +5630,6 @@
+ done
+ test -n "$YACC" || YACC="yacc"
+
+-# default CC options
+-CFLAGS="-O3"
+-
+ # debugging option
+ # Check whether --enable-debug or --disable-debug was given.
+ if test "${enable_debug+set}" = set; then
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/files/patch-src_lexer.en.l /var/tmp/lafontaine/files/patch-src_lexer.en.l
--- /usr/ports/lang/lafontaine/files/patch-src_lexer.en.l Thu Jan 1 03:00:00 1970
+++ /var/tmp/lafontaine/files/patch-src_lexer.en.l Thu Jul 27 22:46:17 2006
@@ -0,0 +1,11 @@
+--- src/lexer.en.l.bak Tue Jul 16 06:15:12 2002
++++ src/lexer.en.l Thu Jul 27 22:45:32 2006
+@@ -70,7 +70,7 @@
+ #define IS_TOK_WITH_VAL(tok, type, val) \
+ { \
+ lextxt = yylex; \
+- yylval.##type = val; \
++ yylval.type = val; \
+ return(tok); \
+ }
+ #endif
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/files/patch-src_lexer.fr.l /var/tmp/lafontaine/files/patch-src_lexer.fr.l
--- /usr/ports/lang/lafontaine/files/patch-src_lexer.fr.l Thu Jan 1 03:00:00 1970
+++ /var/tmp/lafontaine/files/patch-src_lexer.fr.l Thu Jul 27 22:46:26 2006
@@ -0,0 +1,11 @@
+--- src/lexer.fr.l.bak Tue Aug 6 15:07:50 2002
++++ src/lexer.fr.l Thu Jul 27 22:45:32 2006
+@@ -73,7 +73,7 @@
+ #define IS_TOK_WITH_VAL(tok, type, val) \
+ { \
+ lextxt = yylex; \
+- yylval.##type = val; \
++ yylval.type = val; \
+ return(tok); \
+ }
+ #endif
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/files/patch-src_main.c /var/tmp/lafontaine/files/patch-src_main.c
--- /usr/ports/lang/lafontaine/files/patch-src_main.c Thu Jan 1 03:00:00 1970
+++ /var/tmp/lafontaine/files/patch-src_main.c Thu Jul 27 22:40:04 2006
@@ -0,0 +1,11 @@
+--- src/main.c.orig Thu Jul 27 22:39:02 2006
++++ src/main.c Thu Jul 27 22:39:28 2006
+@@ -41,6 +41,8 @@
+ guint _alloc_cnt, _free_cnt, _null_free_cnt;
+ #endif
+
++void turtle_init(struct s_turtle *);
++
+
+ /*gboolean test(gpointer nil)
+ {
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/files/patch-src_proc.c /var/tmp/lafontaine/files/patch-src_proc.c
--- /usr/ports/lang/lafontaine/files/patch-src_proc.c Thu Jan 1 03:00:00 1970
+++ /var/tmp/lafontaine/files/patch-src_proc.c Thu Jul 27 22:46:47 2006
@@ -0,0 +1,11 @@
+--- src/proc.c.bak Sun May 19 02:11:05 2002
++++ src/proc.c Thu Jul 27 22:45:32 2006
+@@ -92,7 +92,7 @@
+ /*g_critical*/
+ printf("procedure \"%s\" contexts list not empty !\n",
+ PROC(myproc)->name);
+- exit();
++ exit(0);
+ //g_slist_foreach(PROC(myproc)->contexts, context_free_from_list, NULL);
+ //g_slist_free(PROC(myproc)->contexts);
+ }
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/files/patch-src_rc.c /var/tmp/lafontaine/files/patch-src_rc.c
--- /usr/ports/lang/lafontaine/files/patch-src_rc.c Thu Jan 1 03:00:00 1970
+++ /var/tmp/lafontaine/files/patch-src_rc.c Thu Jul 27 22:43:54 2006
@@ -0,0 +1,39 @@
+--- src/rc.c.orig Thu Jul 27 22:40:17 2006
++++ src/rc.c Thu Jul 27 22:43:36 2006
+@@ -39,6 +39,12 @@
+ #include "rc.h"
+
+ struct s_turtle my_turtle;
++void rc_parse_group(GScanner *scanner);
++void rc_parse_coresave(GScanner *scanner);
++void rc_parse_history(GScanner *scanner);
++void rc_parse_locales(GScanner *scanner);
++void rc_parse_alocale(GScanner *scanner);
++void rc_parse_keyval(GScanner *scanner, struct s_keyval *keyval);
+
+
+ static const GScannerConfig gtk_rc_scanner_config =
+@@ -152,6 +158,7 @@
+ rc_parse_coresave(scanner);
+ break;
+ default:
++ break;
+ }
+
+ }
+@@ -176,6 +183,7 @@
+ printf("coredump file: %s\n", keyval.value);
+ break;
+ default:
++ break;
+ }
+ }
+
+@@ -203,6 +211,7 @@
+ printf("history file: %s\n", keyval.value);
+ break;
+ default:
++ break;
+ }
+ }
+
diff -ruN --exclude=CVS /usr/ports/lang/lafontaine/pkg-plist /var/tmp/lafontaine/pkg-plist
--- /usr/ports/lang/lafontaine/pkg-plist Wed Oct 23 13:10:45 2002
+++ /var/tmp/lafontaine/pkg-plist Thu Jul 27 22:47:59 2006
@@ -1,16 +1,18 @@
bin/lafontaine
-share/lafontaine/animator.png
-share/lafontaine/animator.xcf
-share/lafontaine/execute.xpm
-share/lafontaine/gypsum.flower.2.fr.logo
-share/lafontaine/gypsum.flower.fr.logo
-share/lafontaine/help.xpm
-share/lafontaine/open.xpm
-share/lafontaine/quit.xpm
-share/lafontaine/save.xpm
-share/lafontaine/spirelo.fr.logo
-share/lafontaine/stars.en.logo
-share/lafontaine/test1.logo
-share/lafontaine/turtle2.png
-share/lafontaine/turtle3.png
- at dirrm share/lafontaine
+%%DATADIR%%/gypsum.flower.2.fr.logo
+%%DATADIR%%/gypsum.flower.fr.logo
+%%DATADIR%%/spirelo.fr.logo
+%%DATADIR%%/stars.en.logo
+%%DATADIR%%/test1.logo
+%%NLS%%share/locale/fr/LC_MESSAGES/lafontaine.mo
+share/pixmaps/lafontaine/animator.png
+share/pixmaps/lafontaine/animator.xcf
+share/pixmaps/lafontaine/execute.xpm
+share/pixmaps/lafontaine/help.xpm
+share/pixmaps/lafontaine/open.xpm
+share/pixmaps/lafontaine/quit.xpm
+share/pixmaps/lafontaine/save.xpm
+share/pixmaps/lafontaine/turtle2.png
+share/pixmaps/lafontaine/turtle3.png
+ at dirrmtry share/pixmaps/lafontaine
+ at dirrmtry %%DATADIR%%
--- lafontaine-0.4.1.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
More information about the freebsd-ports-bugs
mailing list