7 files changed, 42 insertions, 36 deletions

diff --git a/security/stegdetect/Makefile b/security/stegdetect/Makefile
index 7d603cb4e700..576887f0363c 100644
--- a/security/stegdetect/Makefile
+++ b/security/stegdetect/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	stegdetect
 PORTVERSION=	0.6
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	security
 MASTER_SITES=	http://www.outguess.org/ \
 		http://distfiles.master.finkmirrors.net/ \
@@ -15,16 +15,11 @@ COMMENT=	Automated tool for detecting steganographic content in JPEGs
 OPTIONS_DEFINE=	X11
 OPTIONS_DEFAULT=	X11
 
-.include <bsd.port.options.mk>
+OPTIONS_SUB=	yes
 
-.if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
-USE_GNOME=	gtk12
-CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
-PLIST_SUB+=	X11=""
-.else
-PLIST_SUB+=	X11="@comment "
-.endif
+X11_LIB_DEPENDS=	libevent.so:${PORTSDIR}/devel/libevent2
+X11_USE=	gnome=gtk12
+X11_CONFIGURE_ENV+=	PATH_GTKCONFIG="${GTK_CONFIG}"
 
 # Note: stegdetect includes a modified version of jpeg-6b linked statically
 GNU_CONFIGURE=	yes
@@ -34,8 +29,7 @@ CONFIGURE_ARGS+=--program-prefix=''
 post-patch:
 	@${REINPLACE_CMD} 's;/usr/include/event;${LOCALBASE}/include;g' \
 		${WRKSRC}/configure
-.if ${PORT_OPTIONS:MX11}
+post-patch-X11-on:
 	@${REINPLACE_CMD} 's/gtk-config//g' ${WRKSRC}/configure
-.endif
 
 .include <bsd.port.mk>
diff --git a/security/stegdetect/files/patch-Makefile.in b/security/stegdetect/files/patch-Makefile.in
index a4a4cd9eec66..6b9361d548d8 100644
--- a/security/stegdetect/files/patch-Makefile.in
+++ b/security/stegdetect/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue Aug 31 11:59:42 2004
-+++ Makefile.in	Sat Apr 15 03:04:17 2006
-@@ -70,7 +70,7 @@
+--- Makefile.in.orig	2004-08-31 14:59:42 UTC
++++ Makefile.in
+@@ -70,7 +70,7 @@ AUTOMAKE_OPTIONS = foreign no-dependenci
  
  JPEGDIR = ./jpeg-6b
  JPEGINC = -I$(JPEGDIR)
@@ -9,7 +9,7 @@
  JPEGDEP = $(JPEGDIR)/libjpeg.a
  
  FILEDIR = ./file
