Attachment #65119 for bug #96592

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (dillo-0.8.5.tar.bz2) = d0ab7fa1d40b310deb891388604188f8	1	MD5 (dillo-0.8.6.tar.bz2) = b65233d368bbd265a55effcf2c17f84b
2	SHA256 (dillo-0.8.5.tar.bz2) = 980ccd8e0c0a85e37478e33b5f4f59d2cfda5c16d30af3acad259626d387cd1a	2	SHA256 (dillo-0.8.6.tar.bz2) = 47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9
3	SIZE (dillo-0.8.5.tar.bz2) = 424795	3	SIZE (dillo-0.8.6.tar.bz2) = 441739

Line 0 Link Here

(-)files/enable-ssl.patch (+10 lines)
	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>




--- dpi/https.c.orig	Sat Mar 25 16:49:59 2006
+++ dpi/https.c	Sat Mar 25 16:55:35 2006
@@ -655,13 +655,8 @@
 #include <glib.h>
 #include "dpiutil.h"
 
-#undef ENABLE_SSL
 #ifdef ENABLE_SSL
 
 #include <openssl/ssl.h>
@@ -605,13 +616,8 @@ static void no_ssl_support(void)
       "<b>}</b>\n\n"
       "  <b>*** Dillo's prototype plugin for https support"
       " is disabled now ***</b>\n\n"
-      "  If you want to test this <b>alpha</b> support code, just remove\n"
-      "  line 65 from https.c, recompile and reinstall.\n\n"
-      "  (beware that this https support is very limited now)\n\n"
-      "  To use https and SSL, you must have \n"
-      "  the OpenSSL development libraries installed.  Check your\n"




--- configure.orig	Sat Apr 15 14:01:45 2006
+++ configure	Sun Apr 16 20:20:43 2006
@@ -309,7 +309,7 @@
 # include <unistd.h>
 #endif"
 
-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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 GLIB_CONFIG GL
IB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP 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'
+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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 GLIB_CONFIG GL
IB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS FLTK2_CONFIG EGREP 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'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1961,16 +1961,6 @@
   enable_threaded_dns=yes
 fi;
 
-
-if test x$enable_dlgui = xyes; then
-  DLGUI_TRUE=
-  DLGUI_FALSE='#'
-else
-  DLGUI_TRUE='#'
-  DLGUI_FALSE=
-fi
-
-
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -5884,11 +5874,81 @@
   rm -f conf.gtktest
 
 
-    echo "$as_me:$LINENO: checking Hackish check for FLTK" >&5
-echo $ECHO_N "checking Hackish check for FLTK... $ECHO_C" >&6
-    LIBFLTK_CXXFLAGS=`fltk-config --cxxflags`
-    LIBFLTK_LIBS=`fltk-config --ldflags`
+if test "x$enable_dlgui" = "xyes"; then
+  for ac_prog in fltk2-config fltk-config
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_path_FLTK2_CONFIG+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  case $FLTK2_CONFIG in
+  [\\/]* | ?:[\\/]*)
+  ac_cv_path_FLTK2_CONFIG="$FLTK2_CONFIG" # Let the user override the test with a path.
+  ;;
+  *)
+  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+  for ac_exec_ext in '' $ac_executable_extensions; do
+  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_path_FLTK2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
+    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+done
+
+  ;;
+esac
+fi
+FLTK2_CONFIG=$ac_cv_path_FLTK2_CONFIG
+
+if test -n "$FLTK2_CONFIG"; then
+  echo "$as_me:$LINENO: result: $FLTK2_CONFIG" >&5
+echo "${ECHO_T}$FLTK2_CONFIG" >&6
+else
+  echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$FLTK2_CONFIG" && break
+done
+test -n "$FLTK2_CONFIG" || FLTK2_CONFIG="NOTFOUND"
 
