Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 29 Mar 2019 14:50:58 +0000 (UTC)
From:      Mark Linimon <linimon@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r497148 - in head/sysutils/passwordsafe: . files
Message-ID:  <201903291450.x2TEow8W059949@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: linimon
Date: Fri Mar 29 14:50:58 2019
New Revision: 497148
URL: https://svnweb.freebsd.org/changeset/ports/497148

Log:
  Add USES=compiler:c++11-lang, this port adds -std=c++11 to CPPFLAGS.
  
  Don't add --stdlib=libc++ to CXXFLAGS, Clang uses it by default and GCC can't use libc++.
  
  Don't set CC, CXX, CPP, those are set by the ports tree.
  
  Add a define for __ppc__.
  
  While here, pet portlint.
  
  PR:		236799
  Submitted by:	Piotr Kubaj
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/sysutils/passwordsafe/Makefile
  head/sysutils/passwordsafe/files/patch-Makefile.freebsd

Modified: head/sysutils/passwordsafe/Makefile
==============================================================================
--- head/sysutils/passwordsafe/Makefile	Fri Mar 29 14:45:06 2019	(r497147)
+++ head/sysutils/passwordsafe/Makefile	Fri Mar 29 14:50:58 2019	(r497148)
@@ -10,17 +10,17 @@ COMMENT=	Popular secure and convenient password manage
 
 LICENSE=	ART20
 
+NOT_FOR_ARCHS=		aarch64 armv6 armv7
+NOT_FOR_ARCHS_REASON=	Cannot determine whether the target CPU is big or little endian - please fix PwsPlatform.h
+
 LIB_DEPENDS=	libuuid.so:misc/e2fsprogs-libuuid \
 		libxerces-c.so:textproc/xerces-c3 \
 		libqrencode.so:graphics/libqrencode
 BUILD_DEPENDS=	zip:archivers/zip
 
-NOT_FOR_ARCHS=		aarch64 armv6 armv7
-NOT_FOR_ARCHS_REASON=	Cannot determine whether the target CPU is big or little endian - please fix PwsPlatform.h
-
 CONFLICTS=	pwsafe-[0-9]*
 
-USES=		gmake
+USES=		compiler:c++11-lang gmake
 USE_GITHUB=	yes
 USE_WX=		3.0+
 USE_XORG=	x11 xtst

Modified: head/sysutils/passwordsafe/files/patch-Makefile.freebsd
==============================================================================
--- head/sysutils/passwordsafe/files/patch-Makefile.freebsd	Fri Mar 29 14:45:06 2019	(r497147)
+++ head/sysutils/passwordsafe/files/patch-Makefile.freebsd	Fri Mar 29 14:50:58 2019	(r497148)
@@ -1,4 +1,4 @@
---- Makefile.freebsd.orig	2017-05-01 15:10:07 UTC
+--- Makefile.freebsd.orig	2017-10-07 17:53:15 UTC
 +++ Makefile.freebsd
 @@ -34,8 +34,6 @@ GIT := git
  GZIP := gzip
@@ -9,3 +9,16 @@
  GPG := /usr/local/bin/gpg
  GPG_SIGN := $(GPG) --detach-sign --default-key $(GPG_KEY)
  SIGN_CMD := $(foreach file, $(wildcard $(RELEASEDIR)/*$(RELEASENAME)*), $(GPG_SIGN) $(file); )
+@@ -46,11 +44,8 @@ SF_UPLOAD_DST := $(SF_UPLOAD_ROOT)/Linux-BETA/$(RELEAS
+ RELTAG = wx$(subst .,_,$(RELEASENAME))
+ 
+ export CPPFLAGS += -std=c++11
+-export CXXFLAGS += --stdlib=libc++ -I/usr/local/include
++export CXXFLAGS += -I/usr/local/include
+ export CFLAGS += -I/usr/local/include
+-export CC = clang
+-export CXX = clang++
+-export CPP = clang++
+ export PLATFORM = FreeBSD
+ 
+ all: I18N unicodedebug unicoderelease



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