View | Details | Raw Unified | Return to bug 96595 | Differences between
and this patch

Collapse All | Expand All

(-)distinfo (-6 / +3 lines)
Lines 1-6 Link Here
1
MD5 (dillo-0.8.5.tar.bz2) = d0ab7fa1d40b310deb891388604188f8
1
MD5 (dillo-0.8.6-i18n-misc-20060516.tar.bz2) = f7d498f8631dbb0ea41e6d068a041e0a
2
SHA256 (dillo-0.8.5.tar.bz2) = 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a
2
SHA256 (dillo-0.8.6-i18n-misc-20060516.tar.bz2) = 00eee492e80b480376de1a4bd2fb69bb6dd63faff5938ca9f775ee34712997ec
3
SIZE (dillo-0.8.5.tar.bz2) = 424795
3
SIZE (dillo-0.8.6-i18n-misc-20060516.tar.bz2) = 604864
4
MD5 (dillo-0.8.5-i18n-misc-20060105.diff.bz2) = 6e0fa2bc2dbd665799ae7107a22083ab
5
SHA256 (dillo-0.8.5-i18n-misc-20060105.diff.bz2) = f2afbec12c2c16284aedc42c9bc89a92455e6f949dfbc83d5f17609cc889be3e
6
SIZE (dillo-0.8.5-i18n-misc-20060105.diff.bz2) = 248443
(-)files/enable-ssl.patch (+10 lines)
Line 0 Link Here
1
--- dpi/https.c.orig	Sat Mar 25 16:46:48 2006
2
+++ dpi/https.c	Sat Mar 25 16:47:38 2006
3
@@ -62,7 +62,6 @@
4
 #include "dpiutil.h"
5
 
6
 #define ENABLE_SSL
7
-#undef ENABLE_SSL
8
 #ifdef ENABLE_SSL
9
 
10
 #include <openssl/ssl.h>
(-)files/patch-dpi-https.c (+18 lines)
Line 0 Link Here
1
--- dpi/https.c.orig	Sat Mar 25 16:49:59 2006
2
+++ dpi/https.c	Sat Mar 25 16:55:35 2006
3
@@ -655,13 +655,8 @@
4
       "<b>}</b>\n\n"
5
       "  <b>*** Dillo's prototype plugin for https support"
6
       " is disabled now ***</b>\n\n"
7
-      "  If you want to test this <b>alpha</b> support code, just remove\n"
8
-      "  line 65 from https.c, recompile and reinstall.\n\n"
9
-      "  (beware that this https support is very limited now)\n\n"
10
-      "  To use https and SSL, you must have \n"
11
-      "  the OpenSSL development libraries installed.  Check your\n"
12
-      "  O/S distribution provider, or check out\n"
13
-      "  <a href=\"http://www.openssl.org\">www.openssl.org</a>\n\n"
14
+      "  If you want to test this <b>alpha</b> support code, define\n"
15
+      "  WITH_DILLO_SSL in your make environment and rebuild the port.\n\n"
16
       "  --\n"
17
       "</pre></body></html>\n",
18
       http_query
(-)files/patch-configure (+112 lines)
Line 0 Link Here
1
--- configure.orig	Sun May 14 16:44:32 2006
2
+++ configure	Mon May 15 19:32:07 2006
3
@@ -309,7 +309,7 @@
4
 # include <unistd.h>
5
 #endif"
6
 
7
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot DLGUI_TRUE DLGUI_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB localedir GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP XFT_CONFIG PKG_CONFIG LIBJPEG_LIBS LIBJPEG_LDFLAGS LIBJPEG_CPPFLAGS LIBPNG_LIBS LIBPNG_CFLAGS LIBZ_LIBS LIBSSL_LIBS LIBPTHREAD_LIBS LIBPTHREAD_LDFLAGS LIBFLTK_CXXFLAGS LIBFLTK_LIBS src doc bin util lib LIBOBJS LTLIBOBJS'
8
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot DLGUI_TRUE DLGUI_FALSE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MKINSTALLDIRS MSGFMT GMSGFMT XGETTEXT MSGMERGE USE_NLS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB localedir GLIB_CONFIG GLIB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS FLTK2_CONFIG EGREP XFT_CONFIG LIBJPEG_LIBS LIBJPEG_LDFLAGS LIBJPEG_CPPFLAGS LIBPNG_LIBS LIBPNG_CFLAGS LIBZ_LIBS LIBSSL_LIBS LIBPTHREAD_LIBS LIBPTHREAD_LDFLAGS LIBFLTK_CXXFLAGS LIBFLTK_LIBS src doc bin util lib LIBOBJS LTLIBOBJS'
9
 ac_subst_files=''
