Attachment 192767 Details for Bug 227731 – Patch updating x11-wm/swm to 1.3.5

[patch] Patch updating x11-wm/swm to 1.3.5

x11-wm__swm__1.3.5.diff (text/plain), 5.13 KB, created by Mateusz Piotrowski on 2018-04-24 01:49:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mateusz Piotrowski

Created: 2018-04-24 01:49:37 UTC

Size: 5.13 KB

patch

obsolete

>diff --git x11-wm/swm/Makefile x11-wm/swm/Makefile
>index 3999885e97fd..e298dd000bdc 100644
>--- x11-wm/swm/Makefile
>+++ x11-wm/swm/Makefile
>@@ -2,65 +2,44 @@
> # $FreeBSD$
> 
> PORTNAME=	swm
>-PORTVERSION=	1.3.4c
>-PORTREVISION=	1
>+DISTVERSION=	1.3.5
> CATEGORIES=	x11-wm
> MASTER_SITES=	http://www.small-window-manager.de/
> EXTRACT_SUFX=	-src.tgz
> 
>-MAINTAINER=	ports@FreeBSD.org
>+MAINTAINER=	0mp@FreeBSD.org
> COMMENT=	Window manager for low-memory systems, with title bars and shading
> 
> LICENSE=	GPLv2
> LICENSE_FILE=	${WRKSRC}/doc/COPYING
> 
>-WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:S,c,,}
>-BUILD_WRKSRC=	${WRKSRC}/src
>+WRKSRC=		${WRKDIR}/sWM-${PORTVERSION}
> 
>-USE_XORG=	xpm
>-USES=		gmake
>-MAKEFILE=	Makefile-xpm
>-MAKE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="" CC="${CC}" XROOT="${LOCALBASE}"
>+USES=		gmake shebangfix
>+USE_XORG=	x11 xpm
>+MAKE_ARGS=	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="${CC}" \
>+		X11INC=${LOCALBASE}/include \
>+		X11LIB=${LOCALBASE}/lib \
>+		INSTALLDIR=${STAGEDIR}${PREFIX} \
>+		DOCDIR=${STAGEDIR}${PREFIX}/share/doc
>+SHEBANG_FILES=	bin/sWMconfig bin/startsWM
> 
>-PORTDOCS=	*
>-PORTEXAMPLES=	*
>-
>-MAKE_JOBS_UNSAFE=	yes
>+DATADIR=	${PREFIX}/share/sWM
>+DOCSDIR=	${PREFIX}/share/doc/sWM
> 
> OPTIONS_DEFINE=	DOCS EXAMPLES
> 
>-post-patch:
>-	@${REINPLACE_CMD} -e 's|monotype|fixed|g ; \
>-		 s|/usr/share/swm|${DATADIR}|g' ${WRKSRC}/src/swm.conf
>-
>-post-build:
>-	cd ${WRKSRC}/swmbg && ${CC} ${CFLAGS} -I${LOCALBASE}/include \
>-		*.c -o ${WRKSRC}/src/swmbg -lX11 -lXext -lXpm -L${LOCALBASE}/lib
>-	cd ${WRKSRC}/swmswitch && ${CC} ${CFLAGS} -I${LOCALBASE}/include \
>-		*.c -o ${WRKSRC}/src/swmswitch -lX11 -L${LOCALBASE}/lib
>-
>-do-install:
>-.for f in swm swmbg swmswitch
>-	${INSTALL_PROGRAM} ${WRKSRC}/src/${f} ${STAGEDIR}${PREFIX}/bin
>-.endfor
>-	${INSTALL_SCRIPT} ${WRKSRC}/src/startswm ${STAGEDIR}${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/src/swm.1x ${STAGEDIR}${MANPREFIX}/man/man1/swm.1
>-	${INSTALL_MAN} ${WRKSRC}/swmbg/swmbg.1x ${STAGEDIR}${MANPREFIX}/man/man1/swmbg.1
>-	${INSTALL_MAN} ${WRKSRC}/swmswitch/swmswitch.1x ${STAGEDIR}${MANPREFIX}/man/man1/swmswitch.1
>-	@${MKDIR} ${STAGEDIR}${MANPREFIX}/man/de/man1
>-	${INSTALL_MAN} ${WRKSRC}/src/swm-de.1x ${STAGEDIR}${MANPREFIX}/man/de/man1/swm.1
>-	${INSTALL_MAN} ${WRKSRC}/swmbg/swmbg-de.1x ${STAGEDIR}${MANPREFIX}/man/de/man1/swmbg.1
>-	${INSTALL_MAN} ${WRKSRC}/swmswitch/swmswitch-de.1x ${STAGEDIR}${MANPREFIX}/man/de/man1/swmswitch.1
>-	@${MKDIR} ${STAGEDIR}${DATADIR}
>-	cd ${WRKSRC}/share/swm && ${COPYTREE_SHARE} pixmaps ${STAGEDIR}${DATADIR}
>+# Accept the defaults of suggested in the  interactive configuration script.
>+do-configure:
>+	cd ${WRKSRC} && yes '' | ./configure
> 
>-do-install-DOCS-on:
>-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
>+post-configure:
>+	${REINPLACE_CMD} -e 's|monotype|fixed|g' \
>+		-e 's|/usr/share/sWM|${DATADIR}|g' ${WRKSRC}/config.h
> 
> do-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
>-	cd ${STAGEDIR}${EXAMPLESDIR} && ${MV} .swm dot.swm
>+	cd ${STAGEDIR}${EXAMPLESDIR} && ${MV} .sWM dot.sWM
> 
> .include <bsd.port.mk>
>diff --git x11-wm/swm/distinfo x11-wm/swm/distinfo
>index 4c35c6205ab8..94460ccbc0f4 100644
>--- x11-wm/swm/distinfo
>+++ x11-wm/swm/distinfo
>@@ -1,2 +1,3 @@
>-SHA256 (swm-1.3.4c-src.tgz) = fc4fdfcb423a75789bb12f8045a3f465bdd66f3413b8ef77833c26e9e035d58b
>-SIZE (swm-1.3.4c-src.tgz) = 96989
>+TIMESTAMP = 1524525707
>+SHA256 (swm-1.3.5-src.tgz) = 341069b1e6d1be35bb72128342ce012a3f8d7f44841475ccda73888a7237341d
>+SIZE (swm-1.3.5-src.tgz) = 107149
>diff --git x11-wm/swm/pkg-plist x11-wm/swm/pkg-plist
>index ab612bc68a10..34fc4ecd2bbc 100644
>--- x11-wm/swm/pkg-plist
>+++ x11-wm/swm/pkg-plist
>@@ -1,16 +1,39 @@
>-bin/startswm
>-bin/swm
>-bin/swmbg
>-bin/swmswitch
>-man/de/man1/swm.1.gz
>-man/de/man1/swmbg.1.gz
>-man/de/man1/swmswitch.1.gz
>-man/man1/swm.1.gz
>-man/man1/swmbg.1.gz
>-man/man1/swmswitch.1.gz
>+bin/startsWM
>+bin/sWM
>+bin/sWMbg
>+bin/sWMswitch
>+bin/sWMconfig
>+man/man1/sWM-de.1x.gz
>+man/man1/sWM.1x.gz
>+man/man1/sWMbg-de.1x.gz
>+man/man1/sWMbg.1x.gz
>+man/man1/sWMswitch-de.1x.gz
>+man/man1/sWMswitch.1x.gz
> %%DATADIR%%/pixmaps/background.xpm
> %%DATADIR%%/pixmaps/closebox.xpm
> %%DATADIR%%/pixmaps/maxbox.xpm
> %%DATADIR%%/pixmaps/stickybox.xpm
>-%%DATADIR%%/pixmaps/swm.colors
> %%DATADIR%%/pixmaps/unstickybox.xpm
>+%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
>+%%PORTDOCS%%%%DOCSDIR%%/COPYING
>+%%PORTDOCS%%%%DOCSDIR%%/FEATURES
>+%%PORTDOCS%%%%DOCSDIR%%/FOR_MINIMALISTS
>+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
>+%%PORTDOCS%%%%DOCSDIR%%/LIESMICH
>+%%PORTDOCS%%%%DOCSDIR%%/README
>+%%PORTDOCS%%%%DOCSDIR%%/README-PDA
>+%%PORTDOCS%%%%DOCSDIR%%/SWM-FAQ
>+%%PORTDOCS%%%%DOCSDIR%%/X-SPEEDUP-FAQ
>+%%PORTDOCS%%%%DOCSDIR%%/changelog
>+%%PORTDOCS%%%%DOCSDIR%%/config.h.example
>+%%PORTDOCS%%%%DOCSDIR%%/config.h.iPAQ
>+%%PORTDOCS%%%%DOCSDIR%%/sWM.doxygen
>+%%PORTDOCS%%%%DOCSDIR%%/sWMdoc-1.3.x-small.jpg
>+%%PORTDOCS%%%%DOCSDIR%%/themeing
>+%%PORTDOCS%%%%DOCSDIR%%/todo
>+%%PORTDOCS%%%%DOCSDIR%%/version
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.sWM/button1
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.sWM/button2
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/dot.sWM/button3
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/gnome/wm-properties/sWM.desktop
>+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/wmsession.d/12SWM

Flags:

0mp: maintainer-approval?

Actions: View | Diff

Attachments on bug 227731: 192767