o move files that build only when qt is enabled to separate file - pkg/PLIST.qt,

  and use this file *in addition to pkg/PLIST*  when AVIFILE_WITH_QT is set to "YES"

        # it would be more logical to set PLIST_SRC to PLIST first and then add PLIST.qt to it,
        # but @dirrm lib/avifile-0.6 will fail while processing pkg/PLIST,
        # because the directory still contains files (they are listed in PLIST.qt) and isn't empty,
        # thus can't be removed

o rename "WITH_QT" to "AVIFILE_USE_QT", and add this variable to mk.conf.example
o reorder things in Makefile so we don't have to check AVIFILE_USE_QT twice

Should fix pkg/13750 by Matthias Scheler <tron@netbsd.org>

4 files changed, 33 insertions, 23 deletions

diff --git a/graphics/avifile-devel/Makefile b/graphics/avifile-devel/Makefile
index a39b953661d..323aeaea614 100644
--- a/graphics/avifile-devel/Makefile
+++ b/graphics/avifile-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2001/08/19 06:11:43 zuntum Exp $
+# $NetBSD: Makefile,v 1.14 2001/08/19 08:55:59 zuntum Exp $
 #
 
 DISTNAME=	avifile-0.6.20010814
@@ -13,12 +13,6 @@ COMMENT=	MPEG-4 (DivX) video player library
 DEPENDS+=	win32-codecs>=010122:../../graphics/win32-codecs
 DEPENDS+=	automake-*:../../devel/automake
 
-.if defined (WITH_QT)
-PLIST_SUBST+=	QT=''
-.else
-PLIST_SUBST+=	QT='@comment '
-.endif
-
 WRKSRC=		${WRKDIR}/avifile-0.6
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
@@ -35,16 +29,31 @@ CXXFLAGS+=		-L${BUILDLINK_DIR}/lib -I${BUILDLINK_DIR}/include -I${X11PREFIX}/inc
 
 CONFIGURE_ARGS+=	--with-win32-path=${LOCALBASE}/lib/win32
 CONFIGURE_ARGS+=	--disable-dpms
+# ffmpeg codec *partially* works, but is incredibly slow so we don't want to use it
 CONFIGURE_ARGS+=	--disable-ffmpeg
 
-.if defined (WITH_QT)
-.include "../../x11/qt2-designer/buildlink.mk"
+.include "../../mk/bsd.prefs.mk"
+
+AVIFILE_USE_QT?=	NO
+
+.if defined (AVIFILE_USE_QT) && ${AVIFILE_USE_QT} == "YES"
+
+# it would be more logical to set PLIST_SRC to PLIST first and then add PLIST.qt to it,
+# but @dirrm lib/avifile-0.6 will fail while processing pkg/PLIST,
+# because the directory still contains files (they are listed in PLIST.qt) and isn't empty,
+# thus can't be removed
+PLIST_SRC=		${PKGDIR}/PLIST.qt
+PLIST_SRC+=		${PKGDIR}/PLIST
+
 CXXFLAGS+=		-Wl,-R${QTDIR}/lib
 CXXFLAGS+=		-Wl,-R${LOCALBASE}/lib
 CXXFLAGS+=		-Wl,-R${X11BASE}/lib
 
 CONFIGURE_ARGS+=	--enable-qt
 CONFIGURE_ARGS+=	--with-qt-dir="${BUILDLINK_DIR}/qt2"
+
+.include "../../x11/qt2-designer/buildlink.mk"
+
 .endif
 
 pre-configure:
diff --git a/graphics/avifile-devel/distinfo b/graphics/avifile-devel/distinfo
index 085b5e096d7..d33e8cc44ea 100644
--- a/graphics/avifile-devel/distinfo
+++ b/graphics/avifile-devel/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2001/08/14 19:59:50 zuntum Exp $
+$NetBSD: distinfo,v 1.9 2001/08/19 08:55:59 zuntum Exp $
 
 SHA1 (avifile-0.6.20010814.tar.bz2) = 695227679dd09e9b9d1fb71caf58a9d92204b262
 Size (avifile-0.6.20010814.tar.bz2) = 1067753 bytes
diff --git a/graphics/avifile-devel/pkg/PLIST b/graphics/avifile-devel/pkg/PLIST
index 484e6774c9b..60d22d46c8a 100644
--- a/graphics/avifile-devel/pkg/PLIST
+++ b/graphics/avifile-devel/pkg/PLIST
@@ -1,11 +1,5 @@
-@comment $NetBSD: PLIST,v 1.4 2001/08/14 19:59:50 zuntum Exp $
-${QT}bin/avibench
-${QT}bin/avicat
+@comment $NetBSD: PLIST,v 1.5 2001/08/19 08:55:59 zuntum Exp $
 bin/avifile-config
-${QT}bin/avimake
-${QT}bin/aviplay
-${QT}bin/avirecompress
-${QT}bin/avitype
 include/avifile/Locker.h
 include/avifile/ReadHandlers.h
 include/avifile/StreamInfo.h
@@ -42,12 +36,6 @@ lib/avifile-0.6/libaudiodec-0.6.so.2.0
 lib/avifile-0.6/libaudiodec.a
 lib/avifile-0.6/libaudiodec.la
 lib/avifile-0.6/libaudiodec.so
-lib/avifile-0.6/libmjpeg-0.6.so
-lib/avifile-0.6/libmjpeg-0.6.so.2
-lib/avifile-0.6/libmjpeg-0.6.so.2.0
-lib/avifile-0.6/libmjpeg.a
-lib/avifile-0.6/libmjpeg.la
-lib/avifile-0.6/libmjpeg.so
 lib/avifile-0.6/libmp3lame_audioenc-0.6.so
 lib/avifile-0.6/libmp3lame_audioenc-0.6.so.2
 lib/avifile-0.6/libmp3lame_audioenc-0.6.so.2.0
diff --git a/graphics/avifile-devel/pkg/PLIST.qt b/graphics/avifile-devel/pkg/PLIST.qt
new file mode 100644
index 00000000000..691d1c7d1e6
--- /dev/null
+++ b/graphics/avifile-devel/pkg/PLIST.qt
@@ -0,0 +1,13 @@
+@comment $NetBSD: PLIST.qt,v 1.1 2001/08/19 08:55:59 zuntum Exp $
+bin/avibench
+bin/avicat
+bin/avimake
+bin/aviplay
+bin/avirecompress
+bin/avitype
+lib/avifile-0.6/libmjpeg-0.6.so
+lib/avifile-0.6/libmjpeg-0.6.so.2
+lib/avifile-0.6/libmjpeg-0.6.so.2.0
+lib/avifile-0.6/libmjpeg.a
+lib/avifile-0.6/libmjpeg.la
+lib/avifile-0.6/libmjpeg.so