Attachment 41770 Details for Bug 65265 – file.diff

[patch] file.diff

file.diff (text/plain), 3.16 KB, created by tkato on 2004-04-06 18:40:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato

Created: 2004-04-06 18:40:10 UTC

Size: 3.16 KB

patch

obsolete

>diff -ruN /usr/ports/x11-wm/pwm/Makefile x11-wm/pwm/Makefile
>--- /usr/ports/x11-wm/pwm/Makefile	Fri Mar 26 13:34:02 2004
>+++ x11-wm/pwm/Makefile	Wed Apr  7 00:08:35 2004
>@@ -6,28 +6,29 @@
> #
> 
> PORTNAME=	pwm
>-PORTVERSION=	1.0
>-PORTREVISION=	2
>+PORTVERSION=	2003.06.17
> CATEGORIES=	x11-wm
>-MASTER_SITES=	http://modeemi.fi/~tuomov/dl/
>+MASTER_SITES=	http://modeemi.fi/~tuomov/pwm/dl/
>+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	A lightweight window manager with emphasis on usability
> 
> USE_X_PREFIX=	yes
>-USE_PERL5_BUILD=yes
>+USE_REINPLACE=	yes
> USE_GMAKE=	yes
>+MAKE_ENV=	X11_PREFIX="${X11BASE}"
> 
> MAN1=		pwm.1x
> 
> post-patch:
>-	@${PERL} -pi \
>-		-e 's#^PREFIX.*$$#PREFIX=${PREFIX}#;' \
>-		-e 's#^X11_PREFIX.*$$#X11_PREFIX=${X11BASE}#;' \
>-		-e 's#^CC=.*$$#CC=${CC}#;' \
>-		-e 's#^CFLAGS=-g -O2 (.*)$$#CFLAGS=${CFLAGS} \1#;' \
>-		-e 's#^LDFLAGS=-g (.*)$$#LDFLAGS=${LDFLAGS} \1#;' \
>-		${WRKSRC}/system.mk
>+	@${REINPLACE_CMD} -e \
>+		's|^PREFIX=|PREFIX?=|g ; \
>+		 s|^X11_PREFIX=|X11_PREFIX?=|g ; \
>+		 s|^CC=|CC?=|g ; \
>+		 s|^CFLAGS=-g -O2|CFLAGS+=|g ; \
>+		 s|^LDFLAGS=-g|LDFLAGS=|g ; \
>+		 s|-pedantic-errors||g' ${WRKSRC}/system.mk
> 
> do-install:
> 	${INSTALL_PROGRAM} ${WRKSRC}/pwm ${PREFIX}/bin
>@@ -38,9 +39,9 @@
> 	${CP} ${PREFIX}/etc/pwm/sample.conf ${PREFIX}/etc/pwm/pwm.conf
> .endif
> .if !defined(NOPORTDOCS)
>-	@${MKDIR} ${PREFIX}/share/doc/pwm
>-	${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/doc/pwm
>-	${INSTALL_DATA} ${WRKSRC}/config.txt ${PREFIX}/share/doc/pwm
>+	@${MKDIR} ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/LICENSE ${DOCSDIR}
>+	${INSTALL_DATA} ${WRKSRC}/config.txt ${DOCSDIR}
> .endif
> 
> .include <bsd.port.mk>
>diff -ruN /usr/ports/x11-wm/pwm/distinfo x11-wm/pwm/distinfo
>--- /usr/ports/x11-wm/pwm/distinfo	Wed Mar 31 18:16:18 2004
>+++ x11-wm/pwm/distinfo	Tue Apr  6 23:59:55 2004
>@@ -1,2 +1,2 @@
>-MD5 (pwm-1.0.tar.gz) = 9a1efe73f597a3303aa94b8d0136779d
>-SIZE (pwm-1.0.tar.gz) = 93239
>+MD5 (pwm-20030617.tar.gz) = 069f51aa3e1a938675d58b4acff15765
>+SIZE (pwm-20030617.tar.gz) = 152149
>diff -ruN /usr/ports/x11-wm/pwm/files/patch-system.mk x11-wm/pwm/files/patch-system.mk
>--- /usr/ports/x11-wm/pwm/files/patch-system.mk	Sun Sep 29 10:59:20 2002
>+++ x11-wm/pwm/files/patch-system.mk	Thu Jan  1 09:00:00 1970
>@@ -1,11 +0,0 @@
>---- system.mk.orig	Sat Sep 28 18:57:23 2002
>-+++ system.mk	Sat Sep 28 18:57:31 2002
>-@@ -55,7 +55,7 @@
>- # have unused variables.
>- WARN=	-W -Wimplicit -Wreturn-type -Wswitch -Wcomment \
>- 	-Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized \
>--	-Wparentheses -pedantic-errors
>-+	-Wparentheses
>- 
>- CFLAGS=-g -O2 $(WARN) $(DEFINES) $(INCLUDES) $(EXTRA_INCLUDES)
>- LDFLAGS=-g $(LIBS) $(EXTRA_LIBS)
>diff -ruN /usr/ports/x11-wm/pwm/pkg-plist x11-wm/pwm/pkg-plist
>--- /usr/ports/x11-wm/pwm/pkg-plist	Mon Oct  2 07:28:52 2000
>+++ x11-wm/pwm/pkg-plist	Tue Apr  6 23:57:56 2004
>@@ -7,7 +7,7 @@
> @unexec if cmp -s %B/sample.conf %B/pwm.conf; then rm -f %B/pwm.conf; fi
> etc/pwm/sample.conf
> @exec if [ ! -e %B/pwm.conf ]; then cp %B/sample.conf %B/pwm.conf; fi
>-share/doc/pwm/LICENSE
>-share/doc/pwm/config.txt
>-@dirrm share/doc/pwm
>+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
>+%%PORTDOCS%%%%DOCSDIR%%/config.txt
>+%%PORTDOCS%%@dirrm %%DOCSDIR%%
> @dirrm etc/pwm

Actions: View | Diff

Attachments on bug 65265: 41770