Sat Mar 17 23:01:02 2018 UTC ()
Install patched mwm.fvwmrc to the correct filename


(jmcneill)
diff -r1.21 -r1.22 pkgsrc/wm/fvwm1/Makefile
cvs diff -r1.21 -r1.22 pkgsrc/wm/fvwm1/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/fvwm1/Attic/Makefile 2012/10/29 09:46:46 1.21
+++ pkgsrc/wm/fvwm1/Attic/Makefile 2018/03/17 23:01:02 1.22
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.21 2012/10/29 09:46:46 cegger Exp $ 1# $NetBSD: Makefile,v 1.22 2018/03/17 23:01:02 jmcneill Exp $
2 2
3DISTNAME= fvwm-1.24r 3DISTNAME= fvwm-1.24r
4PKGNAME= ${DISTNAME:S/fvwm/fvwm1/} 4PKGNAME= ${DISTNAME:S/fvwm/fvwm1/}
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= x11 wm 6CATEGORIES= x11 wm
7MASTER_SITES= ${MASTER_SITE_LOCAL} 7MASTER_SITES= ${MASTER_SITE_LOCAL}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://www.fvwm.org/ 10HOMEPAGE= http://www.fvwm.org/
11COMMENT= Virtual window manager for X 11COMMENT= Virtual window manager for X
12LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
13 13
14DEPENDS+= xpmroot-2.*:../../x11/xpmroot 14DEPENDS+= xpmroot-2.*:../../x11/xpmroot
15 15
16CONFLICTS= fvwm2-* fvwm>=1 16CONFLICTS= fvwm2-* fvwm>=1
17 17
18NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL 18NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL
@@ -31,27 +31,27 @@ post-extract: @@ -31,27 +31,27 @@ post-extract:
31 ${SED} -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \ 31 ${SED} -e 's@#ifdef AlphaArchitecture@#if defined(AlphaArchitecture) \&\& !defined(NetBSDArchitecture)@' \
32 <${WRKSRC}/modules/GoodStuff/Imakefile.orig >${WRKSRC}/modules/GoodStuff/Imakefile 32 <${WRKSRC}/modules/GoodStuff/Imakefile.orig >${WRKSRC}/modules/GoodStuff/Imakefile
33 33
34post-patch: 34post-patch:
35 cd ${WRKSRC}; \ 35 cd ${WRKSRC}; \
36 ${MV} configure.h configure.h.old; \ 36 ${MV} configure.h configure.h.old; \
37 ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \ 37 ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
38 -e 's#$${X11BASE}#${X11BASE}#g' configure.h.old >configure.h; \ 38 -e 's#$${X11BASE}#${X11BASE}#g' configure.h.old >configure.h; \
39 ${MV} sample.fvwmrc/system.fvwmrc sample.fvwmrc/system.fvwmrc.old; \ 39 ${MV} sample.fvwmrc/system.fvwmrc sample.fvwmrc/system.fvwmrc.old; \
40 ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \ 40 ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
41 -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/system.fvwmrc.old >sample.fvwmrc/system.fvwmrc; \ 41 -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/system.fvwmrc.old >sample.fvwmrc/system.fvwmrc; \
42 ${MV} sample.fvwmrc/mwm.fvwmrc sample.fvwmrc/mwm.fvwmrc.old; \ 42 ${MV} sample.fvwmrc/mwm.fvwmrc sample.fvwmrc/mwm.fvwmrc.old; \
43 ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \ 43 ${SED} -e 's#$${PREFIX}#${PREFIX}#g' \
44 -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/mwm.fvwmrc.old >sample.fvwmrc/mvm.fvwmrc 44 -e 's#$${X11BASE}#${X11BASE}#g' sample.fvwmrc/mwm.fvwmrc.old >sample.fvwmrc/mwm.fvwmrc
45 45
46INSTALLATION_DIRS= lib/X11/fvwm/pixmaps lib/X11/fvwm/bitmaps 46INSTALLATION_DIRS= lib/X11/fvwm/pixmaps lib/X11/fvwm/bitmaps
47 47
48post-install: 48post-install:
49 ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \ 49 ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xpm \
50 ${DESTDIR}${PREFIX}/lib/X11/fvwm/pixmaps 50 ${DESTDIR}${PREFIX}/lib/X11/fvwm/pixmaps
51 ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \ 51 ${INSTALL_DATA} ${WRKSRC}/fvwm_icons/*.xbm \
52 ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \ 52 ${WRKSRC}/fvwm_icons/*.bitmap ${WRKSRC}/fvwm_icons/*.icon \
53 ${DESTDIR}${PREFIX}/lib/X11/fvwm/bitmaps 53 ${DESTDIR}${PREFIX}/lib/X11/fvwm/bitmaps
54 54
55.include "../../x11/libXext/buildlink3.mk" 55.include "../../x11/libXext/buildlink3.mk"
56.include "../../x11/libXmu/buildlink3.mk" 56.include "../../x11/libXmu/buildlink3.mk"
57.include "../../x11/libXpm/buildlink3.mk" 57.include "../../x11/libXpm/buildlink3.mk"