It must fix a package's kdm problem and screenlock's problem.

PR:		14205, 14188

9 files changed, 135 insertions, 18 deletions

diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kdebase11/Makefile b/x11/kdebase11/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kdebase11/Makefile
+++ b/x11/kdebase11/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 5714fad5dbe3..3e7077cbcc3c 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -22,11 +22,24 @@ LIB_DEPENDS=	gif.5:${PORTSDIR}/graphics/giflib \
 USE_BZIP2=	yes
 USE_QT=		yes
 HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	"--prefix=$(PREFIX)"
+CONFIGURE_ARGS=	"--prefix=$(PREFIX)" \
+		"--with-xdmdir=${X11BASE}/lib/X11/xdm"
 CONFIGURE_ENV=	CXXFLAGS="$(CFLAGS) -DHAVE_GETUSERSHELL -DTIME_WITH_SYS_TIME" \
-		INSTALL_SCRIPT="install -c -m 555"
+		INSTALL_SCRIPT="install -c -m 555" \
+		PATH="${PATH}:${X11BASE}/bin"
 USE_GMAKE=	yes
 MAKE_ENV=	RM=${RM}
 CFLAGS+=	"-I$(PREFIX)/include"
 
+KSSES=	kattraction.kss kbanner.kss kbat.kss kblankscrn.kss \
+	kblob.kss kbouboule.kss kbsod.kss kflame.kss kforest.kss \
+	khop.kss klaser.kss klines.kss klissie.kss kmatrix.kss \
+	kmorph3d.kss kpipes.kss kpolygon.kss kpyro.kss krock.kss \
+	kscience.kss kslidescreen.kss kslip.kss kspace.kss kswarm.kss 
+
+post-install:
+.for KSS in $(KSSES)
+	$(CHMOD) 4555 $(PREFIX)/bin/$(KSS)
+.endfor
+
 .include <bsd.port.mk>