Index: head/x11-wm/awesome2/Makefile =================================================================== --- head/x11-wm/awesome2/Makefile (revision 408899) +++ head/x11-wm/awesome2/Makefile (revision 408900) @@ -1,74 +1,75 @@ # Created by: Nikos Ntarmos # $FreeBSD$ PORTNAME= awesome2 PORTVERSION= 2.3.6 PORTREVISION= 7 CATEGORIES= x11-wm MASTER_SITES= http://awesome.naquadah.org/download/ DISTNAME= awesome-${PORTVERSION} MAINTAINER= ports@FreeBSD.org COMMENT= Tiling window manager initially based on a dwm code rewriting -LICENSE= GPLv2 +LICENSE= GPLv2+ +LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= asciidoc:${PORTSDIR}/textproc/asciidoc \ xmlto:${PORTSDIR}/textproc/xmlto LIB_DEPENDS= libconfuse.so:${PORTSDIR}/devel/libconfuse \ libcairo.so:${PORTSDIR}/graphics/cairo \ libfreetype.so:${PORTSDIR}/print/freetype2 \ libImlib2.so:${PORTSDIR}/graphics/imlib2 USES= iconv pkgconfig python:build GNU_CONFIGURE= yes CONFIGURE_ENV= PYTHON=${PYTHON_CMD} USE_GNOME= pango USE_XORG= x11 xft xext xinerama xt xrandr xproto LDFLAGS+= -L${LOCALBASE}/lib -lX11 -lXext ${ICONV_LIB} MAN1S= awesome2.1 \ awesome2-client.1 \ awesome2-menu.1 \ awesome2-message.1 MAN5S= awesome2rc.5 PORTDOCS= AUTHORS LICENSE README STYLE UPGRADE PORTEXAMPLES= awesomerc OPTIONS_DEFINE= DOCS EXAMPLES post-patch: @${REINPLACE_CMD} -e 's, "$$(DESTDIR)$$(docdir)";,;,g' \ -e 's,\([[:space:]]\)install-docDATA ,\1,g' \ -e 's,awesome_,awesome2_,g' \ -e 's,awesomerc\.5,awesome2rc\.5,g' \ ${WRKSRC}/Makefile.in @${REINPLACE_CMD} -e "s,PACKAGE='awesome',PACKAGE='awesome2',g" \ ${WRKSRC}/configure @${REINPLACE_CMD} -e "s,awesomerc,awesome2rc,g" \ ${WRKSRC}/common/configopts.c .for man in ${MAN1S} ${MAN5S} @${MV} ${WRKSRC}/${man:S%awesome2%awesome%}.txt ${WRKSRC}/${man}.txt @${REINPLACE_CMD} -e 's,awesome,awesome2,g' \ -e 's,\~/\.awesome2,~/.awesome,g' \ ${WRKSRC}/${man}.txt .endfor post-configure: @${REINPLACE_CMD} -E '/^awesome2_(message_)?LDADD/s/$$/ ${ICONV_LIB}/g; \ /^doc_DATA/s/=.*$$/=/g' \ ${WRKSRC}/Makefile -post-install: - @${ECHO_MSG} "installing additional documentation to ${DOCSDIR}" +post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR} .endfor - @${ECHO_MSG} "installing example config file to ${EXAMPLESDIR}" + +post-install-EXAMPLES-on: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} .for example in ${PORTEXAMPLES} ${INSTALL_DATA} ${WRKSRC}/${example} ${STAGEDIR}${EXAMPLESDIR} .endfor .include Index: head/x11-wm/awesome2/files/patch-Makefile.in =================================================================== --- head/x11-wm/awesome2/files/patch-Makefile.in (revision 408899) +++ head/x11-wm/awesome2/files/patch-Makefile.in (revision 408900) @@ -1,58 +1,58 @@ ---- Makefile.in.orig +--- Makefile.in.orig 2009-04-18 14:56:52 UTC +++ Makefile.in -@@ -33,12 +33,12 @@ +@@ -33,12 +33,12 @@ PRE_UNINSTALL = : POST_UNINSTALL = : build_triplet = @build@ host_triplet = @host@ -bin_PROGRAMS = awesome$(EXEEXT) awesome-client$(EXEEXT) \ - awesome-message$(EXEEXT) awesome-menu$(EXEEXT) -@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@am__append_1 = awesome.1 \ -@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@ awesome-client.1 \ -@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@ awesome-message.1 \ -@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@ awesome-menu.1 \ +bin_PROGRAMS = awesome2$(EXEEXT) awesome2-client$(EXEEXT) \ + awesome2-message$(EXEEXT) awesome2-menu$(EXEEXT) +@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@am__append_1 = awesome2.1 \ +@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@ awesome2-client.1 \ +@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@ awesome2-message.1 \ +@HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@ awesome2-menu.1 \ @HAVE_ASCIIDOC_TRUE@@HAVE_XMLTO_TRUE@@XMLTO_MAN_WORKS_TRUE@ awesomerc.5 @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@am__append_2 = optsdocgen.txt \ @HAVE_ASCIIDOC_TRUE@@HAVE_PYTHON_TRUE@ rcskeletongen.txt \ -@@ -278,8 +278,8 @@ +@@ -279,8 +279,8 @@ CLEANFILES = awesomerc defconfig.h uicbg # restart the whole dist process from the start and there is none. EXTRA_DIST = UPGRADE LICENSE UPGRADE STYLE awesomerc.in \ build-utils/uicbgen.sh build-utils/layoutgen.sh \ - build-utils/widgetgen.sh awesome.1.txt awesome-client.1.txt \ - awesome-message.1.txt awesome-menu.1.txt awesomerc.5.txt \ + build-utils/widgetgen.sh awesome2.1.txt awesome2-client.1.txt \ + awesome2-message.1.txt awesome2-menu.1.txt awesomerc.5.txt \ build-utils/extractuicbdoc.py build-utils/extractoptsdoc.py \ build-utils/extractrcskeleton.py build-utils/package-version \ awesome.doxygen.in -@@ -496,17 +496,17 @@ +@@ -497,17 +497,17 @@ widgets/emptybox.$(OBJEXT): widgets/$(am widgets/$(DEPDIR)/$(am__dirstamp) widgets/common.$(OBJEXT): widgets/$(am__dirstamp) \ widgets/$(DEPDIR)/$(am__dirstamp) -awesome$(EXEEXT): $(awesome_OBJECTS) $(awesome_DEPENDENCIES) - @rm -f awesome$(EXEEXT) +awesome2$(EXEEXT): $(awesome_OBJECTS) $(awesome_DEPENDENCIES) + @rm -f awesome2$(EXEEXT) $(LINK) $(awesome_OBJECTS) $(awesome_LDADD) $(LIBS) -awesome-client$(EXEEXT): $(awesome_client_OBJECTS) $(awesome_client_DEPENDENCIES) - @rm -f awesome-client$(EXEEXT) +awesome2-client$(EXEEXT): $(awesome_client_OBJECTS) $(awesome_client_DEPENDENCIES) + @rm -f awesome2-client$(EXEEXT) $(LINK) $(awesome_client_OBJECTS) $(awesome_client_LDADD) $(LIBS) -awesome-menu$(EXEEXT): $(awesome_menu_OBJECTS) $(awesome_menu_DEPENDENCIES) - @rm -f awesome-menu$(EXEEXT) +awesome2-menu$(EXEEXT): $(awesome_menu_OBJECTS) $(awesome_menu_DEPENDENCIES) + @rm -f awesome2-menu$(EXEEXT) $(LINK) $(awesome_menu_OBJECTS) $(awesome_menu_LDADD) $(LIBS) -awesome-message$(EXEEXT): $(awesome_message_OBJECTS) $(awesome_message_DEPENDENCIES) - @rm -f awesome-message$(EXEEXT) +awesome2-message$(EXEEXT): $(awesome_message_OBJECTS) $(awesome_message_DEPENDENCIES) + @rm -f awesome2-message$(EXEEXT) $(LINK) $(awesome_message_OBJECTS) $(awesome_message_LDADD) $(LIBS) mostlyclean-compile: