net/swirc: enable libiconv

while here tweak the port so it prints the executed commands and picks
up our CFLAGS/CXXFLAGS.

initial diff and ok Markus Uhlin (MAINTAINER)
This commit is contained in:
op 2022-07-30 11:14:47 +00:00
parent 86c765e135
commit 184bd2aa77
2 changed files with 37 additions and 1 deletions

View File

@ -1,5 +1,6 @@
COMMENT = curses icb and irc client
DISTNAME = swirc-3.3.5
REVISION = 0
CATEGORIES = net
HOMEPAGE = https://www.nifty-networks.net/swirc/
@ -9,16 +10,26 @@ MAINTAINER = Markus Uhlin <markus.uhlin@bredband.net>
PERMIT_PACKAGE = Yes
# uses pledge()
WANTLIB = ${COMPILER_LIBCXX} c crypto curl curses idn intl m panel pthread ssl
WANTLIB = ${COMPILER_LIBCXX} c crypto curl curses iconv idn intl \
m panel pthread ssl
MASTER_SITES = https://www.nifty-networks.net/swirc/releases/
EXTRACT_SUFX = .tgz
# C++17
COMPILER = base-clang ports-gcc
BUILD_DEPENDS = devel/gettext,-tools
LIB_DEPENDS = devel/gettext,-runtime \
devel/libidn \
net/curl
CFLAGS += -I${LOCALBASE}/include
LDFLAGS += -L${LOCALBASE}/lib
CONFIGURE_STYLE = simple
CONFIGURE_ENV += CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
LDFLAGS="${LDFLAGS}"
TEST_DEPENDS = devel/cmocka
TEST_TARGET = check
@ -28,4 +39,7 @@ MAKE_FLAGS = DEST_CONFMAN=${WRKINST}${PREFIX}/man/man5 \
INSTALL_DEPS=swirc src/swirc.1 swirc.conf.5 \
PREFIX="${PREFIX}" CC="${CC}" CXX="${CXX}"
# show the commands being executed
MAKE_FLAGS += E=@true Q=''
.include <bsd.port.mk>

View File

@ -0,0 +1,22 @@
propagate cflags and neuter hardcoded optimizations
Index: posixshell/os_BSD.sh
--- posixshell/os_BSD.sh.orig
+++ posixshell/os_BSD.sh
@@ -9,13 +9,11 @@ SHARED_FLAGS=-DBSD=1\\
-DUNIX=1\\
-D_XOPEN_SOURCE_EXTENDED=1\\
-I/usr/local/include\\
- -O2\\
- -Wall\\
- -pipe
+ -Wall
CC=cc
-CFLAGS=\$(SHARED_FLAGS) -std=c17
+CFLAGS=\$(SHARED_FLAGS) -std=c17 ${CFLAGS}
CXX=c++
-CXXFLAGS=\$(SHARED_FLAGS) -std=c++17
+CXXFLAGS=\$(SHARED_FLAGS) -std=c++17 ${CXXFLAGS}
LDFLAGS=-L/usr/local/lib
LDLIBS=-lcrypto\\
-lcurl\\