10
 
11
 # Initialize some variables set by options.
12
@@ -1952,14 +1952,6 @@
13
 fi;
14
 
15
 
16
-if test x$enable_dlgui = xyes; then
17
-  DLGUI_TRUE=
18
-  DLGUI_FALSE='#'
19
-else
20
-  DLGUI_TRUE='#'
21
-  DLGUI_FALSE=
22
-fi
23
-
24
 # Check whether --enable-meta_refresh or --disable-meta_refresh was given.
25
 if test "${enable_meta_refresh+set}" = set; then
26
   enableval="$enable_meta_refresh"
27
@@ -6792,11 +6784,81 @@
28
   rm -f conf.gtktest
29
 
30
 
31
-    echo "$as_me:$LINENO: checking Hackish check for FLTK" >&5
32
-echo $ECHO_N "checking Hackish check for FLTK... $ECHO_C" >&6
33
-    LIBFLTK_CXXFLAGS=`fltk-config --cxxflags`
34
-    LIBFLTK_LIBS=`fltk-config --ldflags`
35
+if test "x$enable_dlgui" = "xyes"; then
36
+  for ac_prog in fltk2-config fltk-config
37
+do
38
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
39
+set dummy $ac_prog; ac_word=$2
40
+echo "$as_me:$LINENO: checking for $ac_word" >&5
41
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
42
+if test "${ac_cv_path_FLTK2_CONFIG+set}" = set; then
43
+  echo $ECHO_N "(cached) $ECHO_C" >&6
44
+else
45
+  case $FLTK2_CONFIG in
46
+  [\\/]* | ?:[\\/]*)
47
+  ac_cv_path_FLTK2_CONFIG="$FLTK2_CONFIG" # Let the user override the test with a path.
48
+  ;;
49
+  *)
50
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
51
+for as_dir in $PATH
52
+do
53
+  IFS=$as_save_IFS
54
+  test -z "$as_dir" && as_dir=.
55
+  for ac_exec_ext in '' $ac_executable_extensions; do
56
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
57
+    ac_cv_path_FLTK2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
58
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
59
+    break 2
60
+  fi
61
+done
62
+done
63
+
64
+  ;;
65
+esac
66
+fi
67
+FLTK2_CONFIG=$ac_cv_path_FLTK2_CONFIG
68
+
69
+if test -n "$FLTK2_CONFIG"; then
70
+  echo "$as_me:$LINENO: result: $FLTK2_CONFIG" >&5
71
+echo "${ECHO_T}$FLTK2_CONFIG" >&6
72
+else
73
+  echo "$as_me:$LINENO: result: no" >&5
74
+echo "${ECHO_T}no" >&6
75
+fi
76
+
77
+  test -n "$FLTK2_CONFIG" && break
78
+done
79
+test -n "$FLTK2_CONFIG" || FLTK2_CONFIG="NOTFOUND"
80
 
81
+  if test "x$FLTK2_CONFIG" != "xNOTFOUND" && test -x "$FLTK2_CONFIG"; then
82
+    fltk_version=`$FLTK2_CONFIG --version`
83
+    case "$fltk_version" in
84
+      2.*)
85
+        LIBFLTK_CXXFLAGS=`$FLTK2_CONFIG --cxxflags`
86
+        LIBFLTK_LIBS=`$FLTK2_CONFIG --ldflags`
87
+        fltk2_ok="yes"
88
+        ;;
89
+      *)
90
+        echo "$as_me:$LINENO: result: need fltk2 -- disabling fltk support" >&5
91
+echo "${ECHO_T}need fltk2 -- disabling fltk support" >&6
92
+        fltk2_ok="no"
93
+        ;;
94
+    esac
95
+  else
96
+    fltk2_ok="no"
97
+  fi
98
+else
99
+  fltk2_ok="no"
100
+fi
101
+
102
+
103
+if test x$fltk2_ok = xyes; then
104
+  DLGUI_TRUE=
105
+  DLGUI_FALSE='#'
106
+else
107
+  DLGUI_TRUE='#'
108
+  DLGUI_FALSE=
109
+fi
110
 
