1. Bump PORTREVISION to 1.

2. Change gross kluge for klaptopdaemon to use DO_NOT_COMPILE.
3. Added WITH_KFLOPPY knob, defaults to undefined.
3A. If WITH_KFLOPPY is not defined, then we add kfloppy to DO_NOT_COMPILE.
4. Anything that got put in DO_NOT_COMPILE then gets passed in the env
   to the configure script, which dutifully sets things up to not compile
   it.

Approved by: kris

6 files changed, 69 insertions, 30 deletions

diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 3ce4d66..1725a3a 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -25,13 +26,20 @@ MAN1=		efax.1 efix.1 fax.1
 
 #klaptop doesn't like alpha because alpha doesn't support apm
 .if ${MACHINE_ARCH} == "alpha"
-post-extract:
-	mv ${WRKSRC}/subdirs ${WRKSRC}/subdirs.orig
-	grep -v klaptopdaemon ${WRKSRC}/subdirs.orig > ${WRKSRC}/subdirs
-
+DO_NOT_COMPILE+=klaptopdaemon
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
+# kfloppy is a mostly broken, non-standard, linux-centric pain...
+.if !defined(WITH_KFLOPPY)
+DO_NOT_COMPILE+=kfloppy
+PLIST_SUB+=	KFLOPPY="@comment "
+.else
+PLIST_SUB+=	KFLOPPY=""
+.endif
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index 57012ca..cd21df3 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -1,3 +1,4 @@
+@comment files
 bin/ark
 bin/efax
 bin/efix
@@ -8,7 +9,7 @@ bin/kdepasswd
 bin/kdessh
 bin/kdf
 bin/kedit
-bin/kfloppy
+%%KFLOPPY%%bin/kfloppy
 bin/khexedit
 bin/kjots
 %%ALPHA_NA%%bin/klaptopdaemon
@@ -51,7 +52,7 @@ share/applnk/Settings/Information/kcmdf.desktop
 share/applnk/System/kdf.desktop
 share/applnk/System/kwikdisk.desktop
 share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KFloppy.desktop
+%%KFLOPPY%%share/applnk/Utilities/KFloppy.desktop
 share/applnk/Utilities/KLJetTool.desktop
 share/applnk/Utilities/KLpq.desktop
 share/applnk/Utilities/Kjots.desktop
@@ -182,7 +183,7 @@ share/icons/hicolor/16x16/apps/kcharselect.png
 share/icons/hicolor/16x16/apps/kcmdf.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/khexedit.png
 share/icons/hicolor/16x16/apps/kjots.png
 %%ALPHA_NA%%share/icons/hicolor/16x16/apps/klaptopdaemon.png
@@ -197,7 +198,7 @@ share/icons/hicolor/32x32/apps/kcalc.png
 share/icons/hicolor/32x32/apps/kcmdf.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/khexedit.png
 share/icons/hicolor/32x32/apps/kjots.png
 share/icons/hicolor/32x32/apps/kljettool.png
@@ -210,7 +211,7 @@ share/icons/hicolor/48x48/apps/ark.png
 share/icons/hicolor/48x48/apps/kcalc.png
 share/icons/hicolor/48x48/apps/kcharselect.png
 share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/khexedit.png
 share/icons/hicolor/48x48/apps/kjots.png
 share/icons/hicolor/48x48/apps/kljettool.png
@@ -222,15 +223,19 @@ share/icons/locolor/32x32/apps/klprfax.png
 share/services/arkpart.desktop
 %%ALPHA_NA%%share/services/klaptopdaemon.desktop
 share/services/kregexpeditorgui.desktop
+@comment empty dirs
 @exec /bin/mkdir -p %D/share/apps/kcalc/pics
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
+@comment remove dirs
 @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/48x48/apps
