wip/trayer -> wm/trayer fallout

["John D. Baker" <jdbaker%mylinuxisp.com@localhost>]

When "trayer" was imported to "wm/trayer" and removed from "wip/trayer",
I was hoping that similar attention be given to the only known consumer
of "trayer", "fvwm-crystal".

As it stands, "fvwm-crystal" remains in "pkgsrc-wip", but was not updated
to reflect the migration of "trayer".  Likewise, "fvwm-crystal" lacks
DESTDIR support, and depends on a now-dated version of "wm/fvwm-devel"
(fvwm-2.5.31) rather than the more recent "wm/fvwm" (fvwm-2.6.5).

In addition, a dependency of "fvwm-crystal, "wip/habak", needs to
explicitly link with "-lX11" to work with netbsd-7 and -current.

I have been keeping local patches to do all these things.  I finally
managed to contact the listed MAINTAINER of "fvwm-crystal" and "habak",
but it seems there is no interest in these packages anymore.

See below my patches for "wip/habak" and "wip/fvwm-crystal".


+Index: habak/Makefile
+===================================================================
+RCS file: /cvsroot/pkgsrc-wip/wip/habak/Makefile,v
+retrieving revision 1.3
+diff -u -b -r1.3 Makefile
+--- habak/Makefile	29 Sep 2012 16:46:13 -0000	1.3
++++ habak/Makefile	16 Oct 2013 12:14:11 -0000
+@@ -18,7 +18,7 @@
+ SUBST_MESSAGE.fix-linking=	Fixing linking.
+ SUBST_FILES.fix-linking=	Makefile
+ SUBST_SED.fix-linking=		-e 's,CFLAGS += -I/usr/X11R6/include -Wall,,g'
+-SUBST_SED.fix-linking+=		-e 's,LDFLAGS += -L/usr/X11R6/lib -lImlib2 -lm,LDFLAGS += -lImlib2 -lm,g'
++SUBST_SED.fix-linking+=		-e 's,LDFLAGS += -L/usr/X11R6/lib -lImlib2 -lm,LDFLAGS += -lImlib2 -lX11 -lm,g'
+ 
+ 
+ INSTALLATION_DIRS=	bin
+Index: fvwm-crystal/Makefile
+===================================================================
+RCS file: /cvsroot/pkgsrc-wip/wip/fvwm-crystal/Makefile,v
+retrieving revision 1.7
+diff -u -p -r1.7 Makefile
+--- fvwm-crystal/Makefile	28 Sep 2012 23:21:49 -0000	1.7
++++ fvwm-crystal/Makefile	22 Jun 2015 00:05:28 -0000
+@@ -10,8 +10,6 @@ MAINTAINER=		milos.negovanovic@googlemai
+ HOMEPAGE=		http://fvwm-crystal.org/
+ COMMENT=		Easy to use, powerful desktop environment
+ 
+-PKG_DESTDIR_SUPPORT=	none
+-
+ EGDIR=			${PREFIX}/share/examples/fvwm-crystal
+ 
+ SUBST_CLASSES+=		python
+@@ -29,8 +27,8 @@ SUBST_SED.bash=		-e "s,/usr/bin/env bash
+ SUBST_MESSAGE.bash=	Fixing harcoded bash path
+ 
+ 
+-DEPENDS+=	fvwm>=2.5.14:../../wm/fvwm-devel
+-DEPENDS+=	trayer>=1.0:../../wip/trayer
++DEPENDS+=	fvwm>=2.5.14:../../wm/fvwm
++DEPENDS+=	trayer>=1.0:../../wm/trayer
+ DEPENDS+=	ImageMagick>=6.2.9.1:../../graphics/ImageMagick
+ DEPENDS+=	bash>=3.0:../../shells/bash
+ .include "options.mk"
+@@ -40,12 +38,12 @@ do-build:
+ 	#cd ${WRKSRC} && prefix=${WRKSRC}/build make install # for generating PLIST
+ 
+ do-install:
+-	cd ${WRKSRC} && prefix=${PREFIX} make install
++	cd ${WRKSRC} && prefix=${DESTDIR}${PREFIX} make install
+ 
+ post-install:
+-	${INSTALL_DATA_DIR} ${EGDIR}
+-	${INSTALL_DATA} ${WRKSRC}/addons/Xresources ${EGDIR}
+-	${INSTALL_DATA} ${WRKSRC}/addons/Xsession ${EGDIR}
++	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
++	${INSTALL_DATA} ${WRKSRC}/addons/Xresources ${DESTDIR}${EGDIR}
++	${INSTALL_DATA} ${WRKSRC}/addons/Xsession ${DESTDIR}${EGDIR}
+ 
+ 
+ .include "../../lang/python/extension.mk"

-- 
|/"\ John D. Baker, KN5UKS               NetBSD     Darwin/MacOS X
|\ / jdbaker[snail]mylinuxisp[flyspeck]com    OpenBSD            FreeBSD
| X  No HTML/proprietary data in email.   BSD just sits there and works!
|/ \ GPGkeyID:  D703 4A7E 479F 63F8 D3F4  BD99 9572 8F23 E4AD 1645