From 47fe52519ad150145ad45b5e97f4c7ed2b10c319 Mon Sep 17 00:00:00 2001
From: jasper <jasper@openbsd.org>
Date: Wed, 24 Mar 2010 17:10:37 +0000
Subject: [PATCH] - don't build gtk+1-xsteg

---
 security/stegdetect/Makefile                  | 14 ++++-----
 security/stegdetect/patches/patch-Makefile_in | 29 +++++++++++++++++--
 .../stegdetect/patches/patch-configure_in     | 15 ++++++++++
 security/stegdetect/pkg/PLIST                 |  3 +-
 4 files changed, 48 insertions(+), 13 deletions(-)
 create mode 100644 security/stegdetect/patches/patch-configure_in

diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index 7dc261c4479..70e733cabe6 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2009/08/10 06:34:29 kili Exp $
+# $OpenBSD: Makefile,v 1.10 2010/03/24 17:10:37 jasper Exp $
 
 COMMENT=	steganography detection tool
 DISTNAME=	stegdetect-0.6
-PKGNAME=	${DISTNAME}p1
+PKGNAME=	${DISTNAME}p2
 CATEGORIES=	security graphics
 MASTER_SITES=	${HOMEPAGE}
 
@@ -13,19 +13,17 @@ PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-WANTLIB=		X11 Xext Xi c crypto event gmodule iconv intl m \
-			pthread-stubs xcb
 
-LIB_DEPENDS=	jpeg::graphics/jpeg \
-		gdk.>=1.2,gtk.>=1.2,glib.>=1.2::x11/gtk+
+WANTLIB += c crypto m
 
 NO_REGRESS=	Yes
 USE_X11=	Yes
 
-CONFIGURE_STYLE=gnu
+AUTOCONF_VERSION=2.52
+CONFIGURE_STYLE=autoconf
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/{stegdetect,stegbreak,xsteg} \
+	${INSTALL_PROGRAM} ${WRKSRC}/{stegdetect,stegbreak} \
 		${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/*.1 ${PREFIX}/man/man1
 
diff --git a/security/stegdetect/patches/patch-Makefile_in b/security/stegdetect/patches/patch-Makefile_in
index ff0f5f21bac..2508c3354c7 100644
--- a/security/stegdetect/patches/patch-Makefile_in
+++ b/security/stegdetect/patches/patch-Makefile_in
@@ -1,6 +1,18 @@
-$OpenBSD: patch-Makefile_in,v 1.2 2008/09/16 21:08:27 jasper Exp $
---- Makefile.in.orig	Tue Sep 16 22:59:28 2008
-+++ Makefile.in	Tue Sep 16 23:02:44 2008
+$OpenBSD: patch-Makefile_in,v 1.3 2010/03/24 17:10:37 jasper Exp $
+
+Don't build gtk1 xsteg.
+
+--- Makefile.in.orig	Tue Aug 31 16:59:42 2004
++++ Makefile.in	Wed Mar 24 17:47:01 2010
+@@ -64,7 +64,7 @@ MAKEINFO = @MAKEINFO@
+ PACKAGE = @PACKAGE@
+ PATH_GTKCONFIG = @PATH_GTKCONFIG@
+ VERSION = @VERSION@
+-XSTEG = @XSTEG@
++XSTEG =
+ 
+ AUTOMAKE_OPTIONS = foreign no-dependencies
+ 
 @@ -83,7 +83,7 @@ GTKLIB = @GTKLIB@
  EVENTINC = @EVENTINC@
  EVENTLIB = @EVENTLIB@
@@ -10,3 +22,14 @@ $OpenBSD: patch-Makefile_in,v 1.2 2008/09/16 21:08:27 jasper Exp $
  
  SUBDIRS = jpeg-6b file
  
+@@ -97,8 +97,8 @@ CFLAGS = -O2 -Wall -g
+ 
+ INCLUDES = $(JPEGINC) $(FILEINC) -I$(srcdir)/compat $(EVENTINC) $(GTKINC)
+ 
+-EXTRA_PROGRAMS = xsteg
+-bin_PROGRAMS = stegdetect stegbreak stegcompare stegdeimage @XSTEG@
++EXTRA_PROGRAMS =
++bin_PROGRAMS = stegdetect stegbreak stegcompare stegdeimage
+ 
+ CSRCS = common.c common.h jphide_table.c util.c jphide_table.h
+ 
diff --git a/security/stegdetect/patches/patch-configure_in b/security/stegdetect/patches/patch-configure_in
new file mode 100644
index 00000000000..dd508f6d1af
--- /dev/null
+++ b/security/stegdetect/patches/patch-configure_in
@@ -0,0 +1,15 @@
+$OpenBSD: patch-configure_in,v 1.1 2010/03/24 17:10:37 jasper Exp $
+
+Don't pickup gtk1.
+
+--- configure.in.orig	Wed Mar 24 17:44:35 2010
++++ configure.in	Wed Mar 24 17:44:54 2010
+@@ -30,7 +30,7 @@ i386-*-*)
+ esac
+ 
+ dnl Checking for gtk
+-AC_PATH_PROG(PATH_GTKCONFIG, gtk-config)
++AC_PATH_PROG(PATH_GTKCONFIG, false)
+ if test ! -z "$PATH_GTKCONFIG" ; then
+ 	dnl Checks for libevent
+ 	havelibevent=no
diff --git a/security/stegdetect/pkg/PLIST b/security/stegdetect/pkg/PLIST
index 92cdcb1d22b..3bebb8f046a 100644
--- a/security/stegdetect/pkg/PLIST
+++ b/security/stegdetect/pkg/PLIST
@@ -1,6 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.3 2008/09/16 21:08:27 jasper Exp $
+@comment $OpenBSD: PLIST,v 1.4 2010/03/24 17:10:37 jasper Exp $
 @bin bin/stegbreak
 @bin bin/stegdetect
-@bin bin/xsteg
 @man man/man1/stegbreak.1
 @man man/man1/stegdetect.1