Index: head/www/gtkhtml/Makefile
===================================================================
--- head/www/gtkhtml/Makefile (revision 71835)
+++ head/www/gtkhtml/Makefile (revision 71836)
@@ -1,56 +1,56 @@
# New ports collection makefile for: gtkhtml
# Date created: 2nd June 2000
# Whom: Ade Lovett
#
# $FreeBSD$
#
PORTNAME= gtkhtml
PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMENG= yes
USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-gconf=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
VERSION= ${PORTNAME}-${PORTVERSION}
.include
.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
LIB_DEPENDS+= soup.5:${PORTSDIR}/devel/soup
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
post-configure:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g ; \
s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \
> ${WRKSRC}/gtkhtmlConf.sh
post-install:
${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
${PREFIX}/etc/gtkhtmlConf.sh
.include
Property changes on: head/www/gtkhtml/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.54
\ No newline at end of property
+1.55
\ No newline at end of property
Index: head/www/gtkhtml/files/patch-src_gtkhtml.c
===================================================================
--- head/www/gtkhtml/files/patch-src_gtkhtml.c (nonexistent)
+++ head/www/gtkhtml/files/patch-src_gtkhtml.c (revision 71836)
@@ -0,0 +1,37 @@
+--- src/gtkhtml.c.orig Tue Nov 5 15:56:58 2002
++++ src/gtkhtml.c Tue Dec 17 12:29:33 2002
+@@ -1653,9 +1653,9 @@
+ be = swap ? be : !be;
+
+ if (be)
+- return "ucs2-be";
++ return "ucs-2be";
+ else
+- return "ucs2-le";
++ return "ucs-2le";
+
+ }
+
+@@ -1733,7 +1733,7 @@
+ html_object_save (selection_object, state);
+
+ d_s (g_warning ("text/html buffer = %s", buffer->str);)
+- selection_string = e_utf8_to_charset_string_sized ("ucs2", buffer->str, buffer->len);
++ selection_string = e_utf8_to_charset_string_sized ("ucs-2", buffer->str, buffer->len);
+
+ if (selection_string)
+ gtk_selection_data_set (selection_data,
+@@ -1897,11 +1897,11 @@
+ len -= 2;
+ break;
+ default:
+- tocode = "ucs2";
++ tocode = ucs2_order(1);
+ break;
+ }
+
+- utf8 = e_utf8_from_charset_string_sized ("ucs2",
++ utf8 = e_utf8_from_charset_string_sized (tocode,
+ data,
+ len);
+
Property changes on: head/www/gtkhtml/files/patch-src_gtkhtml.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/gtkhtml3/Makefile
===================================================================
--- head/www/gtkhtml3/Makefile (revision 71835)
+++ head/www/gtkhtml3/Makefile (revision 71836)
@@ -1,56 +1,56 @@
# New ports collection makefile for: gtkhtml
# Date created: 2nd June 2000
# Whom: Ade Lovett
#
# $FreeBSD$
#
PORTNAME= gtkhtml
PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMENG= yes
USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-gconf=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
VERSION= ${PORTNAME}-${PORTVERSION}
.include
.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
LIB_DEPENDS+= soup.5:${PORTSDIR}/devel/soup
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
post-configure:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g ; \
s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \
> ${WRKSRC}/gtkhtmlConf.sh
post-install:
${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
${PREFIX}/etc/gtkhtmlConf.sh
.include
Property changes on: head/www/gtkhtml3/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.54
\ No newline at end of property
+1.55
\ No newline at end of property
Index: head/www/gtkhtml3/files/patch-src_gtkhtml.c
===================================================================
--- head/www/gtkhtml3/files/patch-src_gtkhtml.c (nonexistent)
+++ head/www/gtkhtml3/files/patch-src_gtkhtml.c (revision 71836)
@@ -0,0 +1,37 @@
+--- src/gtkhtml.c.orig Tue Nov 5 15:56:58 2002
++++ src/gtkhtml.c Tue Dec 17 12:29:33 2002
+@@ -1653,9 +1653,9 @@
+ be = swap ? be : !be;
+
+ if (be)
+- return "ucs2-be";
++ return "ucs-2be";
+ else
+- return "ucs2-le";
++ return "ucs-2le";
+
+ }
+
+@@ -1733,7 +1733,7 @@
+ html_object_save (selection_object, state);
+
+ d_s (g_warning ("text/html buffer = %s", buffer->str);)
+- selection_string = e_utf8_to_charset_string_sized ("ucs2", buffer->str, buffer->len);
++ selection_string = e_utf8_to_charset_string_sized ("ucs-2", buffer->str, buffer->len);
+
+ if (selection_string)
+ gtk_selection_data_set (selection_data,
+@@ -1897,11 +1897,11 @@
+ len -= 2;
+ break;
+ default:
+- tocode = "ucs2";
++ tocode = ucs2_order(1);
+ break;
+ }
+
+- utf8 = e_utf8_from_charset_string_sized ("ucs2",
++ utf8 = e_utf8_from_charset_string_sized (tocode,
+ data,
+ len);
+
Property changes on: head/www/gtkhtml3/files/patch-src_gtkhtml.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Index: head/www/gtkhtml38/Makefile
===================================================================
--- head/www/gtkhtml38/Makefile (revision 71835)
+++ head/www/gtkhtml38/Makefile (revision 71836)
@@ -1,56 +1,56 @@
# New ports collection makefile for: gtkhtml
# Date created: 2nd June 2000
# Whom: Ade Lovett
#
# $FreeBSD$
#
PORTNAME= gtkhtml
PORTVERSION= 1.1.6
-PORTREVISION= 1
+PORTREVISION= 2
CATEGORIES= www gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
MASTER_SITE_SUBDIR= sources/${PORTNAME}/1.1
DIST_SUBDIR= gnome
MAINTAINER= gnome@FreeBSD.org
LIB_DEPENDS= pspell.15:${PORTSDIR}/textproc/aspell
USE_BZIP2= yes
USE_X_PREFIX= yes
USE_GMAKE= yes
USE_GNOMENG= yes
USE_GNOME= gnomehack gnomeprefix gnomehier glibwww libghttp libcapplet gal
INSTALLS_SHLIB= yes
USE_LIBTOOL= yes
USE_REINPLACE= yes
CONFIGURE_ARGS= --with-gconf=yes
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LIBS="-L${LOCALBASE}/lib"
CONFIGURE_TARGET= --target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
VERSION= ${PORTNAME}-${PORTVERSION}
.include
.if exists(${LOCALBASE}/libdata/pkgconfig/soup.pc) || !defined(WITHOUT_SOUP)
LIB_DEPENDS+= soup.5:${PORTSDIR}/devel/soup
.endif
post-patch:
@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
post-configure:
@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
s|%%LOCALBASE%%|${LOCALBASE}|g ; \
s|%%X11BASE%%|${X11BASE}|g ; \
s|%%VERSION%%|${VERSION}|g' ${FILESDIR}/gtkhtmlConf.sh \
> ${WRKSRC}/gtkhtmlConf.sh
post-install:
${INSTALL_DATA} ${WRKSRC}/gtkhtmlConf.sh \
${PREFIX}/etc/gtkhtmlConf.sh
.include
Property changes on: head/www/gtkhtml38/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.54
\ No newline at end of property
+1.55
\ No newline at end of property
Index: head/www/gtkhtml38/files/patch-src_gtkhtml.c
===================================================================
--- head/www/gtkhtml38/files/patch-src_gtkhtml.c (nonexistent)
+++ head/www/gtkhtml38/files/patch-src_gtkhtml.c (revision 71836)
@@ -0,0 +1,37 @@
+--- src/gtkhtml.c.orig Tue Nov 5 15:56:58 2002
++++ src/gtkhtml.c Tue Dec 17 12:29:33 2002
+@@ -1653,9 +1653,9 @@
+ be = swap ? be : !be;
+
+ if (be)
+- return "ucs2-be";
++ return "ucs-2be";
+ else
+- return "ucs2-le";
++ return "ucs-2le";
+
+ }
+
+@@ -1733,7 +1733,7 @@
+ html_object_save (selection_object, state);
+
+ d_s (g_warning ("text/html buffer = %s", buffer->str);)
+- selection_string = e_utf8_to_charset_string_sized ("ucs2", buffer->str, buffer->len);
++ selection_string = e_utf8_to_charset_string_sized ("ucs-2", buffer->str, buffer->len);
+
+ if (selection_string)
+ gtk_selection_data_set (selection_data,
+@@ -1897,11 +1897,11 @@
+ len -= 2;
+ break;
+ default:
+- tocode = "ucs2";
++ tocode = ucs2_order(1);
+ break;
+ }
+
+- utf8 = e_utf8_from_charset_string_sized ("ucs2",
++ utf8 = e_utf8_from_charset_string_sized (tocode,
+ data,
+ len);
+
Property changes on: head/www/gtkhtml38/files/patch-src_gtkhtml.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property