+  if test "x$FLTK2_CONFIG" != "xNOTFOUND" && test -x "$FLTK2_CONFIG"; then
+    fltk_version=`$FLTK2_CONFIG --version`
+    case "$fltk_version" in
+      2.*)
+        LIBFLTK_CXXFLAGS=`$FLTK2_CONFIG --cxxflags`
+        LIBFLTK_LIBS=`$FLTK2_CONFIG --ldflags`
+        fltk2_ok="yes"
+        ;;
+      *)
+        echo "$as_me:$LINENO: result: need fltk2 -- disabling fltk support" >&5
+echo "${ECHO_T}need fltk2 -- disabling fltk support" >&6
+        fltk2_ok="no"
+        ;;
+    esac
+  else
+    fltk2_ok="no"
+  fi
+else
+  fltk2_ok="no"
+fi
+
+
+if test x$fltk2_ok = xyes; then
+  DLGUI_TRUE=
+  DLGUI_FALSE='#'
+else
+  DLGUI_TRUE='#'
+  DLGUI_FALSE=
+fi
 
 if test "x$enable_jpeg" = "xyes"; then
 

Lines 1-10 Link Here

(-)pkg-plist (-1 / +5 lines)
1	@comment $FreeBSD: ports/www/dillo/pkg-plist,v 1.5 2004/10/28 15:23:34 pav Exp $	1	@comment $FreeBSD: ports/www/dillo/pkg-plist,v 1.3 2003/02/27 17:36:36 naddy Exp $
2	bin/dillo	2	bin/dillo
3	bin/dpid	3	bin/dpid
4	bin/dpidc	4	bin/dpidc
5	etc/dillorc.sample	5	etc/dillorc.sample
6	etc/dpidrc	6	etc/dpidrc
7	libexec/dillo/dpi/bookmarks/bookmarks.dpi	7	libexec/dillo/dpi/bookmarks/bookmarks.dpi
		8	libexec/dillo/dpi/cookies/cookies.dpi
		9	libexec/dillo/dpi/datauri/datauri.filter.dpi
8	libexec/dillo/dpi/downloads/downloads.dpi	10	libexec/dillo/dpi/downloads/downloads.dpi
9	libexec/dillo/dpi/file/file.dpi	11	libexec/dillo/dpi/file/file.dpi
10	libexec/dillo/dpi/ftp/ftp.filter.dpi	12	libexec/dillo/dpi/ftp/ftp.filter.dpi
Lines 15-20 Link Here
15	@dirrm libexec/dillo/dpi/ftp	17	@dirrm libexec/dillo/dpi/ftp
16	@dirrm libexec/dillo/dpi/file	18	@dirrm libexec/dillo/dpi/file
17	@dirrm libexec/dillo/dpi/downloads	19	@dirrm libexec/dillo/dpi/downloads
		20	@dirrm libexec/dillo/dpi/datauri
		21	@dirrm libexec/dillo/dpi/cookies
18	@dirrm libexec/dillo/dpi/bookmarks	22	@dirrm libexec/dillo/dpi/bookmarks
19	@dirrm libexec/dillo/dpi	23	@dirrm libexec/dillo/dpi
20	@dirrm libexec/dillo	24	@dirrm libexec/dillo




#

PORTNAME=	dillo
PORTVERSION=	0.8.6
CATEGORIES=	www ipv6
MASTER_SITES=	http://www.dillo.org/download/

MAINTAINER=	tmseck@netcologne.de
COMMENT=	A fast, small graphical Web browser built upon GTK+

RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
		png.5:${PORTSDIR}/graphics/png

USE_BZIP2=	yes
USE_GNOME=	gnometarget gtk12
USE_REINPLACE=	yes
USE_GMAKE=	yes
GNU_CONFIGURE=	yes
CPPFLAGS+=	-I${LOCALBASE}/include
LDFLAGS+=	-L${LOCALBASE}/lib
CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
		LDFLAGS="${LDFLAGS}"
CONFIGURE_ARGS=	--enable-cookies --enable-ipv6 --enable-threaded-dns \
		--disable-dlgui \
		--libdir=${PREFIX}/libexec

.if defined(WITH_DILLO_SSL)
CONFIGURE_ARGS+=	--enable-ssl
EXTRA_PATCHES+=	${PATCHDIR}/enable-ssl.patch
USE_OPENSSL=	yes
.else
CONFIGURE_ARGS+=	--disable-ssl
.endif

