From owner-svn-ports-head@freebsd.org Sun Jun 21 14:55:11 2020 Return-Path: Delivered-To: svn-ports-head@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 030A7352115; Sun, 21 Jun 2020 14:55:11 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49qbDt5ybyz46HJ; Sun, 21 Jun 2020 14:55:10 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id AE5761EF32; Sun, 21 Jun 2020 14:55:10 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05LEtAQA007780; Sun, 21 Jun 2020 14:55:10 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05LEtAII007778; Sun, 21 Jun 2020 14:55:10 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <202006211455.05LEtAII007778@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Sun, 21 Jun 2020 14:55:10 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r539769 - in head/www/rejik: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/www/rejik: . files X-SVN-Commit-Revision: 539769 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 21 Jun 2020 14:55:11 -0000 Author: tobik Date: Sun Jun 21 14:55:10 2020 New Revision: 539769 URL: https://svnweb.freebsd.org/changeset/ports/539769 Log: www/rejik: Unbreak build with GCC 10 /usr/local/bin/ld: pass.o:(.bss+0x0): multiple definition of `change_log'; /tmp/ccMvpVPD.o:(.bss+0x0): first defined here .. and so on ... http://package22.nyi.freebsd.org/data/113amd64-default-PR244008/2020-06-10_18h05m01s/logs/errors/rejik-3.2.11_8.log - Respect CFLAGS/LDFLAGS - GCC 10 switched to -fno-common by default and this port is not ready in any way. Since this is also abandonware it should probably be retired. For now go back to -fcommon. PR: 246700 Modified: head/www/rejik/Makefile head/www/rejik/files/patch-Makefile Modified: head/www/rejik/Makefile ============================================================================== --- head/www/rejik/Makefile Sun Jun 21 14:43:48 2020 (r539768) +++ head/www/rejik/Makefile Sun Jun 21 14:55:10 2020 (r539769) @@ -3,7 +3,7 @@ PORTNAME= rejik PORTVERSION= 3.2.11 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= www MASTER_SITES= http://www.rejik.ru/download/ DISTNAME= redirector-${PORTVERSION}_squid_3.4 @@ -19,6 +19,7 @@ LIB_DEPENDS= libpcre.so:devel/pcre USES= perl5 tar:tgz USE_GCC= any MAKE_ARGS= CC=${CC} INSTALL_PATH=${PREFIX}/rejik3 +CFLAGS+= -fcommon USERS= squid GROUPS= squid Modified: head/www/rejik/files/patch-Makefile ============================================================================== --- head/www/rejik/files/patch-Makefile Sun Jun 21 14:43:48 2020 (r539768) +++ head/www/rejik/files/patch-Makefile Sun Jun 21 14:55:10 2020 (r539769) @@ -1,6 +1,21 @@ --- Makefile.orig 2013-11-15 10:28:02 UTC +++ Makefile -@@ -40,36 +40,35 @@ cygwin: clean cygwin_vars ${REDIRECTOR_O +@@ -13,11 +13,11 @@ REDIRECTOR_OBJ= pass.o raw_change.o load_cache.o pcre. + MAKE-CACHE_OBJ= load_urls.o prune_urls.o write_cache.o need_cache_update.o ${COMMON_OBJ} + + .c.o: vars.h +- ${CC} ${INCLUDE} -c $< ++ ${CC} ${CFLAGS} ${INCLUDE} -c $< + + all: clean ${REDIRECTOR_OBJ} ${MAKE-CACHE_OBJ} +- ${CC} ${INCLUDE} -o redirector redirector.c ${REDIRECTOR_OBJ} ${LIBS} +- ${CC} ${INCLUDE} -o make-cache make-cache.c ${MAKE-CACHE_OBJ} ${LIBS} ++ ${CC} ${LDFLAGS} ${INCLUDE} -o redirector redirector.c ${REDIRECTOR_OBJ} ${LIBS} ++ ${CC} ${LDFLAGS} ${INCLUDE} -o make-cache make-cache.c ${MAKE-CACHE_OBJ} ${LIBS} + + clean: + rm -f ${REDIRECTOR_OBJ} ${MAKE-CACHE_OBJ} redirector make-cache OUT rejik3.zip rejik3/* +@@ -40,36 +40,35 @@ cygwin: clean cygwin_vars ${REDIRECTOR_OBJ} ${MAKE-CAC install: # Make dirs