Fix build.

PR:		33189
Submitted by:	Bjarne Wichmann Petersen <freebsd.nospam@mekanix.dk>

3 files changed, 86 insertions, 24 deletions

diff --git a/sysutils/koncd/Makefile b/sysutils/koncd/Makefile
index 1f46a5a908dc..c214394302b0 100644
--- a/sysutils/koncd/Makefile
+++ b/sysutils/koncd/Makefile
@@ -14,6 +14,8 @@ DISTNAME=	${PORTNAME}-1.0rc2
 
 MAINTAINER=	demon@FreeBSD.org
 
+BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
+		automake14:${PORTSDIR}/devel/automake14
 RUN_DEPENDS=	cdrecord:${PORTSDIR}/sysutils/cdrtools \
 		mkisofs:${PORTSDIR}/sysutils/mkisofs \
 		mpg123:${PORTSDIR}/audio/mpg123
@@ -22,7 +24,27 @@ USE_KDELIBS_VER=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
+.if defined(PARALLEL_PACKAGE_BUILD) || defined(WANT_KDE_NDEBUG)
+CONFIGURE_ARGS+=--disable-debug
+.endif
+
+.include <bsd.port.pre.mk>
+
 post-patch:
-	@${PERL} -pi -e 's#lqt#lqt2#g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -type f -name '*.h' | ${XARGS} \
+		${PERL} -pi -e 's|^.*#.*include.*<malloc\.h>.*||g'
+	@${FIND} ${WRKSRC} -type f -name '*.cpp' | ${XARGS} \
+		${PERL} -pi -e 's|^.*#.*include.*<malloc\.h>.*||g'
+
+pre-configure:
+	${MKDIR} ${WRKSRC}/auto-bin
+.for AC in autoconf autoheader
+	${LN} -sf ${LOCALBASE}/bin/${AC}213 ${WRKSRC}/auto-bin/${AC}
+.endfor
+.for AM in automake aclocal
+	${LN} -sf ${LOCALBASE}/bin/${AM}14 ${WRKSRC}/auto-bin/${AM}
+.endfor
+	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
+		${GMAKE} -f Makefile.dist
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/koncd/files/patch-koncd-mastercd_gui.h b/sysutils/koncd/files/patch-koncd-mastercd_gui.h
new file mode 100644
index 000000000000..ca7041032294
--- /dev/null
+++ b/sysutils/koncd/files/patch-koncd-mastercd_gui.h
@@ -0,0 +1,13 @@
+--- /usr/ports/sysutils/koncd/files/patch-koncd::mastercd_gui.h	Thu Jan  1 09:00:00 1970
++++ koncd/files/patch-koncd::mastercd_gui.h	Wed Dec 26 21:49:38 2001
+@@ -0,0 +1,10 @@
++--- koncd/mastercd_gui.h.orig	Sat Oct 13 01:40:01 2001
+++++ koncd/mastercd_gui.h	Wed Dec 26 21:48:38 2001
++@@ -11,6 +11,7 @@
++ 
++ #include <qvariant.h>
++ #include <qdialog.h>
+++#include <klistview.h>
++ class QVBoxLayout; 
++ class QHBoxLayout; 
++ class QGridLayout; 
diff --git a/sysutils/koncd/pkg-plist b/sysutils/koncd/pkg-plist
index 079bafee9ba0..c8b73ec65073 100644
--- a/sysutils/koncd/pkg-plist
+++ b/sysutils/koncd/pkg-plist
@@ -1,5 +1,30 @@
 bin/koncd
+share/applnk/Multimedia/koncd.desktop
+share/apps/koncd/AUTHORS
+share/apps/koncd/COPYING
+share/apps/koncd/ChangeLog
+share/apps/koncd/FAQ
+share/apps/koncd/INSTALL
+share/apps/koncd/README
+share/apps/koncd/TODO
+share/apps/koncd/koncdrc.example
 share/apps/koncd/pics/startlogo.png