111
 if test "x$enable_jpeg" = "xyes"; then
112
 
(-)pkg-plist (+4 lines)
Lines 6-11 Link Here
6
etc/dillorc.sample
6
etc/dillorc.sample
7
etc/dpidrc
7
etc/dpidrc
8
libexec/dillo/dpi/bookmarks/bookmarks.dpi
8
libexec/dillo/dpi/bookmarks/bookmarks.dpi
9
libexec/dillo/dpi/cookies/cookies.dpi
10
libexec/dillo/dpi/datauri/datauri.filter.dpi
9
libexec/dillo/dpi/downloads/downloads.dpi
11
libexec/dillo/dpi/downloads/downloads.dpi
10
libexec/dillo/dpi/file/file.dpi
12
libexec/dillo/dpi/file/file.dpi
11
libexec/dillo/dpi/ftp/ftp.filter.dpi
13
libexec/dillo/dpi/ftp/ftp.filter.dpi
Lines 19-24 Link Here
19
@dirrm libexec/dillo/dpi/ftp
21
@dirrm libexec/dillo/dpi/ftp
20
@dirrm libexec/dillo/dpi/file
22
@dirrm libexec/dillo/dpi/file
21
@dirrm libexec/dillo/dpi/downloads
23
@dirrm libexec/dillo/dpi/downloads
24
@dirrm libexec/dillo/dpi/datauri
25
@dirrm libexec/dillo/dpi/cookies
22
@dirrm libexec/dillo/dpi/bookmarks
26
@dirrm libexec/dillo/dpi/bookmarks
23
@dirrm libexec/dillo/dpi
27
@dirrm libexec/dillo/dpi
24
@dirrm libexec/dillo
28
@dirrm libexec/dillo
(-)Makefile (-22 / +46 lines)
Lines 5-54 Link Here
5
# $FreeBSD: ports/www/dillo-i18n/Makefile,v 1.34 2006/03/07 08:27:45 ade Exp $
5
# $FreeBSD: ports/www/dillo-i18n/Makefile,v 1.34 2006/03/07 08:27:45 ade Exp $
6
#
6
#
7
# Tunables:
7
# Tunables:
8
# WITH_DILLO_SSL:		enable experimental SSL support
8
# WITH_DILLO_META-REFRESH:	make dillo accept the meta-refresh tag
9
# WITH_DILLO_META-REFRESH:	make dillo accept the meta-refresh tag
9
# WITHOUT_DILLO_TABS:		disable support for tabbed browsing
10
# WITHOUT_DILLO_TABS:		disable support for tabbed browsing
10
# WITHOUT_DILLO_ANTIALIAS:	disable support for antialiased display
11
# WITHOUT_DILLO_ANTIALIAS:	disable support for antialiased display
11
#
12
#
12
# Please see www/dillo for any general tunables not listed here.
13
# TODO:
13
#
14
# SSL support is currently partly broken in this version of the i18n dillo:
14
# XXX:
15
# On FreeBSD 4 with OpenSSL 0.9.7d, the configure script uses checks that are
15
# SSL support is currently broken in this version of the i18n patchset:
16
# too strict. On FreeBSD 5 and 6 it seems to work OK.
16
# On FreeBSD 4 with OpenSSL 0.9.7d, the configure script refuses to enable
17
# ssl at all and on FreeBSD 5 and up, linking is broken.
18
17
19
PORTREVISION=	2
18
PORTNAME=	dillo
19
PORTVERSION=	${DILLOVERSION}.${I18NVERSION}
20
CATEGORIES=	www ipv6
21
MASTER_SITES=	http://teki.jpn.ph/pc/software/
20
PKGNAMESUFFIX=	-i18n
22
PKGNAMESUFFIX=	-i18n
23
DISTNAME=	${PORTNAME}-${DILLOVERSION}-i18n-misc-${I18NVERSION}
21
24
22
PATCH_SITES=	http://teki.jpn.ph/pc/software/
23
PATCHFILES=	dillo-0.8.5-i18n-misc-20060105.diff.bz2
24
PATCH_DIST_STRIP=	-p1
25
26
MAINTAINER=	tmseck@netcologne.de
25
MAINTAINER=	tmseck@netcologne.de
27
COMMENT=	A fast, small graphical Web browser with support for i18n
26
COMMENT=	A fast, small graphical Web browser with support for i18n
28
27
29
MD5_FILE=	${.CURDIR}/distinfo
28
RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
29
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
30
		png.5:${PORTSDIR}/graphics/png
