Date: Mon, 17 Mar 2014 11:32:31 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348463 - in head/games/yadex: . files Message-ID: <201403171132.s2HBWVMa019247@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Mon Mar 17 11:32:30 2014 New Revision: 348463 URL: http://svnweb.freebsd.org/changeset/ports/348463 QAT: https://qat.redports.org/buildarchive/r348463/ Log: Stagify the port. Upstream `install' target was almost ready for it, just missing $(DESTDIR) prefix in destination directories. While here, convert post-installation banner to pkg-message (guard it with `ifndef DESTDIR' to prevent it from showing up in the build logs twice). Added: head/games/yadex/files/pkg-message.in (contents, props changed) Modified: head/games/yadex/Makefile head/games/yadex/files/patch-GNUmakefile head/games/yadex/pkg-plist Modified: head/games/yadex/Makefile ============================================================================== --- head/games/yadex/Makefile Mon Mar 17 10:24:59 2014 (r348462) +++ head/games/yadex/Makefile Mon Mar 17 11:32:30 2014 (r348463) @@ -19,8 +19,7 @@ CONFIGURE_ENV= CC="${CC}" CXX="${CXX}" P USE_PERL5= build USE_XORG= x11 MAKEFILE= GNUmakefile - -MAN6= yadex.6 +SUB_FILES= pkg-message OPTIONS_DEFINE= WHITE_BG 3D_RENDER SEARCH EXTRA_TOOLS LAPTOP_KEYS DOCS @@ -30,7 +29,6 @@ SEARCH_DESC= Thing, linedef, or sector EXTRA_TOOLS_DESC= Add a few extra tools to Yadex' repertoire LAPTOP_KEYS_DESC= Key bindings for easier editing on laptops -NO_STAGE= yes .include <bsd.port.options.mk> PATCH_SITES= http://glbsp.sourceforge.net/%SUBDIR%/ @@ -63,9 +61,8 @@ post-patch: .endif post-install: -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/doc/*.[^6]* ${WRKSRC}/doc/README ${DOCSDIR} -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${WRKSRC}/doc/*.[^6]* ${WRKSRC}/doc/README \ + ${STAGEDIR}${DOCSDIR} .include <bsd.port.mk> Modified: head/games/yadex/files/patch-GNUmakefile ============================================================================== --- head/games/yadex/files/patch-GNUmakefile Mon Mar 17 10:24:59 2014 (r348462) +++ head/games/yadex/files/patch-GNUmakefile Mon Mar 17 11:32:30 2014 (r348463) @@ -1,6 +1,6 @@ --- GNUmakefile.orig Sun Dec 28 23:23:56 2003 +++ GNUmakefile Mon Mar 21 16:31:11 2005 -@@ -67,8 +67,8 @@ +@@ -67,8 +67,8 @@ else X11LIBDIR = /usr/openwin/lib X11INCLUDEDIR = /usr/openwin/include else @@ -11,7 +11,7 @@ endif endif -@@ -79,13 +79,13 @@ +@@ -79,13 +79,13 @@ endif #CXX = # Options used when compiling Atclib. @@ -27,19 +27,43 @@ #CXXFLAGS += -DWHITE_BACKGROUND #LDFLAGS = -@@ -395,12 +395,10 @@ - @scripts/mkinstalldirs $(MANDIR) - @scripts/mkinstalldirs $(MANDIR)/man6 - @scripts/mkinstalldirs $(SHAREDIR) +@@ -390,19 +390,18 @@ test: + + .PHONY: install + install: $(OBJDIR)/install +- @scripts/mkinstalldirs $(BINDIR) +- @scripts/mkinstalldirs $(ETCDIR) +- @scripts/mkinstalldirs $(MANDIR) +- @scripts/mkinstalldirs $(MANDIR)/man6 +- @scripts/mkinstalldirs $(SHAREDIR) - $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex-$(VERSION) - rm -f $(BINDIR)/yadex +- rm -f $(BINDIR)/yadex - ln -s yadex-$(VERSION) $(BINDIR)/yadex - $(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex-$(VERSION).6 - rm -f $(MANDIR)/man6/yadex.6 - ln -s yadex-$(VERSION).6 $(MANDIR)/man6/yadex.6 -+ $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(BINDIR)/yadex -+ rm -f $(MANDIR)/man6/yadex.6* -+ $(OBJDIR)/install -m 644 doc/yadex.6 $(MANDIR)/man6/yadex.6 - $(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD) - $(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg +- $(OBJDIR)/install -m 644 -d $(SHAREDIR) $(YGD) +- $(OBJDIR)/install -m 644 -d $(ETCDIR) yadex.cfg ++ @scripts/mkinstalldirs $(DESTDIR)$(BINDIR) ++ @scripts/mkinstalldirs $(DESTDIR)$(ETCDIR) ++ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR) ++ @scripts/mkinstalldirs $(DESTDIR)$(MANDIR)/man6 ++ @scripts/mkinstalldirs $(DESTDIR)$(SHAREDIR) ++ rm -f $(DESTDIR)$(BINDIR)/yadex ++ $(OBJDIR)/install -m 755 $(OBJDIR)/yadex $(DESTDIR)$(BINDIR)/yadex ++ rm -f $(DESTDIR)$(MANDIR)/man6/yadex.6* ++ $(OBJDIR)/install -m 644 doc/yadex.6 $(DESTDIR)$(MANDIR)/man6/yadex.6 ++ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(SHAREDIR) $(YGD) ++ $(OBJDIR)/install -m 644 -d $(DESTDIR)$(ETCDIR) yadex.cfg ++ifndef DESTDIR + @echo "---------------------------------------------------------------" + @echo " Yadex is now installed." + @echo +@@ -413,6 +412,7 @@ install: $(OBJDIR)/install + @echo + @echo " Happy editing !" @echo "---------------------------------------------------------------" ++endif + + .PHONY: clean + clean: Added: head/games/yadex/files/pkg-message.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/yadex/files/pkg-message.in Mon Mar 17 11:32:30 2014 (r348463) @@ -0,0 +1,8 @@ + Yadex is now installed. + + Before you run it, enter the paths to your IWADs in + %%ETCDIR%%/yadex.cfg or ~/.yadex/yadex.cfg. + When you're done, type "yadex" (without quotes) to start. + If you're confused, take a look at %%DOCSDIR%%/index.html. + + Happy editing! Modified: head/games/yadex/pkg-plist ============================================================================== --- head/games/yadex/pkg-plist Mon Mar 17 10:24:59 2014 (r348462) +++ head/games/yadex/pkg-plist Mon Mar 17 11:32:30 2014 (r348463) @@ -1,5 +1,6 @@ bin/yadex etc/yadex.cfg +man/man6/yadex.6.gz %%DATADIR%%/doom.ygd %%DATADIR%%/doom02.ygd %%DATADIR%%/doom04.ygd
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201403171132.s2HBWVMa019247>