Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 4 Sep 2020 02:06:27 +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: r547498 - head/editors/textadept/files
Message-ID:  <202009040206.08426RSn092817@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: danfe
Date: Fri Sep  4 02:06:26 2020
New Revision: 547498
URL: https://svnweb.freebsd.org/changeset/ports/547498

Log:
  - Remove the checks for prior existence of $(XDG_DATA_DIR) and
    $(PIXMAPS_DIR): they do not serve any useful purpose and could
    break the build if those directories are missing for some reason
  - When disabling wget(1), also change its name to make it obvious
    to the readers of the build log that is is not being executed
  
  Reported by:	linimon

Modified:
  head/editors/textadept/files/patch-src_Makefile

Modified: head/editors/textadept/files/patch-src_Makefile
==============================================================================
--- head/editors/textadept/files/patch-src_Makefile	Fri Sep  4 02:00:09 2020	(r547497)
+++ head/editors/textadept/files/patch-src_Makefile	Fri Sep  4 02:06:26 2020	(r547498)
@@ -48,7 +48,7 @@
  version = $(shell grep -m 1 _RELEASE ../core/init.lua | cut -d ' ' -f4- | \
                    tr ' ' '_' | tr -d "'")
 -WGET = wget -O $@
-+WGET = : wget -O $@
++WGET = : wget-is-forbidden-during-build -O $@
  
  # Scintilla.
  
@@ -63,12 +63,14 @@
  	install $^ $(DESTDIR)$(data_dir)
  	cp -rL $| $(DESTDIR)$(data_dir)
 -	ln -s $(subst .., $(data_dir), $^) $(DESTDIR)$(bin_dir)
+-	if [ -d "$(XDG_DATA_DIR)" ]; then \
 +	ln -s $(subst ..,..$(subst $(PREFIX),,$(data_dir)),$^) $(DESTDIR)$(bin_dir)
- 	if [ -d "$(XDG_DATA_DIR)" ]; then \
++	if : ; then \
  		install -d $(DESTDIR)$(XDG_DATA_DIR); \
  		install $(desktop_files) $(DESTDIR)$(XDG_DATA_DIR); \
  	fi
- 	if [ -d "$(PIXMAPS_DIR)" ]; then \
+-	if [ -d "$(PIXMAPS_DIR)" ]; then \
++	if : ; then \
  		install -d $(DESTDIR)$(PIXMAPS_DIR); \
 -		ln -s $(data_dir)/core/images/textadept.svg $(DESTDIR)$(PIXMAPS_DIR); \
 -		ln -s $(data_dir)/core/images/ta_48x48.png \



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202009040206.08426RSn092817>