CONFLICTS=	dillo-i18n-*[0-9]*

post-patch:
	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|g ; \

	@${REINPLACE_CMD} -e 's|dillorc|dillorc.sample|g' ${WRKSRC}/Makefile.in
	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample

# let a slave port redefine this target if it needs to:
.if !target(pre-configure)
pre-configure:
.if !defined(WITH_DILLO_SSL)
	@${ECHO_CMD} ""
	@${ECHO_CMD} "   Set WITH_DILLO_SSL=yes in your make environment or on the"
	@${ECHO_CMD} "   commandline to enable experimental SSL support."
.endif
	@${ECHO_CMD} ""
.endif
.endif

.include <bsd.port.mk>

Return to bug 96592

Lines 1-19 Link Here

(-)files/patch-dpi-https.c (-12 / +4 lines)
1	--- dpi/https.c.orig Sun Oct 3 17:16:15 2004	1	--- dpi/https.c.orig Sat Mar 25 16:49:59 2006
2	+++ dpi/https.c Sun Oct 3 17:17:47 2004	2	+++ dpi/https.c Sat Mar 25 16:55:35 2006
3	@@ -53,7 +53,6 @@	3	@@ -655,13 +655,8 @@
4	#include <glib.h>
5	#include "dpiutil.h"
6
7	-#undef ENABLE_SSL
8	#ifdef ENABLE_SSL
9
10	#include <openssl/ssl.h>
11	@@ -605,13 +616,8 @@ static void no_ssl_support(void)
12	"<b>}</b>\n\n"	4	"<b>}</b>\n\n"
13	" <b>*** Dillo's prototype plugin for https support"	5	" <b>*** Dillo's prototype plugin for https support"
14	" is disabled now ***</b>\n\n"	6	" is disabled now ***</b>\n\n"
15	- " If you want to test this <b>alpha</b> support code, just remove\n"	7	- " If you want to test this <b>alpha</b> support code, just remove\n"
16	- " line 56 from https.c, recompile and reinstall.\n\n"	8	- " line 65 from https.c, recompile and reinstall.\n\n"
17	- " (beware that this https support is very limited now)\n\n"	9	- " (beware that this https support is very limited now)\n\n"
18	- " To use https and SSL, you must have \n"	10	- " To use https and SSL, you must have \n"
19	- " the OpenSSL development libraries installed. Check your\n"	11	- " the OpenSSL development libraries installed. Check your\n"

Line 0 Link Here

(-)files/patch-configure (+114 lines)
		1	--- configure.orig Sat Apr 15 14:01:45 2006
		2	+++ configure Sun Apr 16 20:20:43 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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 GLIB_CONFIG GL
