4 files changed, 8 insertions, 34 deletions
diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile
index 278cfe6875f2..bfc7773cb5a6 100644
--- a/graphics/ecg2png/Makefile
+++ b/graphics/ecg2png/Makefile
@@ -18,9 +18,14 @@ LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 USE_QT_VER=	2
-QTCPPFLAGS+=	-I${LOCALBASE}/include/gd
 USE_GMAKE=	yes
-USE_AUTOMAKE=	yes
-CONFIGURE_ARGS=	--x-includes=${X11BASE}/include --x-libraries=${X11BASE}/lib
+GNU_CONFIGURE=	yes
+QTCPPFLAGS+=	-I${LOCALBASE}/include/gd
+
+pre-patch:
+	@${PERL} -pi -e 's|-lqt$$|-l${QTNAME}|g' ${WRKSRC}/ecg2png/Makefile.in
+	@find ${WRKSRC} -name '*.cpp' | xargs ${PERL} -pi -e \
+		's|#include <qimageio.h>||g'
+	@${CHMOD} ${BINMODE} ${WRKSRC}/missing
 
 .include <bsd.port.mk>
diff --git a/graphics/ecg2png/files/patch-aa b/graphics/ecg2png/files/patch-aa
deleted file mode 100644
index 370b8ae5f867..000000000000
--- a/graphics/ecg2png/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- ecg2png/imageio.cpp	Sun Oct 17 20:29:21 1999
-+++ ecg2png/imageio.cpp.new	Tue Jul  4 00:51:57 2000
-@@ -19,7 +19,6 @@
- #include <stdio.h>
- #include "my_imageio.h"
- #include <qimage.h>
--#include <qimageio.h>
- #include <qpixmap.h>
- #include <qpngio.h>
- 
diff --git a/graphics/ecg2png/files/patch-ab b/graphics/ecg2png/files/patch-ab
deleted file mode 100644
index c6c1b9f245d4..000000000000
--- a/graphics/ecg2png/files/patch-ab
+++ /dev/null
@@ -1,10 +0,0 @@
---- ecg2png/smooth_image.cpp	Sun Oct 17 12:00:50 1999
-+++ ecg2png/smooth_image.cpp.new	Tue Jul  4 00:52:14 2000
-@@ -18,7 +18,6 @@
- #include <stdlib.h>
- #include <stdio.h>
- #include <qimage.h>
--#include <qimageio.h>
- #include "my_imageio.h"
-  
- extern QImageIO iio;
diff --git a/graphics/ecg2png/files/patch-ac b/graphics/ecg2png/files/patch-ac
deleted file mode 100644
index 0319c164d997..000000000000
--- a/graphics/ecg2png/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- ecg2png/Makefile.am.orig	Thu Aug 17 16:22:48 2000
-+++ ecg2png/Makefile.am	Thu Aug 17 16:22:56 2000
-@@ -1,7 +1,7 @@
- ####### kdevelop will overwrite this part!!! (begin)##########
- bin_PROGRAMS = ecg2png
- ecg2png_SOURCES = smooth_image.cpp imageio.cpp main.cpp 
--ecg2png_LDADD   = -lpng -lgd -lqt
-+ecg2png_LDADD   = -lpng -lgd -lqt2
- 
- SUBDIRS = docs 
-