From owner-freebsd-ports-bugs@FreeBSD.ORG Sat May 17 18:10:00 2014 Return-Path: Delivered-To: freebsd-ports-bugs@smarthost.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E336CF0C for ; Sat, 17 May 2014 18:10:00 +0000 (UTC) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:1900:2254:206c::16:87]) (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 BCF692A1B for ; Sat, 17 May 2014 18:10:00 +0000 (UTC) Received: from freefall.freebsd.org (localhost [127.0.0.1]) by freefall.freebsd.org (8.14.8/8.14.8) with ESMTP id s4HIA0ei073963 for ; Sat, 17 May 2014 18:10:00 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.8/8.14.8/Submit) id s4HIA0F5073951; Sat, 17 May 2014 18:10:00 GMT (envelope-from gnats) Resent-Date: Sat, 17 May 2014 18:10:00 GMT Resent-Message-Id: <201405171810.s4HIA0F5073951@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Corey Halpin Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 67822CD1 for ; Sat, 17 May 2014 18:04:02 +0000 (UTC) Received: from sabe.cs.wisc.edu (sabe.cs.wisc.edu [128.105.6.20]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "sabe.cs.wisc.edu", Issuer "InCommon Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 2870829CE for ; Sat, 17 May 2014 18:04:01 +0000 (UTC) Received: from spiff.home.crhalpin.org (108-249-32-238.lightspeed.mdsnwi.sbcglobal.net [108.249.32.238]) (authenticated bits=0) by sabe.cs.wisc.edu (8.14.1/8.14.1) with ESMTP id s4HI3wp5028656 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Sat, 17 May 2014 13:03:59 -0500 Received: from localhost (1001@localhost [local]); by localhost (OpenSMTPD) with ESMTPA id 08697eff; for ; Sat, 17 May 2014 13:03:53 -0500 (CDT) Message-Id: <1061077747612897480.enqueue@spiff.home.crhalpin.org> Date: Sat, 17 May 2014 13:03:53 -0500 (CDT) From: Corey Halpin Reply-To: Corey Halpin To: FreeBSD-gnats-submit@freebsd.org X-Send-Pr-Version: 3.114 Subject: ports/189892: mail/crm114: STAGE support [PATCH] X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 17 May 2014 18:10:01 -0000 >Number: 189892 >Category: ports >Synopsis: mail/crm114: STAGE support [PATCH] >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat May 17 18:10:00 UTC 2014 >Closed-Date: >Last-Modified: >Originator: Corey Halpin >Release: FreeBSD 9.2-RELEASE-p4 i386 >Organization: >Environment: System: FreeBSD spiff.home.crhalpin.org 9.2-RELEASE-p4 FreeBSD 9.2-RELEASE-p4 #0: Tue Apr 8 18:05:06 UTC 2014 root@amd64-builder.daemonology.net:/usr/obj/usr/src/sys/GENERIC i386 >Description: Staging support for mail/crm114, better portlint compliance, fix building with clang. >How-To-Repeat: NA >Fix: --- crm_stage.patch begins here --- diff -ruN crm114.orig/Makefile crm114/Makefile --- crm114.orig/Makefile 2014-05-16 18:27:52.996241376 -0500 +++ crm114/Makefile 2014-05-17 08:57:41.775262819 -0500 @@ -17,13 +17,19 @@ MAINTAINER= chalpin@cs.wisc.edu COMMENT= A Markov based SpamFilter -LIB_DEPENDS= tre.5:${PORTSDIR}/textproc/libtre +LICENSE= GPLv2 + +LIB_DEPENDS= libtre.so:${PORTSDIR}/textproc/libtre CRM114RELEASENAME=BlameMichelson USES= gettext iconv +USE_CSTD=gnu89 + +OPTIONS_DEFINE= NORMALIZEMIME +NORMALIZEMIME_DESC= Normalize MIME encoding -MAKE_ARGS= CC="${CC}" prefix="${PREFIX}" \ +MAKE_ARGS= CC="${CC}" prefix="${STAGEDIR}${PREFIX}" \ LIBS="${LIBS}" \ INSTALL_PROGRAM="${INSTALL_PROGRAM}" @@ -43,31 +49,16 @@ blacklist.mfp.example whitelist.mfp.example crm114-mode.el \ reto_procmailrc.recipe -OPTIONS_DEFINE= PGO - -NO_STAGE= yes .include -.if ${PORT_OPTIONS:MPGO} -MAKE_ARGS+= CFLAGS="${CFLAGS} -fprofile-use" \ - LDFLAGS="${LDFLAGS} -fprofile-use" -.else MAKE_ARGS+= CFLAGS="${CFLAGS}" \ LDFLAGS="${LDFLAGS}" -.endif post-patch: @${REINPLACE_CMD} -Ee \ 's,^((LD|C)FLAGS),#\1,;;s,^(prefix=),#\1,;;s,^(.*-install),#\1,' \ ${WRKSRC}/Makefile -.if ${PORT_OPTIONS:MPGO} -.if target(pre-build) -.error Makefile error since pre-build target has already been defined -.endif -pre-build: pgo -.endif - # Peter Jeremy recommended the use of b64decode and md5 20040302 post-install: @${REINPLACE_CMD} -Ee 's|^(.*/openssl base64 -d/)|#\1|' \ @@ -87,30 +78,15 @@ @${REINPLACE_CMD} -Ee 's|^#(.*/b64decode -pr/)|\1|' \ ${WRKSRC}/mailfilter.cf .endif - @${MKDIR} ${EXAMPLESDIR} + @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} for i in ${CRM_FILES}; do \ - ${INSTALL_DATA} ${WRKSRC}/$${i} ${EXAMPLESDIR}; \ + ${INSTALL_DATA} ${WRKSRC}/$${i} ${STAGEDIR}${EXAMPLESDIR}; \ done -.ifndef(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} + @${MKDIR} ${STAGEDIR}${DOCSDIR} @for i in ${WRKSRC}/[^G]*.txt ${WRKSRC}/README; do \ - ${INSTALL_DATA} $${i} ${DOCSDIR}; \ + ${INSTALL_DATA} $${i} ${STAGEDIR}${DOCSDIR}; \ done .endif -.if ${PORT_OPTIONS:MPGO} -pgo: pgo-build pgo-run pgo-clean - -pgo-build: - @(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} CFLAGS="${CFLAGS} -fprofile-generate" LDFLAGS="${LDFLAGS} -fprofile-generate" ${ALL_TARGET}) - -pgo-run: -# Check everything to generate profiling information. -# We will ignore any errors. - @-(cd ${BUILD_WRKSRC}; ${MAKE} megatest) - -pgo-clean: - @(cd ${BUILD_WRKSRC}; ${MAKE} clean) -.endif # if ${PORT_OPTIONS:MPGO} - .include --- crm_stage.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: