From owner-svn-ports-all@freebsd.org Tue Feb 14 17:04:04 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 0573FCDFCD9; Tue, 14 Feb 2017 17:04:04 +0000 (UTC) (envelope-from tijl@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 D43B5121E; Tue, 14 Feb 2017 17:04:03 +0000 (UTC) (envelope-from tijl@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v1EH42ZI047493; Tue, 14 Feb 2017 17:04:02 GMT (envelope-from tijl@FreeBSD.org) Received: (from tijl@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v1EH42Nq047491; Tue, 14 Feb 2017 17:04:02 GMT (envelope-from tijl@FreeBSD.org) Message-Id: <201702141704.v1EH42Nq047491@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tijl set sender to tijl@FreeBSD.org using -f From: Tijl Coosemans Date: Tue, 14 Feb 2017 17:04:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r434127 - in head/mail/vpopmail: . 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: Tue, 14 Feb 2017 17:04:04 -0000 Author: tijl Date: Tue Feb 14 17:04:02 2017 New Revision: 434127 URL: https://svnweb.freebsd.org/changeset/ports/434127 Log: Don't patch away upstream -fPIC so dependent ports can link libvpopmail.a into shared libraries. Deleted: head/mail/vpopmail/files/patch-cdb-Makefile Modified: head/mail/vpopmail/Makefile head/mail/vpopmail/files/patch-Makefile.in Modified: head/mail/vpopmail/Makefile ============================================================================== --- head/mail/vpopmail/Makefile Tue Feb 14 16:29:38 2017 (r434126) +++ head/mail/vpopmail/Makefile Tue Feb 14 17:04:02 2017 (r434127) @@ -3,7 +3,7 @@ PORTNAME= vpopmail PORTVERSION= 5.4.33 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= mail MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-stable/${PORTVERSION} @@ -61,7 +61,6 @@ OPTIONS_DEFINE= DOCS \ SUID_VCHKPW \ SMTP_AUTH_PATCH \ ONCHANGE_SCRIPT \ - FPIC \ MAILDROP \ DOMAIN_QUOTAS \ SPAMFOLDER \ @@ -78,7 +77,6 @@ OPTIONS_DEFAULT=MD5_PASSWORDS \ FILE_LOCKING \ USERS_BIG_DIR \ SEEKABLE \ - FPIC \ AUTH_LOG CDB_DESC= Auth via CDB @@ -106,7 +104,6 @@ SPAMASSASSIN_DESC= SpamAssassin support SUID_VCHKPW_DESC= Set vchkpw setugid vpopmail:vchkpw SMTP_AUTH_PATCH_DESC= Swap Challenge/Response for CRAM-MD5 ONCHANGE_SCRIPT_DESC= vpopmail/etc/onchange script support -FPIC_DESC= Compile with -fPIC MAILDROP_DESC= Maildrop MDA support DOMAIN_QUOTAS_DESC= Domain quotas support SPAMFOLDER_DESC= Move spam to Junk (requires SA) @@ -320,10 +317,6 @@ MAILDROP_FILES= ${WRKSRC}/maildrop/mail EXTRA_PATCHES+= ${FILESDIR}/Makefile.in-noportdocs.patch .endif -.if ${PORT_OPTIONS:MFPIC} && ( ${ARCH} == "amd64" || ${ARCH} == "ia64" ) -CFLAGS+= -fPIC -.endif - # # Some suggestions from Gabriel Ambuehl # Modified: head/mail/vpopmail/files/patch-Makefile.in ============================================================================== --- head/mail/vpopmail/files/patch-Makefile.in Tue Feb 14 16:29:38 2017 (r434126) +++ head/mail/vpopmail/files/patch-Makefile.in Tue Feb 14 17:04:02 2017 (r434127) @@ -1,13 +1,12 @@ -Description: Install config files with -dist, do not add -fPIC. +Description: Install config files with -dist. Install the config files with a -dist extension. - Do not unconditionally add -fPIC, this is done only for shared libs. Forwarded: not-needed Author: Peter Pentchev Last-Update: 2010-09-13 --- Makefile.in.orig 2011-02-28 11:00:45.000000000 -0600 +++ Makefile.in 2014-04-10 11:17:21.360658218 -0500 -@@ -357,13 +357,12 @@ +@@ -357,9 +357,9 @@ noinst_HEADERS = md5.h vpopmail.h file_lock.h vauth.h vlimits.h maildirquota.h vcdb.h vldap.h vmysql.h voracle.h vpgsql.h vsybase.h vlog.h global.h hmac_md5.h seek.h vutil.h COMMONSOURCES = vpopmail.c md5.c bigdir.c vauth.c file_lock.c vpalias.c seek.c vlimits.c maildirquota.c vutil.c vlistlib.c backfill.c client.c conf.c ippp.c CONFIG_CLEAN_FILES = vauth.c cdb/conf-cc cdb/conf-ld cdb/compile cdb/load @@ -20,7 +19,3 @@ Last-Update: 2010-09-13 noinst_LIBRARIES = libvpopmail.a libvpopmail_a_SOURCES = $(COMMONSOURCES) libvpopmail_a_LIBADD = cdb/*.o --libvpopmail_a_CFLAGS = -fPIC - vpopmailbindir = @vpopmaildir@/bin - vusagec_SOURCES = vusagec.c client.c conf.c ippp.c - vusagec_LDADD = libvpopmail.a @auth_libs@