diff options
author | Cy Schubert <cy@FreeBSD.org> | 2009-02-03 21:07:11 +0000 |
---|---|---|
committer | Cy Schubert <cy@FreeBSD.org> | 2009-02-03 21:07:11 +0000 |
commit | 63f25623c1c8c51862302facee0b6209d639f688 (patch) | |
tree | 31af89f1bef32b6a1c5cbf2eb3ff261a518d1592 | |
parent | Make the fusefs kernel module compile on -CURRENT again. (diff) |
Additional fvwm_icons fix.
Pointy hat to: me
Notes
Notes:
svn path=/head/; revision=227567
-rw-r--r-- | x11-wm/fvwm2-devel/Makefile | 6 | ||||
-rw-r--r-- | x11-wm/fvwm2/Makefile | 8 | ||||
-rw-r--r-- | x11-wm/fvwm24/Makefile | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/x11-wm/fvwm2-devel/Makefile b/x11-wm/fvwm2-devel/Makefile index e321bb17ace7..2864115a9f08 100644 --- a/x11-wm/fvwm2-devel/Makefile +++ b/x11-wm/fvwm2-devel/Makefile @@ -45,8 +45,8 @@ OPTIONS= ICONS "Install default icon set" on \ .include <bsd.port.pre.mk> .if !defined(WITHOUT_ICONS) -FVWM_ICONS= fvwm_icons-20070101.tar.bz2 -DISTFILES+= ${FVWM_ICONS} +FVWM_ICONS= fvwm_icons-20070101 +DISTFILES+= ${FVWM_ICONS}.tar.bz2 .endif .if defined(WITHOUT_ICONV) @@ -159,7 +159,7 @@ post-install: .if !defined(WITHOUT_ICONS) @${MKDIR} ${PREFIX}/share/fvwm/pixmaps - ${INSTALL_DATA} ${WRKDIR}/icons/fvwm_icons/*.xpm \ + ${INSTALL_DATA} ${WRKDIR}/icons/${FVWM_ICONS}/*.xpm \ ${PREFIX}/share/fvwm/pixmaps .endif diff --git a/x11-wm/fvwm2/Makefile b/x11-wm/fvwm2/Makefile index b8da1e3f5de6..cbe66d52fd85 100644 --- a/x11-wm/fvwm2/Makefile +++ b/x11-wm/fvwm2/Makefile @@ -11,8 +11,8 @@ PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ -FVWM_ICONS= fvwm_icons-20070101.tar.bz2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS} +FVWM_ICONS= fvwm_icons-20070101 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS}.tar.bz2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cy@FreeBSD.org @@ -90,7 +90,7 @@ PLIST_SUB+= GTK="@comment not installed: " post-extract: @${MKDIR} ${WRKDIR}/icons - @${TAR} -xyf ${DISTDIR}/${FVWM_ICONS} -C ${WRKDIR}/icons + @${TAR} -xyf ${DISTDIR}/${FVWM_ICONS}.tar.bz2 -C ${WRKDIR}/icons post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ @@ -104,7 +104,7 @@ post-install: ${PREFIX}/etc/system.fvwm2rc; \ fi @${MKDIR} ${PREFIX}/share/fvwm2/pixmaps - ${INSTALL_DATA} ${WRKDIR}/icons/fvwm_icons/*.xpm \ + ${INSTALL_DATA} ${WRKDIR}/icons/${FVWM_ICONS}/*.xpm \ ${PREFIX}/share/fvwm2/pixmaps .include <bsd.port.post.mk> diff --git a/x11-wm/fvwm24/Makefile b/x11-wm/fvwm24/Makefile index b8da1e3f5de6..cbe66d52fd85 100644 --- a/x11-wm/fvwm24/Makefile +++ b/x11-wm/fvwm24/Makefile @@ -11,8 +11,8 @@ PORTREVISION= 2 CATEGORIES= x11-wm MASTER_SITES= ftp://ftp.fvwm.org/pub/fvwm/version-2/ \ http://www.fvwm.org/generated/icon_download/ -FVWM_ICONS= fvwm_icons-20070101.tar.bz2 -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS} +FVWM_ICONS= fvwm_icons-20070101 +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} ${FVWM_ICONS}.tar.bz2 EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} MAINTAINER= cy@FreeBSD.org @@ -90,7 +90,7 @@ PLIST_SUB+= GTK="@comment not installed: " post-extract: @${MKDIR} ${WRKDIR}/icons - @${TAR} -xyf ${DISTDIR}/${FVWM_ICONS} -C ${WRKDIR}/icons + @${TAR} -xyf ${DISTDIR}/${FVWM_ICONS}.tar.bz2 -C ${WRKDIR}/icons post-patch: @${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' \ @@ -104,7 +104,7 @@ post-install: ${PREFIX}/etc/system.fvwm2rc; \ fi @${MKDIR} ${PREFIX}/share/fvwm2/pixmaps - ${INSTALL_DATA} ${WRKDIR}/icons/fvwm_icons/*.xpm \ + ${INSTALL_DATA} ${WRKDIR}/icons/${FVWM_ICONS}/*.xpm \ ${PREFIX}/share/fvwm2/pixmaps .include <bsd.port.post.mk> |