From owner-svn-ports-all@freebsd.org Sun Mar 26 04:56:51 2017 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id E04C6D19943; Sun, 26 Mar 2017 04:56:51 +0000 (UTC) (envelope-from araujo@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 mx1.freebsd.org (Postfix) with ESMTPS id A13E31921; Sun, 26 Mar 2017 04:56:51 +0000 (UTC) (envelope-from araujo@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v2Q4uoUX080145; Sun, 26 Mar 2017 04:56:50 GMT (envelope-from araujo@FreeBSD.org) Received: (from araujo@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v2Q4uoxl080142; Sun, 26 Mar 2017 04:56:50 GMT (envelope-from araujo@FreeBSD.org) Message-Id: <201703260456.v2Q4uoxl080142@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: araujo set sender to araujo@FreeBSD.org using -f From: Marcelo Araujo Date: Sun, 26 Mar 2017 04:56:50 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r436936 - in head/ftp/twoftpd: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Mar 2017 04:56:52 -0000 Author: araujo Date: Sun Mar 26 04:56:50 2017 New Revision: 436936 URL: https://svnweb.freebsd.org/changeset/ports/436936 Log: - Bump PORTREVISION to reflect devel/bglibs update. - Take maintainership. Added: head/ftp/twoftpd/files/ head/ftp/twoftpd/files/patch-Makefile (contents, props changed) Modified: head/ftp/twoftpd/Makefile head/ftp/twoftpd/distinfo Modified: head/ftp/twoftpd/Makefile ============================================================================== --- head/ftp/twoftpd/Makefile Sun Mar 26 04:56:04 2017 (r436935) +++ head/ftp/twoftpd/Makefile Sun Mar 26 04:56:50 2017 (r436936) @@ -3,22 +3,25 @@ PORTNAME= twoftpd PORTVERSION= 1.43 +PORTREVISION= 1 CATEGORIES= ftp MASTER_SITES= http://untroubled.org/${PORTNAME}/archive/ -MAINTAINER= ports@FreeBSD.org +MAINTAINER= araujo@FreeBSD.org COMMENT= Simple, secure, efficient FTP server LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/bin/bg-installer:devel/bglibs -LIB_DEPENDS= libcvm-v2client.so:security/cvm +LIB_DEPENDS= libcvm-v2client.so:security/cvm \ + libbg.so.2:devel/bglibs USES= localbase:ldflags -BGLIBS_LIB= ${LOCALBASE}/lib/bglibs BGLIBS_INCLUDE= ${LOCALBASE}/include/bglibs +BGLIBS_LIB= ${LOCALBASE}/lib/bglibs +USE_LDCONFIG= ${BGLIBS_LIB} PORTDOCS= NEWS README TODO PLIST_FILES= bin/twoftpd-anon bin/twoftpd-anon-conf \ Modified: head/ftp/twoftpd/distinfo ============================================================================== --- head/ftp/twoftpd/distinfo Sun Mar 26 04:56:04 2017 (r436935) +++ head/ftp/twoftpd/distinfo Sun Mar 26 04:56:50 2017 (r436936) @@ -1,3 +1,3 @@ -TIMESTAMP = 1489218354 +TIMESTAMP = 1490332776 SHA256 (twoftpd-1.43.tar.gz) = ed77d2f3020bdbbe1a0a7d9a84780f3525431300e5000901e95a982873e24dc3 SIZE (twoftpd-1.43.tar.gz) = 88125 Added: head/ftp/twoftpd/files/patch-Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/ftp/twoftpd/files/patch-Makefile Sun Mar 26 04:56:50 2017 (r436936) @@ -0,0 +1,33 @@ +--- Makefile.orig 2015-02-04 21:59:50 UTC ++++ Makefile +@@ -23,11 +23,12 @@ clean: TARGETS + clean-spac: clean AUTOFILES + rm -f `cat AUTOFILES` + +-compile: conf-cc +- ( echo '#!/bin/sh'; \ ++compile: conf-cc conf-bgincs ++ ( bgincs=`head -n 1 conf-bgincs`; \ ++ echo '#!/bin/sh'; \ + echo 'source=$$1; shift'; \ + echo 'base=`echo "$$source" | sed -e s:\\\\.c$$::`'; \ +- echo exec `head -n 1 conf-cc` -I. '-o $${base}.o -c $$source $${1+"$$@"}'; \ ++ echo exec `head -n 1 conf-cc` -I. "-I'$${bgincs}'" '-o $${base}.o -c $$source $${1+"$$@"}'; \ + ) >compile + chmod 755 compile + +@@ -54,10 +55,11 @@ libraries: backend.a main.a + list.o: compile list.c twoftpd.h backend.h + ./compile list.c + +-load: conf-ld +- ( echo '#!/bin/sh';\ ++load: conf-ld conf-bglibs ++ ( bglibs=`head -n 1 conf-bglibs`; \ ++ echo '#!/bin/sh';\ + echo 'main="$$1"; shift';\ +- echo exec `head -n 1 conf-ld` -L. '-o "$$main" "$$main.o" $${1+"$$@"}'; \ ++ echo exec `head -n 1 conf-ld` -L. "-L'$${bglibs}'" "-Wl,-R'$${bglibs}'" '-o "$$main" "$$main.o" $${1+"$$@"}'; \ + ) >load + chmod 755 load +