Date: 9 Apr 2008 13:50:00 -0300 From: Renato Botelho <garga@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Cc: ntarmos@ceid.upatras.gr Subject: ports/122603: [PATCH] x11-wm/awesome: update to 2.2 Message-ID: <20080409165000.3404.qmail@soc90.bluepex.com> Resent-Message-ID: <200804091700.m39H02S4055017@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 122603 >Category: ports >Synopsis: [PATCH] x11-wm/awesome: update to 2.2 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Wed Apr 09 17:00:02 UTC 2008 >Closed-Date: >Last-Modified: >Originator: Renato Botelho >Release: FreeBSD 7.0-STABLE i386 >Organization: FreeBSD.org >Environment: System: FreeBSD soc90.bluepex.com 7.0-STABLE FreeBSD 7.0-STABLE #21: Mon Apr 7 11:22:48 BRT >Description: - Update to 2.2 Depends of PR ports/122601 Added file(s): - pkg-plist Removed file(s): - files/patch-Makefile - files/patch-config.mk Port maintainer (ntarmos@ceid.upatras.gr) is cc'd. Generated with FreeBSD Port Tools 0.77 >How-To-Repeat: >Fix: --- awesome-2.2.patch begins here --- Index: Makefile =================================================================== RCS file: /home/pcvs/ports/x11-wm/awesome/Makefile,v retrieving revision 1.4 diff -u -u -r1.4 Makefile --- Makefile 12 Dec 2007 18:58:56 -0000 1.4 +++ Makefile 9 Apr 2008 16:49:08 -0000 @@ -6,7 +6,7 @@ # PORTNAME= awesome -PORTVERSION= 2.0 +PORTVERSION= 2.2 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -19,27 +19,36 @@ cairo.2:${PORTSDIR}/graphics/cairo \ freetype.9:${PORTSDIR}/print/freetype2 +USE_ICONV= yes USE_XLIB= yes +GNU_CONFIGURE= yes MAN1= awesome.1 \ - awesome-client.1 -PLIST_FILES= bin/awesome \ - bin/awesome-client -PORTDOCS= AUTHORS LICENSE README + awesome-client.1 \ + awesome-message.1 +MAN5= awesomerc.5 +PORTDOCS= AUTHORS LICENSE README STYLE UPGRADE PORTEXAMPLES= awesomerc +post-configure: + @${REINPLACE_CMD} -E '/^awesome_(message_)?LDADD/s/$$/ -liconv/g; \ + /^doc_DATA/s/=.*$$/=/g' \ + ${WRKSRC}/Makefile + post-install: .if !defined(NOPORTDOCS) @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" @${MKDIR} ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/AUTHORS ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/LICENSE ${DOCSDIR} - @${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR} +. for doc in ${PORTDOCS} + ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} +. endfor .endif .if !defined(NOPORTEXAMPLES) @${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}" @${MKDIR} ${EXAMPLESDIR} - @${INSTALL_MAN} ${WRKSRC}/awesomerc ${EXAMPLESDIR} +. for example in ${PORTEXAMPLES} + ${INSTALL_DATA} ${WRKSRC}/${example} ${EXAMPLESDIR} +. endfor .endif .include <bsd.port.mk> Index: distinfo =================================================================== RCS file: /home/pcvs/ports/x11-wm/awesome/distinfo,v retrieving revision 1.3 diff -u -u -r1.3 distinfo --- distinfo 12 Dec 2007 18:58:56 -0000 1.3 +++ distinfo 9 Apr 2008 16:49:08 -0000 @@ -1,3 +1,3 @@ -MD5 (awesome-2.0.tar.gz) = b3e245bd9b8c05b759cc0acbec9f6a29 -SHA256 (awesome-2.0.tar.gz) = 933ce7f5f4339963a5f6229caf82c9f0fb8eb69e69293f72246737e13ffaa079 -SIZE (awesome-2.0.tar.gz) = 48600 +MD5 (awesome-2.2.tar.gz) = 595da572fc2dd03461084b329e74b5db +SHA256 (awesome-2.2.tar.gz) = 388878f17c3cdd0379474396b95f26eb3af10ec295e89a9b833865d9e0a12aed +SIZE (awesome-2.2.tar.gz) = 208012 Index: pkg-plist =================================================================== RCS file: pkg-plist diff -N pkg-plist --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ pkg-plist 9 Apr 2008 16:49:08 -0000 @@ -0,0 +1,23 @@ +@comment $FreeBSD$ +bin/awesome +bin/awesome-client +bin/awesome-message +%%DATADIR%%/icons/layouts/dwindle.png +%%DATADIR%%/icons/layouts/dwindlew.png +%%DATADIR%%/icons/layouts/floating.png +%%DATADIR%%/icons/layouts/floatingw.png +%%DATADIR%%/icons/layouts/max.png +%%DATADIR%%/icons/layouts/maxw.png +%%DATADIR%%/icons/layouts/spiral.png +%%DATADIR%%/icons/layouts/spiralw.png +%%DATADIR%%/icons/layouts/tile.png +%%DATADIR%%/icons/layouts/tilebottom.png +%%DATADIR%%/icons/layouts/tilebottomw.png +%%DATADIR%%/icons/layouts/tileleft.png +%%DATADIR%%/icons/layouts/tileleftw.png +%%DATADIR%%/icons/layouts/tiletop.png +%%DATADIR%%/icons/layouts/tiletopw.png +%%DATADIR%%/icons/layouts/tilew.png +@dirrm %%DATADIR%%/icons/layouts +@dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%% Index: files/patch-Makefile =================================================================== RCS file: files/patch-Makefile diff -N files/patch-Makefile --- files/patch-Makefile 12 Dec 2007 18:58:57 -0000 1.1 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,37 +0,0 @@ ---- Makefile.orig 2007-12-11 22:57:57.000000000 +0200 -+++ Makefile 2007-12-11 22:58:58.000000000 +0200 -@@ -10,7 +10,7 @@ - SRCCLIENT = awesome-client.c awesome-client-common.c util.c - OBJCLIENT = ${SRCCLIENT:.c=.o} - --all: options awesome awesome-client -+all: options awesome awesome-client man - - options: - @echo awesome build options: -@@ -64,19 +64,19 @@ - - install: strip install-unstrip - --install-unstrip: awesome awesome-client man -+install-unstrip: awesome awesome-client - @echo installing executable file to ${DESTDIR}${PREFIX}/bin - @install -d ${DESTDIR}${PREFIX}/bin - @install -m 755 awesome awesome-client ${DESTDIR}${PREFIX}/bin -- @echo installing manual page to ${DESTDIR}${MANPREFIX}/man1 -- @install -d ${DESTDIR}${MANPREFIX}/man1 -- @install -m 644 ${DOCS:.txt=} ${DESTDIR}${MANPREFIX}/man1 -+ @echo installing manual page to ${DESTDIR}${MANPREFIX}/man/man1 -+ @install -d ${DESTDIR}${MANPREFIX}/man/man1 -+ @install -m 644 ${DOCS:.txt=} ${DESTDIR}${MANPREFIX}/man/man1 - - uninstall: - @echo removing executable file from ${DESTDIR}${PREFIX}/bin - @rm ${DESTDIR}${PREFIX}/bin/awesome ${DESTDIR}${PREFIX}/bin/awesome-client -- @echo removing manual page from ${DESTDIR}${MANPREFIX}/man1 -- @rm ${DESTDIR}${MANPREFIX}/man1/awesome.1 ${DESTDIR}${MANPREFIX}/man1/awesome-client.1 -+ @echo removing manual page from ${DESTDIR}${MANPREFIX}/man/man1 -+ @rm ${DESTDIR}${MANPREFIX}/man/man1/awesome.1 ${DESTDIR}${MANPREFIX}/man/man1/awesome-client.1 - - doc: - @echo generating documentation Index: files/patch-config.mk =================================================================== RCS file: files/patch-config.mk diff -N files/patch-config.mk --- files/patch-config.mk 12 Dec 2007 18:58:57 -0000 1.3 +++ /dev/null 1 Jan 1970 00:00:00 -0000 @@ -1,29 +0,0 @@ ---- config.mk.o 2007-11-18 06:20:55.000000000 +0200 -+++ config.mk 2007-11-18 06:23:43.000000000 +0200 -@@ -8,20 +8,18 @@ - LAYOUTS = layouts/tile.c layouts/floating.c layouts/max.c - - # paths --PREFIX = /usr/local --MANPREFIX = ${PREFIX}/share/man - --X11INC = /usr/include/X11 --X11LIB = /usr/lib/X11 -+X11INC = ${LOCALBASE}/include -+X11LIB = ${LOCALBASE}/lib - - # includes and libs - INCS = -I. -I/usr/include -I${X11INC} `pkg-config --cflags libconfuse xft cairo` - LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 `pkg-config --libs libconfuse xft cairo` -lXext -lXrandr -lXinerama - - # flags --CFLAGS = -fgnu89-inline -std=gnu99 -ggdb3 -pipe -Wall -Wextra -W -Wchar-subscripts -Wundef -Wshadow -Wcast-align -Wwrite-strings -Wsign-compare -Wunused -Wuninitialized -Winit-self -Wpointer-arith -Wredundant-decls -Wno-format-zero-length -Wmissing-prototypes -Wmissing-format-attribute -Wmissing-noreturn -O3 ${INCS} -DVERSION=\"${VERSION}\" -DRELEASE=\"${RELEASE}\" --LDFLAGS = -ggdb3 ${LIBS} --CLIENTLDFLAGS = -ggdb3 -+CFLAGS+= -pipe -Wall -W -Wchar-subscripts -Wshadow -Wcast-align -Wwrite-strings -Wunused -Wuninitialized -Wpointer-arith -Wredundant-decls -Wmissing-prototypes ${INCS} -DVERSION=\"${VERSION}\" -DRELEASE=\"${RELEASE}\" -+LDFLAGS+= ${LIBS} -+CLIENTLDFLAGS+= ${LIBS} - - # compiler and linker --CC = cc -+CC?= cc --- awesome-2.2.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20080409165000.3404.qmail>