0	IB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP 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	IB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS EGREP 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_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 install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar 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 GLIB_CONFIG GL
1	IB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS FLTK2_CONFIG EGREP 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'	10	IB_CFLAGS GLIB_LIBS GTK_CONFIG GTK_CFLAGS GTK_LIBS FLTK2_CONFIG EGREP 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'
		11	ac_subst_files=''
		12
		13	# Initialize some variables set by options.
		14	@@ -1961,16 +1961,6 @@
		15	enable_threaded_dns=yes
		16	fi;
		17
		18	-
		19	-if test x$enable_dlgui = xyes; then
		20	- DLGUI_TRUE=
		21	- DLGUI_FALSE='#'
		22	-else
		23	- DLGUI_TRUE='#'
		24	- DLGUI_FALSE=
		25	-fi
		26	-
		27	-
		28	ac_ext=c
		29	ac_cpp='$CPP $CPPFLAGS'
		30	ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
		31	@@ -5884,11 +5874,81 @@
		32	rm -f conf.gtktest
		33
		34
		35	- echo "$as_me:$LINENO: checking Hackish check for FLTK" >&5
		36	-echo $ECHO_N "checking Hackish check for FLTK... $ECHO_C" >&6
		37	- LIBFLTK_CXXFLAGS=`fltk-config --cxxflags`
		38	- LIBFLTK_LIBS=`fltk-config --ldflags`
		39	+if test "x$enable_dlgui" = "xyes"; then
		40	+ for ac_prog in fltk2-config fltk-config
		41	+do
		42	+ # Extract the first word of "$ac_prog", so it can be a program name with args.
		43	+set dummy $ac_prog; ac_word=$2
		44	+echo "$as_me:$LINENO: checking for $ac_word" >&5
		45	+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
		46	+if test "${ac_cv_path_FLTK2_CONFIG+set}" = set; then
		47	+ echo $ECHO_N "(cached) $ECHO_C" >&6
		48	+else
		49	+ case $FLTK2_CONFIG in
		50	+ [\\/]* \| ?:[\\/]*)
		51	+ ac_cv_path_FLTK2_CONFIG="$FLTK2_CONFIG" # Let the user override the test with a path.
		52	+ ;;
		53	+ *)
		54	+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
		55	+for as_dir in $PATH
		56	+do
		57	+ IFS=$as_save_IFS
		58	+ test -z "$as_dir" && as_dir=.
		59	+ for ac_exec_ext in '' $ac_executable_extensions; do
		60	+ if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
		61	+ ac_cv_path_FLTK2_CONFIG="$as_dir/$ac_word$ac_exec_ext"
		62	+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
		63	+ break 2
		64	+ fi
		65	+done
		66	+done
		67	+
		68	+ ;;
		69	+esac
		70	+fi
		71	+FLTK2_CONFIG=$ac_cv_path_FLTK2_CONFIG
		72	+
		73	+if test -n "$FLTK2_CONFIG"; then
		74	+ echo "$as_me:$LINENO: result: $FLTK2_CONFIG" >&5
75	+echo "${ECHO_T}$FLTK2_CONFIG" >&6
76	+else
77	+ echo "$as_me:$LINENO: result: no" >&5
78	+echo "${ECHO_T}no" >&6
79	+fi
80	+
81	+ test -n "$FLTK2_CONFIG" && break
82	+done
83	+test -n "$FLTK2_CONFIG" \|\| FLTK2_CONFIG="NOTFOUND"
84
85	+ if test "x$FLTK2_CONFIG" != "xNOTFOUND" && test -x "$FLTK2_CONFIG"; then
86	+ fltk_version=`$FLTK2_CONFIG --version`
87	+ case "$fltk_version" in
88	+ 2.*)
89	+ LIBFLTK_CXXFLAGS=`$FLTK2_CONFIG --cxxflags`
90	+ LIBFLTK_LIBS=`$FLTK2_CONFIG --ldflags`
91	+ fltk2_ok="yes"
92	+ ;;
93	+ *)
94	+ echo "$as_me:$LINENO: result: need fltk2 -- disabling fltk support" >&5
95	+echo "${ECHO_T}need fltk2 -- disabling fltk support" >&6
96	+ fltk2_ok="no"
97	+ ;;
98	+ esac
99	+ else
100	+ fltk2_ok="no"
101	+ fi
102	+else
103	+ fltk2_ok="no"
104	+fi
105	+
106	+
107	+if test x$fltk2_ok = xyes; then
108	+ DLGUI_TRUE=
109	+ DLGUI_FALSE='#'
110	+else
111	+ DLGUI_TRUE='#'
112	+ DLGUI_FALSE=
113	+fi
114
115	if test "x$enable_jpeg" = "xyes"; then
116

Lines 9-42 Link Here