+@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor
 @dirrm share/doc/HTML/en/klprfax
 @dirrm share/doc/HTML/en/klpq
 @dirrm share/doc/HTML/en/kljettool
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 3ce4d66..1725a3a 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -25,13 +26,20 @@ MAN1=		efax.1 efix.1 fax.1
 
 #klaptop doesn't like alpha because alpha doesn't support apm
 .if ${MACHINE_ARCH} == "alpha"
-post-extract:
-	mv ${WRKSRC}/subdirs ${WRKSRC}/subdirs.orig
-	grep -v klaptopdaemon ${WRKSRC}/subdirs.orig > ${WRKSRC}/subdirs
-
+DO_NOT_COMPILE+=klaptopdaemon
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
+# kfloppy is a mostly broken, non-standard, linux-centric pain...
+.if !defined(WITH_KFLOPPY)
+DO_NOT_COMPILE+=kfloppy
+PLIST_SUB+=	KFLOPPY="@comment "
+.else
+PLIST_SUB+=	KFLOPPY=""
+.endif
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 57012ca..cd21df3 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -1,3 +1,4 @@
+@comment files
 bin/ark
 bin/efax
 bin/efix
@@ -8,7 +9,7 @@ bin/kdepasswd
 bin/kdessh
 bin/kdf
 bin/kedit
-bin/kfloppy
+%%KFLOPPY%%bin/kfloppy
 bin/khexedit
 bin/kjots
 %%ALPHA_NA%%bin/klaptopdaemon
@@ -51,7 +52,7 @@ share/applnk/Settings/Information/kcmdf.desktop
 share/applnk/System/kdf.desktop
 share/applnk/System/kwikdisk.desktop
 share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KFloppy.desktop
+%%KFLOPPY%%share/applnk/Utilities/KFloppy.desktop
 share/applnk/Utilities/KLJetTool.desktop
 share/applnk/Utilities/KLpq.desktop
 share/applnk/Utilities/Kjots.desktop
@@ -182,7 +183,7 @@ share/icons/hicolor/16x16/apps/kcharselect.png
 share/icons/hicolor/16x16/apps/kcmdf.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/khexedit.png
 share/icons/hicolor/16x16/apps/kjots.png
 %%ALPHA_NA%%share/icons/hicolor/16x16/apps/klaptopdaemon.png
@@ -197,7 +198,7 @@ share/icons/hicolor/32x32/apps/kcalc.png
 share/icons/hicolor/32x32/apps/kcmdf.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/khexedit.png
 share/icons/hicolor/32x32/apps/kjots.png
 share/icons/hicolor/32x32/apps/kljettool.png
@@ -210,7 +211,7 @@ share/icons/hicolor/48x48/apps/ark.png
 share/icons/hicolor/48x48/apps/kcalc.png
 share/icons/hicolor/48x48/apps/kcharselect.png
 share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/khexedit.png
 share/icons/hicolor/48x48/apps/kjots.png
 share/icons/hicolor/48x48/apps/kljettool.png
@@ -222,15 +223,19 @@ share/icons/locolor/32x32/apps/klprfax.png
 share/services/arkpart.desktop
 %%ALPHA_NA%%share/services/klaptopdaemon.desktop
 share/services/kregexpeditorgui.desktop
+@comment empty dirs
 @exec /bin/mkdir -p %D/share/apps/kcalc/pics
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
+@comment remove dirs
 @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/48x48/apps
+@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor
 @dirrm share/doc/HTML/en/klprfax
 @dirrm share/doc/HTML/en/klpq
 @dirrm share/doc/HTML/en/kljettool
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 3ce4d66..1725a3a 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	kdeutils
 PORTVERSION=	${KDE_VERSION}
