Attachment 114660 Details for Bug 156350 – file.diff

[patch] file.diff

file.diff (text/plain), 4.19 KB, created by jakub_lach on 2011-04-12 11:20:11 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: jakub_lach

Created: 2011-04-12 11:20:11 UTC

Size: 4.19 KB

patch

obsolete

>diff -rupN /usr/ports/x11-wm/mcwm.orig/Makefile /usr/ports/x11-wm/mcwm/Makefile
>--- /usr/ports/x11-wm/mcwm.orig/Makefile	2011-04-12 10:33:21.000000000 +0200
>+++ /usr/ports/x11-wm/mcwm/Makefile	2011-04-12 11:14:38.000000000 +0200
>@@ -6,7 +6,7 @@
> #
> 
> PORTNAME=	mcwm
>-PORTVERSION=	20110308
>+PORTVERSION=	20110412
> CATEGORIES=	x11-wm
> MASTER_SITES=	http://hack.org/mc/hacks/mcwm/
> 
>@@ -26,7 +26,7 @@ USE_BZIP2=	yes
> 
> MAN1=		mcwm.1
> PLIST_FILES=	bin/mcwm
>-PORTDOCS=	LICENSE README
>+PORTDOCS=	LICENSE README NEWS
> 
> pre-everything::
> 		@${ECHO_MSG} "You can build mcwm with your own config.h using the MCWM_CONF knob:"
>@@ -44,6 +44,7 @@ post-install:
> 	@${MKDIR} ${DOCSDIR}
> 	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}
> 	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
>+	@${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
> .endif
> 	@${CAT} ${PKGMESSAGE}
> 
>diff -rupN /usr/ports/x11-wm/mcwm.orig/distinfo /usr/ports/x11-wm/mcwm/distinfo
>--- /usr/ports/x11-wm/mcwm.orig/distinfo	2011-04-12 10:33:21.000000000 +0200
>+++ /usr/ports/x11-wm/mcwm/distinfo	2011-04-12 10:34:32.000000000 +0200
>@@ -1,2 +1,2 @@
>-SHA256 (mcwm-20110308.tar.bz2) = 871d78eccfdbe00af17551436a886cc352874839c2adae963e83b25fcd770406
>-SIZE (mcwm-20110308.tar.bz2) = 23392
>+SHA256 (mcwm-20110412.tar.bz2) = 9784354061b87521d1fe252972959429fadf58ba6507a28b01d9e4fc5d9d3b41
>+SIZE (mcwm-20110412.tar.bz2) = 24570
>diff -rupN /usr/ports/x11-wm/mcwm.orig/files/patch-Makefile /usr/ports/x11-wm/mcwm/files/patch-Makefile
>--- /usr/ports/x11-wm/mcwm.orig/files/patch-Makefile	2011-04-12 10:33:21.000000000 +0200
>+++ /usr/ports/x11-wm/mcwm/files/patch-Makefile	2011-04-12 11:53:50.000000000 +0200
>@@ -1,29 +1,36 @@
>---- Makefile.orig	2011-03-16 18:19:22.000000000 +0100
>-+++ Makefile	2011-03-16 18:23:04.000000000 +0100
>-@@ -3,12 +3,12 @@ DIST=mcwm-$(VERSION)
>+--- Makefile.orig	2011-04-12 11:25:25.000000000 +0200
>++++ Makefile	2011-04-12 11:34:56.000000000 +0200
>+@@ -3,12 +3,11 @@
>  SRC=mcwm.c list.c config.h events.h list.h
>  DISTFILES=LICENSE Makefile NEWS README TODO WISHLIST mcwm.man $(SRC)
>  
> -CC=gcc
> -CFLAGS=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include #-DDEBUG #-DDMALLOC
>--LDFLAGS=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom # -ldmalloc
>-+CFLAGS+=-g -std=c99 -Wall -Wextra -I/usr/local/include
>+-LDFLAGS=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom #-ldmalloc
>++CFLAGS+=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include 
> +LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom 
>  
>  RM=/bin/rm
> -PREFIX=/usr/local
> +PREFIX?=/usr/local
>-+MANPREFIX = ${PREFIX}/man
>  
>  TARGETS=mcwm
>  OBJS=mcwm.o list.o
>-@@ -28,6 +28,9 @@ list.o: list.c list.h Makefile
>+@@ -27,12 +26,13 @@
>+ list.o: list.c list.h Makefile
>  
>  install: $(TARGETS)
>- 	install -m 755 mcwm $(PREFIX)/bin
>-+	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
>-+	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
>-+	@sed "s/VERSION/${VERSION}/g" < mcwm.man > ${DESTDIR}${MANPREFIX}/man1/mcwm.1
>+-	install -m 755 mcwm $(PREFIX)/bin
>+-	install -m 644 mcwm.man $(PREFIX)/man/man1/mcwm.1
>++	install -m 755 mcwm ${DESTDIR}$(PREFIX)/bin
>++	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man/man1
>++	@mkdir -p ${DESTDIR}${MANPREFIX}/man/man1
>++	install -m 644 mcwm.man ${DESTDIR}$(MANPREFIX)/man/man1/mcwm.1
>  
>  deinstall:
>- 	$(RM) $(PREFIX)/bin/mcwm
>+-	$(RM) $(PREFIX)/bin/mcwm
>+-	$(RM) $(PREFIX)/man/man1/mcwm.1
>++	$(RM) ${DESTDIR}$(PREFIX)/bin/mcwm
>+ 
>+ $(DIST).tar.bz2:
>+ 	mkdir $(DIST)
>diff -rupN /usr/ports/x11-wm/mcwm.orig/pkg-message /usr/ports/x11-wm/mcwm/pkg-message
>--- /usr/ports/x11-wm/mcwm.orig/pkg-message	2011-04-12 10:33:21.000000000 +0200
>+++ /usr/ports/x11-wm/mcwm/pkg-message	2011-04-12 11:05:32.000000000 +0200
>@@ -1,7 +1,11 @@
>-***************************************************
>+****************************************************
> 
>-With default config.h mcwm uses urxvt as terminal,
>-recompile with MCWM_CONF=/path/to/mcwm/config.h for
>-custom configuration.
>+With default config.h mcwm uses urxvt as terminal.
> 
>-***************************************************
>+Since 20110412 you can define your own custom config 
>+with MCWM_CONF=/path/to/mcwm/config.h or you can use 
>+flags for basic configuration. 
>+
>+See man mcwm(1) for details.
>+
>+****************************************************

Actions: View | Diff

Attachments on bug 156350: 114660