From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Oct 17 17:30:04 2008 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C0F7F106568F for ; Fri, 17 Oct 2008 17:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id AAC948FC0A for ; Fri, 17 Oct 2008 17:30:04 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id m9HHU4BS026618 for ; Fri, 17 Oct 2008 17:30:04 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id m9HHU4j4026615; Fri, 17 Oct 2008 17:30:04 GMT (envelope-from gnats) Date: Fri, 17 Oct 2008 17:30:04 GMT Message-Id: <200810171730.m9HHU4j4026615@freefall.freebsd.org> To: freebsd-ports-bugs@FreeBSD.org From: Nikos Ntarmos Cc: Subject: Re: ports/128012: x11-wm/awesome: update to 3.0 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Nikos Ntarmos List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 17 Oct 2008 17:30:04 -0000 The following reply was made to PR ports/128012; it has been noted by GNATS. From: Nikos Ntarmos To: bug-followup@FreeBSD.org Cc: Subject: Re: ports/128012: x11-wm/awesome: update to 3.0 Date: Fri, 17 Oct 2008 17:55:01 +0300 --envbJBWh7q8WU6mo Content-Type: text/plain; charset=us-ascii Content-Disposition: inline I've prepared the 3.x branch port and I'm waiting on a couple of PRs to go in; namely, ports/126993 (just submitted a duplicate... should have searched deeper... duh) and ports/128051. The thing is, I'd like to keep the old 2.x branch as x11-wm/awesome2. Is it up to the committer to do the extra work of renaming awesome to awesome2, copying awesome2 files to awesome, and applying the (attached) 3.x patch or is there some other preferred way of doing this kind of changes (couldn't find anything in the porter's handbook, but then again perhaps I didn't search deep enough now either...)? Cheers. \n\n --envbJBWh7q8WU6mo Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="awesome-3.0.diff" diff -u awesome.orig/Makefile awesome/Makefile --- awesome.orig/Makefile 2008-09-24 17:54:19.000000000 +0300 +++ awesome/Makefile 2008-10-17 16:59:57.000000000 +0300 @@ -6,7 +6,7 @@ # PORTNAME= awesome -PORTVERSION= 2.3.4 +PORTVERSION= 3.0 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ @@ -15,48 +15,32 @@ BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ xmlto:${PORTSDIR}/textproc/xmlto -LIB_DEPENDS= confuse.0:${PORTSDIR}/devel/libconfuse \ - cairo.2:${PORTSDIR}/graphics/cairo \ - freetype.9:${PORTSDIR}/print/freetype2 +LIB_DEPENDS= cairo.2:${PORTSDIR}/graphics/cairo \ + ev.3:${PORTSDIR}/devel/libev \ + freetype.9:${PORTSDIR}/print/freetype2 \ + xcb.1:${PORTSDIR}/x11/libxcb \ + xcb-event.1:${PORTSDIR}/x11/xcb-util USE_ICONV= yes -GNU_CONFIGURE= yes +USE_CMAKE= yes +CMAKE_ARGS+= -DSYSCONFDIR=${PREFIX}/etc USE_EFL= imlib2 -USE_GNOME= pango -USE_XORG= x11 xft xext xinerama xt xrandr xproto +USE_GNOME= glib20 pango +USE_LUA= 5.1+ +USE_XORG= pixman x11 xau xdmcp xext xft xinerama xrandr xrender MAN1= awesome.1 \ - awesome-client.1 \ - awesome-menu.1 \ - awesome-message.1 + awesome-client.1 MAN5= awesomerc.5 -PORTDOCS= AUTHORS LICENSE README STYLE UPGRADE -PORTEXAMPLES= awesomerc +MANCOMPRESSED= yes +PORTDOCS= AUTHORS BUGS LICENSE README -post-patch: - @${REINPLACE_CMD} -e 's, "$$(DESTDIR)$$(docdir)";,;,g' \ - -e 's,\([[:space:]]\)install-docDATA ,\1,g' \ - ${WRKSRC}/Makefile.in - -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} -. for doc in ${PORTDOCS} - ${INSTALL_DATA} ${WRKSRC}/${doc} ${DOCSDIR} -. endfor -.endif -.if !defined(NOPORTEXAMPLES) - @${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}" - @${MKDIR} ${EXAMPLESDIR} -. for example in ${PORTEXAMPLES} - ${INSTALL_DATA} ${WRKSRC}/${example} ${EXAMPLESDIR} -. endfor +pre-configure: +.if defined(NOPORTDOCS) + @${REINPLACE_CMD} \ + -e 's/"generate luadoc" ON/\"generate luadoc" OFF/g' \ + -e 's/"install port docs" ON/\"install port docs" OFF/g' \ + ${WRKSRC}/awesomeConfig.cmake .endif .include diff -u awesome.orig/distinfo awesome/distinfo --- awesome.orig/distinfo 2008-09-24 17:54:19.000000000 +0300 +++ awesome/distinfo 2008-10-17 14:48:15.000000000 +0300 @@ -1,3 +1,3 @@ -MD5 (awesome-2.3.4.tar.gz) = c7e27e94a9e8badfee7bcca4ac6ff9ce -SHA256 (awesome-2.3.4.tar.gz) = a73236c31557981746f3e96a6bdc8437455040f33ac0fa9365b2efe8d2889c3a -SIZE (awesome-2.3.4.tar.gz) = 230800 +MD5 (awesome-3.0.tar.gz) = a973361830ae7905e563ae0243e4b57a +SHA256 (awesome-3.0.tar.gz) = dd35a93819cb8922f132d426152504a37d2886a9236f42b671ab477737f42c0c +SIZE (awesome-3.0.tar.gz) = 180052 diff -u awesome.orig/files/patch-CMakeLists.txt awesome/files/patch-CMakeLists.txt --- awesome.orig/files/patch-CMakeLists.txt 1970-01-01 02:00:00.000000000 +0200 +++ awesome/files/patch-CMakeLists.txt 2008-10-17 15:16:34.000000000 +0300 @@ -0,0 +1,28 @@ +--- CMakeLists.txt.orig 2008-09-18 17:12:42.000000000 +0300 ++++ CMakeLists.txt 2008-10-17 15:15:46.000000000 +0300 +@@ -320,16 +320,18 @@ + install(FILES ${AWE_LUA_FILES} DESTINATION ${AWESOME_LUA_LIB_PATH}) + install(FILES ${AWE_CONF_FILE_DEFAULT} DESTINATION ${AWESOME_SYSCONFDIR} + RENAME ${AWE_CONF_FILE}) +-if(GENERATE_MANPAGES) +- install(FILES ${AWE_MAN1_FILES} DESTINATION ${AWESOME_MAN_PATH}/man1) +- install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN_PATH}/man5) +-endif() + install(DIRECTORY ${AWE_ICON_DIR} DESTINATION ${AWESOME_DATA_PATH}) + install(FILES ${AWE_THEMES_DIR}/default-background.png ${BUILD_DIR}/themes/default DESTINATION ${AWESOME_THEMES_PATH}) +-install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH}) + install(FILES "awesome.desktop" DESTINATION ${AWESOME_XSESSION_PATH}) +-if(GENERATE_LUADOC) +- install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH}) ++if(INSTALL_PORTDOCS) ++ if(GENERATE_MANPAGES) ++ install(FILES ${AWE_MAN1_FILES} DESTINATION ${AWESOME_MAN_PATH}/man1) ++ install(FILES ${AWE_MAN5_FILES} DESTINATION ${AWESOME_MAN_PATH}/man5) ++ endif() ++ install(FILES ${AWE_DOC_FILES} DESTINATION ${AWESOME_DOC_PATH}) ++ if(GENERATE_LUADOC) ++ install(DIRECTORY ${BUILD_DIR}/luadoc DESTINATION ${AWESOME_DOC_PATH}) ++ endif() + endif() + # }}} + diff -u awesome.orig/files/patch-awesomeConfig.cmake awesome/files/patch-awesomeConfig.cmake --- awesome.orig/files/patch-awesomeConfig.cmake 1970-01-01 02:00:00.000000000 +0200 +++ awesome/files/patch-awesomeConfig.cmake 2008-10-17 16:55:54.000000000 +0300 @@ -0,0 +1,19 @@ +--- awesomeConfig.cmake.orig 2008-09-18 17:12:42.000000000 +0300 ++++ awesomeConfig.cmake 2008-10-17 15:17:31.000000000 +0300 +@@ -15,6 +15,7 @@ + + option(WITH_DBUS "build with D-BUS" ON) + option(WITH_IMLIB2 "build with Imlib2" ON) ++option(INSTALL_PORTDOCS "install port docs" ON) + option(GENERATE_MANPAGES "generate manpages" ON) + option(GENERATE_LUADOC "generate luadoc" ON) + +@@ -270,7 +270,7 @@ + if(DEFINED AWESOME_MAN_PATH) + set(AWESOME_MAN_PATH ${AWESOME_MAN_PATH} CACHE PATH "awesome manpage directory") + else() +- set(AWESOME_MAN_PATH ${PREFIX}/share/man CACHE PATH "awesome manpage directory") ++ set(AWESOME_MAN_PATH ${PREFIX}/man CACHE PATH "awesome manpage directory") + endif() + + # Hide to avoid confusion diff -u awesome.orig/pkg-plist awesome/pkg-plist --- awesome.orig/pkg-plist 2008-05-21 14:56:55.000000000 +0300 +++ awesome/pkg-plist 2008-10-17 17:01:57.000000000 +0300 @@ -1,16 +1,22 @@ -@comment $FreeBSD: ports/x11-wm/awesome/pkg-plist,v 1.2 2008/05/21 11:56:55 garga Exp $ +@comment $FreeBSD$ bin/awesome bin/awesome-client -bin/awesome-menu -bin/awesome-message +bin/awsetbg +etc/xdg/awesome/rc.lua %%DATADIR%%/icons/awesome16.png %%DATADIR%%/icons/awesome32.png %%DATADIR%%/icons/awesome48.png %%DATADIR%%/icons/awesome64.png %%DATADIR%%/icons/layouts/dwindle.png %%DATADIR%%/icons/layouts/dwindlew.png +%%DATADIR%%/icons/layouts/fairh.png +%%DATADIR%%/icons/layouts/fairhw.png +%%DATADIR%%/icons/layouts/fairv.png +%%DATADIR%%/icons/layouts/fairvw.png %%DATADIR%%/icons/layouts/floating.png %%DATADIR%%/icons/layouts/floatingw.png +%%DATADIR%%/icons/layouts/magnifier.png +%%DATADIR%%/icons/layouts/magnifierw.png %%DATADIR%%/icons/layouts/max.png %%DATADIR%%/icons/layouts/maxw.png %%DATADIR%%/icons/layouts/spiral.png @@ -23,6 +29,23 @@ %%DATADIR%%/icons/layouts/tiletop.png %%DATADIR%%/icons/layouts/tiletopw.png %%DATADIR%%/icons/layouts/tilew.png +%%DATADIR%%/icons/taglist/squarefw.png +%%DATADIR%%/icons/taglist/squarew.png +%%DATADIR%%/icons/tasklist/floating.png +%%DATADIR%%/icons/tasklist/floatingw.png +%%DATADIR%%/icons/titlebar/close.png +%%DATADIR%%/icons/titlebar/closer.png +%%DATADIR%%/lib/awful.lua +%%DATADIR%%/lib/beautiful.lua +%%DATADIR%%/lib/tabulous.lua +%%DATADIR%%/themes/default +%%DATADIR%%/themes/default-background.png @dirrm %%DATADIR%%/icons/layouts +@dirrm %%DATADIR%%/icons/taglist +@dirrm %%DATADIR%%/icons/tasklist +@dirrm %%DATADIR%%/icons/titlebar @dirrm %%DATADIR%%/icons +@dirrm %%DATADIR%%/lib +@dirrm %%DATADIR%%/themes @dirrm %%DATADIR%% +share/xsessions/awesome.desktop --envbJBWh7q8WU6mo--