+share/doc/HTML/de/koncd/audio_cd.htm
+share/doc/HTML/de/koncd/einstellungen.htm
+share/doc/HTML/de/koncd/erzeuge_cd.htm
+share/doc/HTML/de/koncd/images/audiocd.jpg
+share/doc/HTML/de/koncd/images/copycd.jpg
+share/doc/HTML/de/koncd/images/imagetype.jpg
+share/doc/HTML/de/koncd/images/koncd_logo.jpg
+share/doc/HTML/de/koncd/images/mastercd.jpg
+share/doc/HTML/de/koncd/images/setup.jpg
+share/doc/HTML/de/koncd/images/tools.jpg
+share/doc/HTML/de/koncd/index.html
+share/doc/HTML/de/koncd/kopiere_cd.htm
+share/doc/HTML/de/koncd/tipps.htm
+share/doc/HTML/de/koncd/werkzeuge.htm
+share/doc/HTML/en/koncd/audio_cd.htm
+share/doc/HTML/en/koncd/copy_cd.htm
 share/doc/HTML/en/koncd/images/audiocd.jpg
 share/doc/HTML/en/koncd/images/copycd.jpg
 share/doc/HTML/en/koncd/images/imagetype.jpg
@@ -7,36 +32,38 @@ share/doc/HTML/en/koncd/images/koncd_logo.jpg
 share/doc/HTML/en/koncd/images/mastercd.jpg
 share/doc/HTML/en/koncd/images/setup.jpg
 share/doc/HTML/en/koncd/images/tools.jpg
-share/doc/HTML/en/koncd/audio_cd.htm
-share/doc/HTML/en/koncd/copy_cd.htm
 share/doc/HTML/en/koncd/index.html
 share/doc/HTML/en/koncd/master_cd.htm
 share/doc/HTML/en/koncd/setup.htm
 share/doc/HTML/en/koncd/tips.htm
 share/doc/HTML/en/koncd/tools.htm
-share/doc/HTML/de/koncd/images/audiocd.jpg
-share/doc/HTML/de/koncd/images/copycd.jpg
-share/doc/HTML/de/koncd/images/imagetype.jpg
-share/doc/HTML/de/koncd/images/koncd_logo.jpg
-share/doc/HTML/de/koncd/images/mastercd.jpg
-share/doc/HTML/de/koncd/images/setup.jpg
-share/doc/HTML/de/koncd/images/tools.jpg
-share/doc/HTML/de/koncd/audio_cd.htm
-share/doc/HTML/de/koncd/einstellungen.htm
-share/doc/HTML/de/koncd/erzeuge_cd.htm
-share/doc/HTML/de/koncd/index.html
-share/doc/HTML/de/koncd/kopiere_cd.htm
-share/doc/HTML/de/koncd/tipps.htm
-share/doc/HTML/de/koncd/werkzeuge.htm
-share/locale/de/LC_MESSAGES/koncd.mo
-share/applnk/Multimedia/koncd.desktop
+share/icons/hicolor/16x16/apps/koncd.png
+share/icons/hicolor/32x32/apps/koncd.png
 share/icons/locolor/16x16/apps/koncd.png
 share/icons/locolor/32x32/apps/koncd.png
-share/icons/hicolor/32x32/apps/koncd.png
-share/icons/hicolor/16x16/apps/koncd.png
-@dirrm share/apps/koncd/pics
-@dirrm share/apps/koncd
+share/locale/de/LC_MESSAGES/koncd.mo
+@dirrm share/locale/de/LC_MESSAGES
+@dirrm share/locale/de
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
+@dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor/16x16/apps
+@dirrm share/icons/hicolor/16x16
+@dirrm share/icons/hicolor
+@dirrm share/icons
 @dirrm share/doc/HTML/en/koncd/images
 @dirrm share/doc/HTML/en/koncd
+@dirrm share/doc/HTML/en
 @dirrm share/doc/HTML/de/koncd/images
 @dirrm share/doc/HTML/de/koncd
+@dirrm share/doc/HTML/de
+@dirrm share/doc/HTML
+@dirrm share/apps/koncd/pics
+@dirrm share/apps/koncd
+@dirrm share/apps
+@dirrm share/applnk/Multimedia
+@dirrm share/applnk