--- gtk/Makefile.in.orig	2004-07-08 00:26:54 +0200
+++ gtk/Makefile.in	2004-07-12 14:09:42 +0200
@@ -562,13 +562,6 @@
 
 .SUFFIXES:
 .SUFFIXES: .c .lo .o .obj
-$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/Makefile.common $(top_srcdir)/configure.in $(ACLOCAL_M4)
-	cd $(top_srcdir) && \
-	  $(AUTOMAKE) --gnu  gtk/Makefile
-Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-doxygen.cfg: $(top_builddir)/config.status doxygen.cfg.in
-	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 
 AR = ar
 
@@ -775,7 +768,7 @@
 	done
 check-am: all-am
 check: check-am
-all-am: Makefile $(LIBRARIES) $(HEADERS)
+all-am: $(LIBRARIES) $(HEADERS)
 
 installdirs:
 
--- gtk/main.c.orig	2004-03-30 10:49:43.000000000 +0200
+++ gtk/main.c	2004-03-30 10:49:49.000000000 +0200
@@ -47,10 +47,7 @@
 
 #include <string.h>
 #include <ctype.h>
-
-#ifdef HAVE_UNISTD_H
 #include <unistd.h>
-#endif
 
 #ifdef HAVE_IO_H
 #include <io.h> /* open/close on win32 */
--- epan/inet_pton.c.orig	2004-03-30 14:52:39.000000000 +0200
+++ epan/inet_pton.c	2004-03-30 14:53:29.000000000 +0200
@@ -15,6 +15,8 @@
  * SOFTWARE.
  */
 
+#if !defined(__FreeBSD__)
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -267,3 +269,4 @@
 	return (1);
 }
 #endif
+#endif /* #if !defined(__FreeBSD__) */
--- Makefile.in.orig	2004-03-30 14:58:08.000000000 +0200
+++ Makefile.in	2004-03-30 14:58:21.000000000 +0200
@@ -772,7 +772,6 @@
 	$(ethereal_optional_objects)	\
 	$(ethereal_additional_libs)	\
 	@SNMP_LIBS@ @SSL_LIBS@ 		\
-	$(plugin_ldadd)			\
 	@PCRE_LIBS@			\
 	@PCAP_LIBS@ @GTK_LIBS@ @ADNS_LIBS@
 
@@ -796,7 +795,6 @@
 	$(ethereal_optional_objects)	\
 	$(tethereal_additional_libs)	\
 	@SNMP_LIBS@ @SSL_LIBS@		\
-	$(plugin_ldadd)			\
 	@PCRE_LIBS@			\
 	@GLIB_LIBS@ -lm			\
 	@PCAP_LIBS@ @SOCKET_LIBS@ @NSL_LIBS@ @ADNS_LIBS@
Index: configure
--- configure.orig	2004-10-21 04:50:23.000000000 +0200
+++ configure	2004-10-23 11:44:44.242378655 +0200
@@ -15267,6 +15267,9 @@
 else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lcrypto  $LIBS"
+case "$host_os" in
+  solaris* ) LIBS="$LIBS -lsocket -lnsl" ;;
+esac
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF