Mon Sep 14 18:21:36 2020 UTC ()
Drop useless SUBST block.


(joerg)
diff -r1.20 -r1.21 pkgsrc/wm/fvwm-themes/Makefile
cvs diff -r1.20 -r1.21 pkgsrc/wm/fvwm-themes/Makefile (expand / switch to unified diff)

--- pkgsrc/wm/fvwm-themes/Makefile 2020/08/31 18:12:29 1.20
+++ pkgsrc/wm/fvwm-themes/Makefile 2020/09/14 18:21:36 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.20 2020/08/31 18:12:29 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2020/09/14 18:21:36 joerg Exp $
2# 2#
3 3
4DISTNAME= fvwm-themes-${THEM_VER} 4DISTNAME= fvwm-themes-${THEM_VER}
5PKGREVISION= 16 5PKGREVISION= 16
6CATEGORIES= wm 6CATEGORIES= wm
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fvwm-themes/} 7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=fvwm-themes/}
8EXTRACT_SUFX= .tar.bz2 8EXTRACT_SUFX= .tar.bz2
9DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \ 9DISTFILES+= ${DISTNAME}${EXTRACT_SUFX} \
10 fvwm-themes-extra-${THEM_VER}.tar.bz2 10 fvwm-themes-extra-${THEM_VER}.tar.bz2
11LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
12 12
13MAINTAINER= gendalia@NetBSD.org 13MAINTAINER= gendalia@NetBSD.org
14HOMEPAGE= http://fvwm-themes.sourceforge.net/ 14HOMEPAGE= http://fvwm-themes.sourceforge.net/
@@ -57,33 +57,26 @@ SUBST_MESSAGE.fvwm-menuapp= Fixing FT_DA @@ -57,33 +57,26 @@ SUBST_MESSAGE.fvwm-menuapp= Fixing FT_DA
57SUBST_CLASSES+= gnome_session 57SUBST_CLASSES+= gnome_session
58SUBST_FILES.gnome_session= configure.in 58SUBST_FILES.gnome_session= configure.in
59SUBST_SED.gnome_session= -e 's|GNOME_SESSION=/usr/bin/gnome-session|GNOME_SESSION=${PREFIX}/bin/gnome-session|' 59SUBST_SED.gnome_session= -e 's|GNOME_SESSION=/usr/bin/gnome-session|GNOME_SESSION=${PREFIX}/bin/gnome-session|'
60SUBST_STAGE.gnome_session= pre-configure 60SUBST_STAGE.gnome_session= pre-configure
61SUBST_MESSAGE.gnome_session= gnome-session path fixed 61SUBST_MESSAGE.gnome_session= gnome-session path fixed
62 62
63#### 5 #### 63#### 5 ####
64SUBST_CLASSES+= root_prefix 64SUBST_CLASSES+= root_prefix
65SUBST_FILES.root_prefix= bin/fvwm-themes-config-destdir.in 65SUBST_FILES.root_prefix= bin/fvwm-themes-config-destdir.in
66SUBST_SED.root_prefix= -e 's|\/^$$ROOT_PREFIX\/\/|\|\^${DESTDIR}\|\||' 66SUBST_SED.root_prefix= -e 's|\/^$$ROOT_PREFIX\/\/|\|\^${DESTDIR}\|\||'
67SUBST_STAGE.root_prefix= pre-configure 67SUBST_STAGE.root_prefix= pre-configure
68SUBST_MESSAGE.root_prefix= root_prefix tweak implementing 68SUBST_MESSAGE.root_prefix= root_prefix tweak implementing
69 69
70#### 6 #### 
71SUBST_CLASSES+= theme-cfg 
72SUBST_FILES.theme-cfg= ${DESTDIR}${PREFIX}/share/fvwm2/themes/current/theme.cfg 
73SUBST_SED.theme-cfg= -e 's|${WRKDR}/.destdir||' 
74SUBST_STAGE.theme-cfg= post-install 
75SUBST_MESSAGE.theme-cfg= theme-cfg tweak implementing 
76 
77# Copied from bin/ and add -destdir onto its name. 70# Copied from bin/ and add -destdir onto its name.
78# See following two targets. 71# See following two targets.
79bin_SCRIPTS_DESTDIR= fvwm-themes-config fvwm-themes-menuapp 72bin_SCRIPTS_DESTDIR= fvwm-themes-config fvwm-themes-menuapp
80 73
81# Fake by making two different version of script under bin/ 74# Fake by making two different version of script under bin/
82pre-patch: 75pre-patch:
83 for i in ${bin_SCRIPTS_DESTDIR} ; do \ 76 for i in ${bin_SCRIPTS_DESTDIR} ; do \
84 ${CP} ${WRKSRC}/bin/$$i.in ${WRKSRC}/bin/$$i-destdir.in ;\ 77 ${CP} ${WRKSRC}/bin/$$i.in ${WRKSRC}/bin/$$i-destdir.in ;\
85 done 78 done
86 79
87post-install: 80post-install:
88 ${DESTDIR}${PREFIX}/bin/fvwm-themes-config-destdir --site --install \ 81 ${DESTDIR}${PREFIX}/bin/fvwm-themes-config-destdir --site --install \
89 ${DISTDIR}/fvwm-themes-extra-${THEM_VER}.tar.bz2 82 ${DISTDIR}/fvwm-themes-extra-${THEM_VER}.tar.bz2