Date: Wed, 2 Jul 2014 01:48:59 +0000 (UTC) From: "Vanilla I. Shu" <vanilla@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360124 - in head/x11-wm/amiwm: . files Message-ID: <201407020148.s621mx4K035122@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vanilla Date: Wed Jul 2 01:48:59 2014 New Revision: 360124 URL: http://svnweb.freebsd.org/changeset/ports/360124 QAT: https://qat.redports.org/buildarchive/r360124/ Log: 1: Stagify. 2: use options helper to handle PORTDOCS. Approved by: portmgr@ (blanket approval) Added: head/x11-wm/amiwm/files/patch-Makefile.in - copied, changed from r360123, head/x11-wm/amiwm/files/patch-aa Deleted: head/x11-wm/amiwm/files/patch-aa Modified: head/x11-wm/amiwm/Makefile head/x11-wm/amiwm/pkg-plist Modified: head/x11-wm/amiwm/Makefile ============================================================================== --- head/x11-wm/amiwm/Makefile Wed Jul 2 01:29:19 2014 (r360123) +++ head/x11-wm/amiwm/Makefile Wed Jul 2 01:48:59 2014 (r360124) @@ -13,15 +13,16 @@ COMMENT= Window manager that makes your MAKE_JOBS_UNSAFE= yes GNU_CONFIGURE= yes USE_XORG= x11 ice sm xext xmu -MAN1= amiwm.1 +OPTIONS_DEFINE= DOCS + +.include <bsd.port.options.mk> -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) +.if ${PORT_OPTIONS:MDOCS} @${ECHO_MSG} "===> Copying documents to ${DOCSDIR}" - @${MKDIR} ${DOCSDIR} - @${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}/README - @${INSTALL_DATA} ${WRKSRC}/README.modules ${DOCSDIR}/README.modules + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}/README + @${INSTALL_DATA} ${WRKSRC}/README.modules ${STAGEDIR}${DOCSDIR}/README.modules .endif .include <bsd.port.mk> Copied and modified: head/x11-wm/amiwm/files/patch-Makefile.in (from r360123, head/x11-wm/amiwm/files/patch-aa) ============================================================================== --- head/x11-wm/amiwm/files/patch-aa Wed Jul 2 01:29:19 2014 (r360123, copy source) +++ head/x11-wm/amiwm/files/patch-Makefile.in Wed Jul 2 01:48:59 2014 (r360124) @@ -1,11 +1,64 @@ ---- Makefile.in.orig Sat Nov 21 00:36:13 1998 -+++ Makefile.in Sat Nov 21 00:36:20 1998 -@@ -42,7 +42,7 @@ +--- Makefile.in.orig 2010-07-20 00:07:34.000000000 +0800 ++++ Makefile.in 2014-07-02 09:42:52.170996007 +0800 +@@ -43,7 +43,7 @@ DISTFILES = README README.modules INSTAL PACKAGENAME = amiwm -AMIWM_HOME = $(libdir)/amiwm +AMIWM_HOME = $(libdir)/X11/amiwm - all : $(PROGS) $(MODULES) + all : lib_all + @$(MAKE) local_all +@@ -88,32 +88,32 @@ kbdlexer.c : kbdlexer.l + $(LEX) -t $< > kbdlexer.c + install : $(PROGS) $(MODULES) Xsession Xsession2 Xinitrc amiwm-init +- -mkdir -p $(AMIWM_HOME) +- $(INSTALL) $(STRIPFLAG) requestchoice $(AMIWM_HOME)/requestchoice +- $(INSTALL) $(STRIPFLAG) executecmd $(AMIWM_HOME)/executecmd ++ -mkdir -p $(DESTDIR)$(AMIWM_HOME) ++ $(INSTALL) $(STRIPFLAG) requestchoice $(DESTDIR)$(AMIWM_HOME)/requestchoice ++ $(INSTALL) $(STRIPFLAG) executecmd $(DESTDIR)$(AMIWM_HOME)/executecmd + for module in $(MODULES); do \ + if [ "$$module" = "$(srcdir)/Background" ]; then \ +- $(INSTALL) $$module $(AMIWM_HOME)/Background; \ ++ $(INSTALL) $$module $(DESTDIR)$(AMIWM_HOME)/Background; \ + else \ +- $(INSTALL) $(STRIPFLAG) $$module $(AMIWM_HOME)/$$module; \ ++ $(INSTALL) $(STRIPFLAG) $$module $(DESTDIR)$(AMIWM_HOME)/$$module; \ + fi; \ + done +- $(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(AMIWM_HOME)/system.amiwmrc +- $(INSTALL) -m 644 $(srcdir)/def_tool.info $(AMIWM_HOME)/def_tool.info +- $(INSTALL) -m 644 $(srcdir)/system.map $(AMIWM_HOME)/system.map +- $(INSTALL) -m 644 $(srcdir)/magicwb.map $(AMIWM_HOME)/magicwb.map +- $(INSTALL) -m 644 $(srcdir)/schwartz.map $(AMIWM_HOME)/schwartz.map +- $(INSTALL) -m 755 Xsession $(AMIWM_HOME)/Xsession +- $(INSTALL) -m 755 Xsession2 $(AMIWM_HOME)/Xsession2 +- $(INSTALL) -m 755 Xinitrc $(AMIWM_HOME)/Xinitrc +- $(INSTALL) -m 755 $(srcdir)/amiwm-init $(AMIWM_HOME)/amiwm-init +- -mkdir -p $(bindir) +- $(INSTALL) $(STRIPFLAG) amiwm $(bindir)/amiwm +- $(INSTALL) $(STRIPFLAG) ppmtoinfo $(bindir)/ppmtoinfo ++ $(INSTALL) -m 644 $(srcdir)/system.amiwmrc $(DESTDIR)$(AMIWM_HOME)/system.amiwmrc ++ $(INSTALL) -m 644 $(srcdir)/def_tool.info $(DESTDIR)$(AMIWM_HOME)/def_tool.info ++ $(INSTALL) -m 644 $(srcdir)/system.map $(DESTDIR)$(AMIWM_HOME)/system.map ++ $(INSTALL) -m 644 $(srcdir)/magicwb.map $(DESTDIR)$(AMIWM_HOME)/magicwb.map ++ $(INSTALL) -m 644 $(srcdir)/schwartz.map $(DESTDIR)$(AMIWM_HOME)/schwartz.map ++ $(INSTALL) -m 755 Xsession $(DESTDIR)$(AMIWM_HOME)/Xsession ++ $(INSTALL) -m 755 Xsession2 $(DESTDIR)$(AMIWM_HOME)/Xsession2 ++ $(INSTALL) -m 755 Xinitrc $(DESTDIR)$(AMIWM_HOME)/Xinitrc ++ $(INSTALL) -m 755 $(srcdir)/amiwm-init $(DESTDIR)$(AMIWM_HOME)/amiwm-init ++ -mkdir -p $(DESTDIR)$(bindir) ++ $(INSTALL) $(STRIPFLAG) amiwm $(DESTDIR)$(bindir)/amiwm ++ $(INSTALL) $(STRIPFLAG) ppmtoinfo $(DESTDIR)$(bindir)/ppmtoinfo + $(RM) $(bindir)/requestchoice +- $(LN_S) $(AMIWM_HOME)/requestchoice $(bindir)/requestchoice +- -mkdir -p $(mandir)/man1 +- $(INSTALL) -m 644 $(srcdir)/amiwm.1 $(mandir)/man1/amiwm.1 ++ $(LN_S) $(AMIWM_HOME)/requestchoice $(DESTDIR)$(bindir)/requestchoice ++ -mkdir -p $(DESTDIR)$(mandir)/man1 ++ $(INSTALL) -m 644 $(srcdir)/amiwm.1 $(DESTDIR)$(mandir)/man1/amiwm.1 + + fs-install : Filesystem + $(INSTALL) $(STRIPFLAG) Filesystem $(AMIWM_HOME)/Filesystem Modified: head/x11-wm/amiwm/pkg-plist ============================================================================== --- head/x11-wm/amiwm/pkg-plist Wed Jul 2 01:29:19 2014 (r360123) +++ head/x11-wm/amiwm/pkg-plist Wed Jul 2 01:48:59 2014 (r360124) @@ -14,6 +14,7 @@ lib/X11/amiwm/requestchoice lib/X11/amiwm/schwartz.map lib/X11/amiwm/system.amiwmrc lib/X11/amiwm/system.map +man/man1/amiwm.1.gz %%PORTDOCS%%%%DOCSDIR%%/README %%PORTDOCS%%%%DOCSDIR%%/README.modules @dirrm lib/X11/amiwm
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407020148.s621mx4K035122>