On Fri, Nov 25, 2005 at 11:21:35AM +0100, Aleksander Piotrowski wrote:
> steven mestdagh <[EMAIL PROTECTED]> wrote:
>
> > Yes, I tested sparc64 and i386, didn't spot any problems with it, but I
> > don't use this program. Can someone ok this diff?
>
> Basically looks OK.
>
> But please take a look at this:
>
> if cc -DHAVE_CONFIG_H -I. -I. -I../.. -I../.. -I../../intl
> -I/usr/local/include -pthread -I/usr/local/include/gtk-2.0
> [...]
> -DGTK_IS_2_2 -DGTK_ATLEAST_2_4 -DGTK_ATLEAST_2_6 -O6 -Wformat -Wbounded
> -MT cr-statement.o -MD -MP -MF ".deps/cr-statement.Tpo" -c -o
> cr-statement.o cr-statement.c; then mv -f ".deps/cr-statement.Tpo"
> ".deps/cr-statement.Po"; else rm -f ".deps/cr-statement.Tpo"; exit 1; fi
> [...]
>
> See? cssed is including its own libintl headers -- -I../../intl. Does
> it make sense? Not for me.
no this does not make sense, the directory does not seem present but I
patched it away anyway. ok like this?
diff -uNr -x CVS www/cssed/Makefile mystuff/www/cssed/Makefile
--- www/cssed/Makefile Wed Nov 16 09:53:32 2005
+++ mystuff/www/cssed/Makefile Fri Nov 25 12:27:38 2005
@@ -2,9 +2,8 @@
COMMENT= "CSS editor"
-DISTNAME= cssed-0.3.0
-PKGNAME= ${DISTNAME}p1
-CATEGORIES= www
+DISTNAME= cssed-0.4.0
+CATEGORIES= www editors
HOMEPAGE= http://cssed.sourceforge.net/
@@ -19,19 +18,22 @@
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cssed/}
WANTLIB= c freetype pthread stdc++ m X11 fontconfig \
- gthread-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
- gobject-2.0.0.0 atk-1.0.0.0 cairo pango-1.0.0.0 \
- pangocairo-1.0.0.0 pangoft2-1.0.0.0
+ z gthread-2.0.0.0 glib-2.0.0.0 gmodule-2.0.0.0 \
+ gobject-2.0.0.0 pangoft2-1.0.0.0 cairo \
+ pangocairo-1.0.0.0 pango-1.0.0.0 atk-1.0.0.0
BUILD_DEPENDS= :pkgconfig-*:devel/pkgconfig
LIB_DEPENDS=
gtk-x11-2.0.600.10,gdk_pixbuf-2.0.600.0,gdk-x11-2.0.600.0::x11/gtk+2 \
- expat.4::textproc/expat
+ xml2.8::textproc/libxml
MODULES= devel/gettext
CONFIGURE_STYLE=gnu
-CONFIGURE_ENV= CPPFLAGS="${CFLAGS} -I${LOCALBASE}/include" \
+CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=--with-help-menus
+CONFIGURE_ARGS= --with-help-menus \
+ --with-plugin-headers \
+ --without-terminal \
+ --without-ipc-queue
.include <bsd.port.mk>
diff -uNr -x CVS www/cssed/distinfo mystuff/www/cssed/distinfo
--- www/cssed/distinfo Sat Oct 22 14:37:32 2005
+++ mystuff/www/cssed/distinfo Thu Nov 24 14:43:31 2005
@@ -1,4 +1,4 @@
-MD5 (cssed-0.3.0.tar.gz) = 667632e3c5f7f3493a2d98cc47470209
-RMD160 (cssed-0.3.0.tar.gz) = cb8735852c6405186fd91f3e96eb96d5ba04bc22
-SHA1 (cssed-0.3.0.tar.gz) = f6723ed25b7601a7aa9f17723449b953c59552da
-SIZE (cssed-0.3.0.tar.gz) = 872421
+MD5 (cssed-0.4.0.tar.gz) = ff7c818d1f819b7d76b4f714be64e08e
+RMD160 (cssed-0.4.0.tar.gz) = 91bd22facdf40298d54bac83cc126740a1a077d8
+SHA1 (cssed-0.4.0.tar.gz) = 98ca1bcca97ee22516ca18ebfd832a48efb80e77
+SIZE (cssed-0.4.0.tar.gz) = 1457946
diff -uNr -x CVS www/cssed/patches/patch-libcroco_parser_Makefile_in
mystuff/www/cssed/patches/patch-libcroco_parser_Makefile_in
--- www/cssed/patches/patch-libcroco_parser_Makefile_in Thu Jan 1 01:00:00 1970
+++ mystuff/www/cssed/patches/patch-libcroco_parser_Makefile_in Fri Nov 25
12:02:04 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libcroco/parser/Makefile.in.orig Fri Nov 25 12:01:19 2005
++++ libcroco/parser/Makefile.in Fri Nov 25 12:01:30 2005
+@@ -228,7 +228,7 @@ cr-tknzr.c \
+ *.h
+
+ libcroco_a_SOURCES = $(SRCS)
+-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/intl
++INCLUDES = -I$(top_srcdir)
+ all: all-am
+
+ .SUFFIXES:
diff -uNr -x CVS www/cssed/patches/patch-libcroco_parser_cr-om-parser_c
mystuff/www/cssed/patches/patch-libcroco_parser_cr-om-parser_c
--- www/cssed/patches/patch-libcroco_parser_cr-om-parser_c Thu Jan 1
01:00:00 1970
+++ mystuff/www/cssed/patches/patch-libcroco_parser_cr-om-parser_c Fri Nov
25 12:03:19 2005
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- libcroco/parser/cr-om-parser.c.orig Fri Nov 25 11:11:15 2005
++++ libcroco/parser/cr-om-parser.c Fri Nov 25 11:15:54 2005
+@@ -1006,7 +1006,7 @@ cr_om_parser_parse_paths_to_cascade (CRO
+
+ g_return_val_if_fail (a_this, CR_BAD_PARAM_ERROR);
+
+- memset (sheets, 0, sizeof (CRStyleSheet) * 3);
++ memset (sheets, 0, sizeof (sheets));
+ paths[0] = (guchar *) a_author_path;
+ paths[1] = (guchar *) a_user_path;
+ paths[2] = (guchar *) a_ua_path;
diff -uNr -x CVS www/cssed/pkg/PLIST mystuff/www/cssed/pkg/PLIST
--- www/cssed/pkg/PLIST Sat Oct 22 14:37:32 2005
+++ mystuff/www/cssed/pkg/PLIST Thu Nov 24 14:51:06 2005
@@ -47,6 +47,7 @@
share/cssed/pixmaps/validate_dump.png
share/cssed/pixmaps/validate_dump_menu.png
share/cssed/pixmaps/validate_menu.png
+share/locale/ca/LC_MESSAGES/cssed.mo
share/locale/de/LC_MESSAGES/cssed.mo
share/locale/es/LC_MESSAGES/cssed.mo
share/locale/fr/LC_MESSAGES/cssed.mo
Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm
