Attachment #114660 for bug #156350

View | Details | Raw Unified | Return to bug 156350
Collapse All | Expand All




#

PORTNAME=	mcwm
PORTVERSION=	20110412
CATEGORIES=	x11-wm
MASTER_SITES=	http://hack.org/mc/hacks/mcwm/



MAN1=		mcwm.1
PLIST_FILES=	bin/mcwm
PORTDOCS=	LICENSE README NEWS

pre-everything::
		@${ECHO_MSG} "You can build mcwm with your own config.h using the MCWM_CONF knob:"

	@${MKDIR} ${DOCSDIR}
	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}
	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
	@${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
.endif
	@${CAT} ${PKGMESSAGE}


Lines 1-2 Link Here

(-)/usr/ports/x11-wm/mcwm/distinfo (-2 / +2 lines)
1	SHA256 (mcwm-20110308.tar.bz2) = 871d78eccfdbe00af17551436a886cc352874839c2adae963e83b25fcd770406	1	SHA256 (mcwm-20110412.tar.bz2) = 9784354061b87521d1fe252972959429fadf58ba6507a28b01d9e4fc5d9d3b41
2	SIZE (mcwm-20110308.tar.bz2) = 23392	2	SIZE (mcwm-20110412.tar.bz2) = 24570




--- 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 -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
@@ -27,12 +26,13 @@
 list.o: list.c list.h Makefile
 
 install: $(TARGETS)
-	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)/man/man1/mcwm.1
+	$(RM) ${DESTDIR}$(PREFIX)/bin/mcwm
 
 $(DIST).tar.bz2:
 	mkdir $(DIST)




****************************************************

With default config.h mcwm uses urxvt as terminal.
recompile with MCWM_CONF=/path/to/mcwm/config.h for
custom configuration.

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.

****************************************************

Return to bug 156350

Lines 6-12 Link Here

(-)/usr/ports/x11-wm/mcwm/Makefile (-2 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= mcwm	8	PORTNAME= mcwm
9	PORTVERSION= 20110308	9	PORTVERSION= 20110412
10	CATEGORIES= x11-wm	10	CATEGORIES= x11-wm
11	MASTER_SITES= http://hack.org/mc/hacks/mcwm/	11	MASTER_SITES= http://hack.org/mc/hacks/mcwm/
12		12
Lines 26-32 USE_BZIP2= yes Link Here
26		26
27	MAN1= mcwm.1	27	MAN1= mcwm.1
28	PLIST_FILES= bin/mcwm	28	PLIST_FILES= bin/mcwm
29	PORTDOCS= LICENSE README	29	PORTDOCS= LICENSE README NEWS
30		30
31	pre-everything::	31	pre-everything::
32	@${ECHO_MSG} "You can build mcwm with your own config.h using the MCWM_CONF knob:"	32	@${ECHO_MSG} "You can build mcwm with your own config.h using the MCWM_CONF knob:"
Lines 44-49 post-install: Link Here
44	@${MKDIR} ${DOCSDIR}	44	@${MKDIR} ${DOCSDIR}
45	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}	45	@${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR}
46	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}	46	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
		47	@${INSTALL_MAN} ${WRKSRC}/NEWS ${DOCSDIR}
47	.endif	48	.endif
48	@${CAT} ${PKGMESSAGE}	49	@${CAT} ${PKGMESSAGE}
49		50

Lines 1-29 Link Here

(-)/usr/ports/x11-wm/mcwm/files/patch-Makefile (-12 / +19 lines)
1	--- Makefile.orig 2011-03-16 18:19:22.000000000 +0100	1	--- Makefile.orig 2011-04-12 11:25:25.000000000 +0200
2	+++ Makefile 2011-03-16 18:23:04.000000000 +0100	2	+++ Makefile 2011-04-12 11:34:56.000000000 +0200
3	@@ -3,12 +3,12 @@ DIST=mcwm-$(VERSION)	3	@@ -3,12 +3,11 @@
4	SRC=mcwm.c list.c config.h events.h list.h	4	SRC=mcwm.c list.c config.h events.h list.h
5	DISTFILES=LICENSE Makefile NEWS README TODO WISHLIST mcwm.man $(SRC)	5	DISTFILES=LICENSE Makefile NEWS README TODO WISHLIST mcwm.man $(SRC)
6		6
7	-CC=gcc	7	-CC=gcc
8	-CFLAGS=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include #-DDEBUG #-DDMALLOC	8	-CFLAGS=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include #-DDEBUG #-DDMALLOC
9	-LDFLAGS=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom # -ldmalloc	9	-LDFLAGS=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom #-ldmalloc
10	+CFLAGS+=-g -std=c99 -Wall -Wextra -I/usr/local/include	10	+CFLAGS+=-g -std=c99 -Wall -Wextra -O2 -I/usr/local/include
11	+LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom	11	+LDFLAGS+=-L/usr/local/lib -lxcb -lxcb-keysyms -lxcb-icccm -lxcb-atom
12		12
13	RM=/bin/rm	13	RM=/bin/rm
14	-PREFIX=/usr/local	14	-PREFIX=/usr/local
15	+PREFIX?=/usr/local	15	+PREFIX?=/usr/local
16	+MANPREFIX = ${PREFIX}/man
17		16
18	TARGETS=mcwm	17	TARGETS=mcwm
19	OBJS=mcwm.o list.o	18	OBJS=mcwm.o list.o
20	@@ -28,6 +28,9 @@ list.o: list.c list.h Makefile	19	@@ -27,12 +26,13 @@
		20	list.o: list.c list.h Makefile
21		21
22	install: $(TARGETS)	22	install: $(TARGETS)
23	install -m 755 mcwm $(PREFIX)/bin	23	- install -m 755 mcwm $(PREFIX)/bin
24	+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1	24	- install -m 644 mcwm.man $(PREFIX)/man/man1/mcwm.1
25	+ @mkdir -p ${DESTDIR}${MANPREFIX}/man1	25	+ install -m 755 mcwm ${DESTDIR}$(PREFIX)/bin
26	+ @sed "s/VERSION/${VERSION}/g" < mcwm.man > ${DESTDIR}${MANPREFIX}/man1/mcwm.1	26	+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man/man1
		27	+ @mkdir -p ${DESTDIR}${MANPREFIX}/man/man1
		28	+ install -m 644 mcwm.man ${DESTDIR}$(MANPREFIX)/man/man1/mcwm.1
27		29
28	deinstall:	30	deinstall:
29	$(RM) $(PREFIX)/bin/mcwm	31	- $(RM) $(PREFIX)/bin/mcwm
		32	- $(RM) $(PREFIX)/man/man1/mcwm.1
		33	+ $(RM) ${DESTDIR}$(PREFIX)/bin/mcwm
		34
		35	$(DIST).tar.bz2:
		36	mkdir $(DIST)

Lines 1-7 Link Here

(-)/usr/ports/x11-wm/mcwm/pkg-message (-5 / +9 lines)
1	***************************************************	1	****************************************************
2		2
3	With default config.h mcwm uses urxvt as terminal,	3	With default config.h mcwm uses urxvt as terminal.
4	recompile with MCWM_CONF=/path/to/mcwm/config.h for
5	custom configuration.
6		4
7	***************************************************	5	Since 20110412 you can define your own custom config
		6	with MCWM_CONF=/path/to/mcwm/config.h or you can use
		7	flags for basic configuration.
		8
		9	See man mcwm(1) for details.
		10
		11	****************************************************