30
31
31
MASTERDIR=	${.CURDIR}/../../www/dillo
32
DILLOVERSION=	0.8.6
32
PKGDIR=		${.CURDIR}
33
I18NVERSION=	20060516
33
PLIST_SUB=	NLS=""
34
34
35
USE_BZIP2=	yes
36
USE_GNOME=	gnometarget gtk12
37
USE_GMAKE=	yes
38
GNU_CONFIGURE=	yes
39
CPPFLAGS+=	-I${LOCALBASE}/include
40
LDFLAGS+=	-L${LOCALBASE}/lib
41
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
42
		LDFLAGS="${LDFLAGS}"
43
CONFIGURE_ARGS=	--enable-cookies --enable-ipv6 --enable-threaded-dns \
44
		--disable-dlgui \
45
		--libdir=${PREFIX}/libexec
46
35
CONFLICTS=	dillo-[0-9].[0-9].[0-9]*
47
CONFLICTS=	dillo-[0-9].[0-9].[0-9]*
36
48
37
.if !defined(WITHOUT_NLS)
49
.if !defined(WITHOUT_NLS)
38
USE_GETTEXT=	yes
50
USE_GETTEXT=	yes
39
PLIST_SUB=	NLS=""
51
PLIST_SUB=	NLS=""
52
CONFIGURE_ARGS+=	--enable-nls
40
.else
53
.else
41
# Unfortunately, this option does not work yet; the dpi plugins do not
42
# build without NLS support anymore.
43
# I leave this option in in case anyone really wants to fix this in the
44
# i18n patch.
45
PLIST_SUB=	NLS="@comment "
54
PLIST_SUB=	NLS="@comment "
46
CONFIGURE_ARGS+=	--disable-nls
55
CONFIGURE_ARGS+=	--disable-nls
47
IGNORE=		does not build without NLS support
48
.endif
56
.endif
49
57
50
.if defined(WITH_DILLO_SSL)
58
.if defined(WITH_DILLO_SSL)
51
IGNORE=		does not build with SSL support
59
# Note: the configure script will deactivate SSL support on 4.x systems.
60
# This might get fixed someday so I activate this option unconditionally.
61
CONFIGURE_ARGS+=	--enable-ssl
62
USE_OPENSSL=	yes
63
.else
64
CONFIGURE_ARGS+=	--disable-ssl
52
.endif
65
.endif
53
66
54
.if defined(WITH_DILLO_META-REFRESH)
67
.if defined(WITH_DILLO_META-REFRESH)
Lines 70-76 Link Here
70
CONFIGURE_ARGS+=	--disable-anti-alias
83
CONFIGURE_ARGS+=	--disable-anti-alias
71
.endif
84
.endif
72
85
86
post-patch:
87
	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \
88
		 s|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|g' ${WRKSRC}/configure
89
	@${REINPLACE_CMD} -e 's|dillorc|dillorc.sample|g' ${WRKSRC}/Makefile.in
90
	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
91
73
pre-configure:
92
pre-configure:
93
.if !defined(WITH_DILLO_SSL)
94
	@${ECHO_CMD} ""
95
	@${ECHO_CMD} "   Set WITH_DILLO_SSL=yes in your make environment or on the"
96
	@${ECHO_CMD} "   commandline to enable experimental SSL support."
97
.endif
74
.if !defined(WITH_DILLO_META-REFRESH)
98
.if !defined(WITH_DILLO_META-REFRESH)
75
	@${ECHO_CMD} ""
99
	@${ECHO_CMD} ""
76
	@${ECHO_CMD} "   Set WITH_DILLO_META-REFRESH=yes in your make environment or on the"
100
	@${ECHO_CMD} "   Set WITH_DILLO_META-REFRESH=yes in your make environment or on the"
Lines 88-91 Link Here
88
.endif
112
.endif
89
	@${ECHO_CMD} ""
113
	@${ECHO_CMD} ""
90
114
91
.include "${MASTERDIR}/Makefile"
115
.include <bsd.port.mk>

Return to bug 96595