Attachment 133139 Details for Bug 177553 – file.diff

[patch] file.diff

file.diff (text/plain), 2.70 KB, created by tkato432 on 2013-04-01 19:40:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2013-04-01 19:40:01 UTC

Size: 2.70 KB

patch

obsolete

>diff -urN /usr/ports/x11-wm/windowlab/Makefile x11-wm/windowlab/Makefile
>--- /usr/ports/x11-wm/windowlab/Makefile	2013-03-20 00:45:33.000000000 +0900
>+++ x11-wm/windowlab/Makefile	2013-04-02 02:59:54.000000000 +0900
>@@ -3,39 +3,56 @@
> 
> PORTNAME=	windowlab
> PORTVERSION=	1.40
>+PORTREVISION=	1
> CATEGORIES=	x11-wm
> MASTER_SITES=	http://nickgravgaard.com/windowlab/
> EXTRACT_SUFX=	.tar
>+DIST_SUBDIR=	repacked
> 
> MAINTAINER=	ports@FreeBSD.org
>-COMMENT=	A small window manager for X11
>+COMMENT=	Small window manager for X11
> 
>-MAN1=		windowlab.1x
>+LICENSE=	GPLv2
>+
>+OPTIONS_DEFINE=	XFT DOCS
> 
> USE_XORG=	x11 xext
> USE_GMAKE=	yes
>+MAKE_ENV=	XROOT="${LOCALBASE}" SYSCONFDIR="${ETCDIR}"
>+MAKE_JOBS_SAFE=	yes
> 
>-BROKEN=		distfile mismatch
>-
>-MAKE_ARGS=	MENURC=${PREFIX}/etc/windowlab/menurc CC="${CC}"
>+MAN1=		windowlab.1x
>+PORTDOCS=	CHANGELOG README
>+PLIST_FILES=	bin/windowlab %%ETCDIR%%/menurc
>+PLIST_DIRS=	%%ETCDIR%%
> 
>-PLIST_FILES=	bin/windowlab etc/windowlab/menurc
>-PLIST_DIRS=	etc/windowlab
>+.include <bsd.port.options.mk>
> 
>-PORTDOCS=	CHANGELOG README
>+.if ${PORT_OPTIONS:MXFT}
>+USE_XORG+=	xft
>+USE_PKGCONFIG=	build
>+MAKE_ENV+=	EXTRA_INC="$$(pkg-config --cflags xft)" \
>+		EXTRA_LIBS="$$(pkg-config --libs xft)"
>+CFLAGS+=	-DXFT
>+.endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's,^CC =,CC ?=,' \
>-		-e 's,/usr/X11R6,${LOCALBASE},g' ${WRKSRC}/Makefile
>+	@${REINPLACE_CMD} -e \
>+		's|^$PREFIX$ =|\1 ?=| ; \
>+		 s|^$XROOT$ =|\1 ?=| ; \
>+		 s|^$SYSCONFDIR$ =|\1 ?=| ; \
>+		 s|^$CC$ =|\1 ?=|' ${WRKSRC}/Makefile
> 
> do-install:
>-	${INSTALL_PROGRAM} ${WRKSRC}/windowlab ${PREFIX}/bin
>-	${INSTALL_MAN} ${WRKSRC}/windowlab.1x ${MANPREFIX}/man/man1
>-	${MKDIR} ${PREFIX}/etc/windowlab
>-	${INSTALL_DATA} ${WRKSRC}/windowlab.menurc ${PREFIX}/etc/windowlab/menurc
>-.if !defined(NOPORTDOCS)
>-	${MKDIR} ${DOCSDIR}
>-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
>+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} windowlab ${PREFIX}/bin)
>+	(cd ${WRKSRC} && ${INSTALL_MAN} windowlab.1x ${MANPREFIX}/man/man1)
>+	@${MKDIR} ${ETCDIR}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} windowlab.menurc ${ETCDIR}/menurc)
>+.if ${PORT_OPTIONS:MDOCS}
>+	@${MKDIR} ${DOCSDIR}
>+.for i in ${PORTDOCS}
>+	(cd ${WRKSRC} && ${INSTALL_DATA} ${i} ${DOCSDIR})
>+.endfor
> .endif
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/x11-wm/windowlab/distinfo x11-wm/windowlab/distinfo
>--- /usr/ports/x11-wm/windowlab/distinfo	2012-11-08 06:35:42.000000000 +0900
>+++ x11-wm/windowlab/distinfo	2013-03-31 02:34:45.000000000 +0900
>@@ -1,2 +1,2 @@
>-SHA256 (windowlab-1.40.tar) = 1c9cca5d997cfdcec093e98b7f1996da2d806fbbe4472bdcca568863f3e75d93
>-SIZE (windowlab-1.40.tar) = 174080
>+SHA256 (repacked/windowlab-1.40.tar) = 8d6831a4b848badf82d1f34af6e45dc814d30ee75173b52f1717254d3097a4bb
>+SIZE (repacked/windowlab-1.40.tar) = 174080

Actions: View | Diff

Attachments on bug 177553: 133139