+PORTREVISION=	1
 CATEGORIES?=	misc kde
 MASTER_SITES=		${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
@@ -25,13 +26,20 @@ MAN1=		efax.1 efix.1 fax.1
 
 #klaptop doesn't like alpha because alpha doesn't support apm
 .if ${MACHINE_ARCH} == "alpha"
-post-extract:
-	mv ${WRKSRC}/subdirs ${WRKSRC}/subdirs.orig
-	grep -v klaptopdaemon ${WRKSRC}/subdirs.orig > ${WRKSRC}/subdirs
-
+DO_NOT_COMPILE+=klaptopdaemon
 PLIST_SUB+=	ALPHA_NA="@comment "
 .else
 PLIST_SUB+=	ALPHA_NA=""
 .endif
+# kfloppy is a mostly broken, non-standard, linux-centric pain...
+.if !defined(WITH_KFLOPPY)
+DO_NOT_COMPILE+=kfloppy
+PLIST_SUB+=	KFLOPPY="@comment "
+.else
+PLIST_SUB+=	KFLOPPY=""
+.endif
+.if defined(DO_NOT_COMPILE)
+CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
+.endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index 57012ca..cd21df3 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/pkg-plist
@@ -1,3 +1,4 @@
+@comment files
 bin/ark
 bin/efax
 bin/efix
@@ -8,7 +9,7 @@ bin/kdepasswd
 bin/kdessh
 bin/kdf
 bin/kedit
-bin/kfloppy
+%%KFLOPPY%%bin/kfloppy
 bin/khexedit
 bin/kjots
 %%ALPHA_NA%%bin/klaptopdaemon
@@ -51,7 +52,7 @@ share/applnk/Settings/Information/kcmdf.desktop
 share/applnk/System/kdf.desktop
 share/applnk/System/kwikdisk.desktop
 share/applnk/Utilities/KCharSelect.desktop
-share/applnk/Utilities/KFloppy.desktop
+%%KFLOPPY%%share/applnk/Utilities/KFloppy.desktop
 share/applnk/Utilities/KLJetTool.desktop
 share/applnk/Utilities/KLpq.desktop
 share/applnk/Utilities/Kjots.desktop
@@ -182,7 +183,7 @@ share/icons/hicolor/16x16/apps/kcharselect.png
 share/icons/hicolor/16x16/apps/kcmdf.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kedit.png
-share/icons/hicolor/16x16/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/khexedit.png
 share/icons/hicolor/16x16/apps/kjots.png
 %%ALPHA_NA%%share/icons/hicolor/16x16/apps/klaptopdaemon.png
@@ -197,7 +198,7 @@ share/icons/hicolor/32x32/apps/kcalc.png
 share/icons/hicolor/32x32/apps/kcmdf.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kedit.png
-share/icons/hicolor/32x32/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/khexedit.png
 share/icons/hicolor/32x32/apps/kjots.png
 share/icons/hicolor/32x32/apps/kljettool.png
@@ -210,7 +211,7 @@ share/icons/hicolor/48x48/apps/ark.png
 share/icons/hicolor/48x48/apps/kcalc.png
 share/icons/hicolor/48x48/apps/kcharselect.png
 share/icons/hicolor/48x48/apps/kedit.png
-share/icons/hicolor/48x48/apps/kfloppy.png
+%%KFLOPPY%%share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/khexedit.png
 share/icons/hicolor/48x48/apps/kjots.png
 share/icons/hicolor/48x48/apps/kljettool.png
@@ -222,15 +223,19 @@ share/icons/locolor/32x32/apps/klprfax.png
 share/services/arkpart.desktop
 %%ALPHA_NA%%share/services/klaptopdaemon.desktop
 share/services/kregexpeditorgui.desktop
+@comment empty dirs
 @exec /bin/mkdir -p %D/share/apps/kcalc/pics
-@exec /bin/mkdir -p %D/share/apps/kcalc/pics
+@comment remove dirs
 @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/48x48/apps
+@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/apps
+@dirrm share/icons/hicolor/32x32
+@dirrm share/icons/hicolor
 @dirrm share/doc/HTML/en/klprfax
 @dirrm share/doc/HTML/en/klpq
 @dirrm share/doc/HTML/en/kljettool