-@@ -330,19 +330,23 @@
+@@ -330,19 +330,23 @@ check-recursive installcheck-recursive i
  	@set fnord $(MAKEFLAGS); amf=$$2; \
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
diff --git a/security/stegdetect/files/patch-break_jsteg.c b/security/stegdetect/files/patch-break_jsteg.c
index 4b61fba6b5b5..9dbe0fdab5e6 100644
--- a/security/stegdetect/files/patch-break_jsteg.c
+++ b/security/stegdetect/files/patch-break_jsteg.c
@@ -1,6 +1,6 @@
---- break_jsteg.c.orig	Sun Aug 29 20:11:00 2004
-+++ break_jsteg.c	Sat Apr 15 00:05:52 2006
-@@ -162,7 +162,7 @@
+--- break_jsteg.c.orig	2004-08-29 23:11:00 UTC
++++ break_jsteg.c
+@@ -162,7 +162,7 @@ break_jsteg_prepare(char *filename, shor
  	jstegob->skip = bytes - sizeof(jstegob->coeff);
  
  	if (jsbits < max || off + jsbits > bits) {
diff --git a/security/stegdetect/files/patch-common.c b/security/stegdetect/files/patch-common.c
index 757d4833d75c..6c29c8067a57 100644
--- a/security/stegdetect/files/patch-common.c
+++ b/security/stegdetect/files/patch-common.c
@@ -1,6 +1,6 @@
---- common.c.orig	Sun Aug 29 20:11:00 2004
-+++ common.c	Sat Apr 15 00:11:40 2006
-@@ -85,7 +85,7 @@
+--- common.c.orig	2004-08-29 23:11:00 UTC
++++ common.c
+@@ -85,7 +85,7 @@ jpeg_getc(j_decompress_ptr cinfo)
  
  	if (datasrc->bytes_in_buffer == 0) {
  		if (! (*datasrc->fill_input_buffer) (cinfo))
@@ -9,7 +9,7 @@
  	}
  	datasrc->bytes_in_buffer--;
  	return GETJOCTET(*datasrc->next_input_byte++);
-@@ -308,7 +308,7 @@
+@@ -308,7 +308,7 @@ prepare_all_gradx(short **pdcts, int *pb
  
  	dcts = malloc(bits * sizeof (short));
  	if (dcts == NULL) {
@@ -18,7 +18,7 @@
  		return (-1);
  	}
  
-@@ -374,7 +374,7 @@
+@@ -374,7 +374,7 @@ prepare_normal(short **pdcts, int *pbits
  	if (pdcts != NULL) {
  		dcts = malloc(bits * sizeof (short));
  		if (dcts == NULL) {
@@ -27,7 +27,7 @@
  			return (-1);
  		}
  	}
-@@ -422,7 +422,7 @@
+@@ -422,7 +422,7 @@ prepare_jphide(short **pdcts, int *pbits
  		/* XXX - wasteful */
  		back[comp] = calloc(off, sizeof (char));
  		if (back[comp] == NULL) {
@@ -36,7 +36,7 @@
  			goto err;
  		}
  	}
-@@ -430,7 +430,7 @@
+@@ -430,7 +430,7 @@ prepare_jphide(short **pdcts, int *pbits
  	if (pdcts != NULL) {
  		dcts = malloc(mbits * sizeof (short));
  		if (dcts == NULL) {
diff --git a/security/stegdetect/files/patch-stegdeimage.c b/security/stegdetect/files/patch-stegdeimage.c
new file mode 100644
index 000000000000..d3ffb0094765
--- /dev/null
+++ b/security/stegdetect/files/patch-stegdeimage.c
@@ -0,0 +1,12 @@
+--- stegdeimage.c.orig	2004-08-29 23:11:00 UTC
++++ stegdeimage.c
+@@ -70,9 +70,6 @@ dodeimage(char *file1, char *file2)
+ 	struct jpeg_error_mgr dsterr;
+ 	FILE *fp;
+ 
+-	if (jpg_open("/home/stego_analysis/compress/dscf0033.jpg") == -1)
+-		return;
+-
+ 	for (comp = 0; comp < 3; comp++) {
+ 		ohib[comp] = hib[comp];
+ 		owib[comp] = wib[comp];
diff --git a/security/stegdetect/files/patch-stegdetect.c b/security/stegdetect/files/patch-stegdetect.c
index f9edc10e80eb..921c7d6357b3 100644
--- a/security/stegdetect/files/patch-stegdetect.c
+++ b/security/stegdetect/files/patch-stegdetect.c
@@ -1,6 +1,6 @@
---- stegdetect.c.orig	Sat Apr 15 00:14:05 2006
-+++ stegdetect.c	Sat Apr 15 00:14:40 2006
-@@ -78,7 +78,6 @@
+--- stegdetect.c.orig	2004-09-03 04:01:35 UTC
++++ stegdetect.c
+@@ -78,7 +78,6 @@ char *progname;
  float DCThist[257];
  float scale = 1;		/* Sensitivity scaling */
  
@@ -8,7 +8,7 @@
  static int quiet = 0;
  static int ispositive = 0;	/* Current images contain stego */
  static char *transformname;	/* Current transform name */
-@@ -1227,7 +1227,7 @@
+@@ -1227,7 +1226,7 @@ detect(char *filename, int scans)
  			strlcat(outbuf, quality(tmp, stars), sizeof(outbuf));
  			flag = 1;
  		}
@@ -17,7 +17,7 @@
  	a_wasted_var = 0;
  	}
  
-@@ -1267,7 +1267,7 @@
+@@ -1267,7 +1266,7 @@ detect(char *filename, int scans)
  			strlcat(outbuf, tmp, sizeof(outbuf));
  		}
  		
@@ -26,7 +26,7 @@
  	a_wasted_var = 0;
  	}
  
-@@ -1332,7 +1332,7 @@
+@@ -1332,7 +1331,7 @@ detect(char *filename, int scans)
  		}
  
  		free(dcts);
diff --git a/security/stegdetect/files/patch-xsteg.c b/security/stegdetect/files/patch-xsteg.c
index 23ff6c103867..6ac76e028cd2 100644
--- a/security/stegdetect/files/patch-xsteg.c
+++ b/security/stegdetect/files/patch-xsteg.c
@@ -1,5 +1,5 @@
---- xsteg.c.orig	2010-02-07 02:37:05.398520068 -0800
-+++ xsteg.c	2010-02-07 02:38:33.877232865 -0800
+--- xsteg.c.orig	2004-08-31 14:58:21 UTC
++++ xsteg.c
 @@ -56,9 +56,6 @@
  #define FLAG_DOINVIS	0x0008
  #define FLAG_DOF5	0x0010
@@ -10,7 +10,7 @@
  struct event start_ev;
  struct event gtk_ev;
  int quit = 0;
-@@ -744,8 +741,7 @@
+@@ -744,8 +741,7 @@ chld_handler(int sig)
  	sigprocmask(SIG_BLOCK, &set, &oldset);
  
  	while ((pid = waitpid(-1, &status, WNOHANG)) > 0) {
@@ -20,7 +20,7 @@
  	}
  
  	signal(SIGCHLD, chld_handler);
-@@ -1106,8 +1102,7 @@
+@@ -1106,8 +1102,7 @@ main(int argc, char *argv[] )
  	gtk_widget_show(window);
  
  	event_init();