(-)Makefile (-17 / +17 lines)
9	#	9	#
10		10
11	PORTNAME= dillo	11	PORTNAME= dillo
12	PORTVERSION= 0.8.5	12	PORTVERSION= 0.8.6
13	CATEGORIES= www ipv6	13	CATEGORIES= www ipv6
14	MASTER_SITES= http://www.dillo.org/download/	14	MASTER_SITES= http://www.dillo.org/download/
15		15
16	MAINTAINER?= tmseck@netcologne.de	16	MAINTAINER= tmseck@netcologne.de
17	COMMENT?= A fast, small graphical Web browser built upon GTK+	17	COMMENT= A fast, small graphical Web browser built upon GTK+
18		18
19	RUN_DEPENDS+= wget:${PORTSDIR}/ftp/wget	19	RUN_DEPENDS= wget:${PORTSDIR}/ftp/wget
20	LIB_DEPENDS+= jpeg.9:${PORTSDIR}/graphics/jpeg \	20	LIB_DEPENDS= jpeg.9:${PORTSDIR}/graphics/jpeg \
21	png.5:${PORTSDIR}/graphics/png	21	png.5:${PORTSDIR}/graphics/png
22		22
23	USE_BZIP2= yes	23	USE_BZIP2= yes
24	USE_GNOME= gnometarget gtk12	24	USE_GNOME= gnometarget gtk12
25	USE_REINPLACE= yes
26	USE_GMAKE= yes	25	USE_GMAKE= yes
27	GNU_CONFIGURE= yes	26	GNU_CONFIGURE= yes
28	CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \	27	CPPFLAGS+= -I${LOCALBASE}/include
29	LDFLAGS="-L${LOCALBASE}/lib"	28	LDFLAGS+= -L${LOCALBASE}/lib
30	CONFIGURE_ARGS+= --enable-ipv6 --libdir=${PREFIX}/libexec	29	CONFIGURE_ENV= CPPFLAGS="${CPPFLAGS}" \
		30	LDFLAGS="${LDFLAGS}"
		31	CONFIGURE_ARGS= --enable-cookies --enable-ipv6 --enable-threaded-dns \
		32	--disable-dlgui \
		33	--libdir=${PREFIX}/libexec
31		34
32	.if defined(WITH_DILLO_SSL)	35	.if defined(WITH_DILLO_SSL)
33	CONFIGURE_ARGS+= --enable-ssl	36	CONFIGURE_ARGS+= --enable-ssl
		37	EXTRA_PATCHES+= ${PATCHDIR}/enable-ssl.patch
34	USE_OPENSSL= yes	38	USE_OPENSSL= yes
35	.else	39	.else
36	CONFIGURE_ARGS+= --disable-ssl	40	CONFIGURE_ARGS+= --disable-ssl
37	.endif	41	.endif
38		42
39	CONFLICTS?= dillo-i18n-[0-9]	43	CONFLICTS= dillo-i18n-[0-9]
40		44
41	post-patch:	45	post-patch:
42	@${REINPLACE_CMD} -e 's\|-pthread\|${PTHREAD_LIBS}\|g ; \	46	@${REINPLACE_CMD} -e 's\|-pthread\|${PTHREAD_LIBS}\|g ; \
Lines 44-59 Link Here
44	@${REINPLACE_CMD} -e 's\|dillorc\|dillorc.sample\|g' ${WRKSRC}/Makefile.in	48	@${REINPLACE_CMD} -e 's\|dillorc\|dillorc.sample\|g' ${WRKSRC}/Makefile.in
45	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample	49	@${CP} ${WRKSRC}/dillorc ${WRKSRC}/dillorc.sample
46		50
47	# let a slave port redefine this target if it needs to:
48	.if !target(pre-configure)
49	pre-configure:	51	pre-configure:
50	.if !defined(WITH_DILLO_SSL)	52	.if !defined(WITH_DILLO_SSL)
51	@${ECHO_CMD} ""	53	@${ECHO_CMD} ""
52	@${ECHO_CMD} " You can enable dillo's experimental SSL support by specifing"	54	@${ECHO_CMD} " Set WITH_DILLO_SSL=yes in your make environment or on the"
53	@${ECHO_CMD} " WITH_DILLO_SSL=yes in your make environment or on the"	55	@${ECHO_CMD} " commandline to enable experimental SSL support."
54	@${ECHO_CMD} " commandline."	56	.endif
55	@${ECHO_CMD} ""	57	@${ECHO_CMD} ""
56	.endif
57	.endif
58		58
59	.include <bsd.port.mk>	59	.include <bsd.port.mk>