From owner-svn-ports-head@FreeBSD.ORG Fri Feb 21 08:51:04 2014 Return-Path: Delivered-To: svn-ports-head@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 781F092D; Fri, 21 Feb 2014 08:51:04 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5777211F0; Fri, 21 Feb 2014 08:51:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1L8p4wv043241; Fri, 21 Feb 2014 08:51:04 GMT (envelope-from ehaupt@svn.freebsd.org) Received: (from ehaupt@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1L8p4VF043239; Fri, 21 Feb 2014 08:51:04 GMT (envelope-from ehaupt@svn.freebsd.org) Message-Id: <201402210851.s1L8p4VF043239@svn.freebsd.org> From: Emanuel Haupt Date: Fri, 21 Feb 2014 08:51:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r345331 - in head/mail/libspamtest: . 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-head@freebsd.org X-Mailman-Version: 2.1.17 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: Fri, 21 Feb 2014 08:51:04 -0000 Author: ehaupt Date: Fri Feb 21 08:51:03 2014 New Revision: 345331 URL: http://svnweb.freebsd.org/changeset/ports/345331 QAT: https://qat.redports.org/buildarchive/r345331/ Log: - Support staging - Respect CFLAGS - Respect CC Added: head/mail/libspamtest/files/ head/mail/libspamtest/files/patch-Makefile.FreeBSD (contents, props changed) Modified: head/mail/libspamtest/Makefile Modified: head/mail/libspamtest/Makefile ============================================================================== --- head/mail/libspamtest/Makefile Fri Feb 21 08:43:22 2014 (r345330) +++ head/mail/libspamtest/Makefile Fri Feb 21 08:51:03 2014 (r345331) @@ -17,16 +17,12 @@ LIBS= libspamtest.a \ INCLUDES= spamtest.h \ msgstore.h -NO_STAGE= yes - -post-patch-script: - @${REINPLACE_CMD} -e 's|gcc|${CC}|g' \ - ${WRKSRC}/${MAKEFILE} - do-install: - ${MKDIR} ${PREFIX}/ap-mailfilter3/lib ${PREFIX}/ap-mailfilter3/include - ${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} ${PREFIX}/ap-mailfilter3/lib + ${MKDIR} ${STAGEDIR}${PREFIX}/ap-mailfilter3/lib \ + ${STAGEDIR}${PREFIX}/ap-mailfilter3/include + ${INSTALL_DATA} ${LIBS:S,^,${WRKSRC}/,} \ + ${STAGEDIR}${PREFIX}/ap-mailfilter3/lib ${INSTALL_DATA} ${INCLUDES:S,^,${WRKSRC}/,} \ - ${PREFIX}/ap-mailfilter3/include + ${STAGEDIR}${PREFIX}/ap-mailfilter3/include .include Added: head/mail/libspamtest/files/patch-Makefile.FreeBSD ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/libspamtest/files/patch-Makefile.FreeBSD Fri Feb 21 08:51:03 2014 (r345331) @@ -0,0 +1,76 @@ +--- ./Makefile.FreeBSD.orig 2014-02-21 09:48:45.899084755 +0100 ++++ ./Makefile.FreeBSD 2014-02-21 09:49:41.805080872 +0100 +@@ -9,7 +9,7 @@ + all: ${LIBS} ${APPS} + + PICFLAGS=-fpic -DPIC +-CFLAGS=-O3 -g -Wall -DHEAP_ALLOC_ALIGN=4 -DDEFAULT_ALLOC=32768 ++CFLAGS+=-Wall -DHEAP_ALLOC_ALIGN=4 -DDEFAULT_ALLOC=32768 + LOBJ=msgstore.o spamtest_util.o heap.o spamtest.o bufio.o record2.o mess822.o addrlist.o + LTOBJ=msgstore.or spamtest_util.or heap.or spamtest.or bufio.or record2.or mess822.or addrlist.or + LSOBJ=msgstore.So spamtest_util.So heap.So spamtest.So bufio.So record2.So mess822.So addrlist.So +@@ -22,16 +22,16 @@ + rm -f ${LOBJ} ${LTOBJ} ${LSOBJ} ${LTSOBJ} + + .c.o: $< spamtest.h Makefile.FreeBSD +- gcc ${CFLAGS} -c $< ++ $(CC) ${CFLAGS} -c $< + + .c.or: $< spamtest.h Makefile.FreeBSD +- gcc ${CFLAGS} -D_REENTRANT -DXP_MT -D_THREAD_SAFE -pthread -c $< -o $@ ++ $(CC) ${CFLAGS} -D_REENTRANT -DXP_MT -D_THREAD_SAFE -pthread -c $< -o $@ + + .c.So: $< spamtest.h Makefile.FreeBSD +- gcc ${CFLAGS} ${PICFLAGS} -c $< -o $@ ++ $(CC) ${CFLAGS} ${PICFLAGS} -c $< -o $@ + + .c.Sr: $< spamtest.h Makefile.FreeBSD +- gcc ${CFLAGS} ${PICFLAGS} -DXP_MT -D_REENTRANT -D_THREAD_SAFE -pthread -c $< -o $@ ++ $(CC) ${CFLAGS} ${PICFLAGS} -DXP_MT -D_REENTRANT -D_THREAD_SAFE -pthread -c $< -o $@ + + + libspamtest.a: ${LOBJ} +@@ -46,33 +46,33 @@ + + libspamtest.so.${LIB_MAJOR}: ${LSOBJ} + rm -f ${.TARGET} +- gcc -shared -Wl,-x -o ${.TARGET} -Wl,-soname,${.TARGET} `lorder ${LSOBJ} | tsort -q` ++ $(CC) -shared -Wl,-x -o ${.TARGET} -Wl,-soname,${.TARGET} `lorder ${LSOBJ} | tsort -q` + + libspamtest_r.so.${LIB_MAJOR}: ${LTSOBJ} + rm -f ${.TARGET} +- gcc -pthread -shared -Wl,-x -o ${.TARGET} `lorder ${LTSOBJ} | tsort -q` ++ $(CC) -pthread -shared -Wl,-x -o ${.TARGET} `lorder ${LTSOBJ} | tsort -q` + + ap-sample-threads.o: ap-sample-threads.c Makefile.FreeBSD +- gcc ${CFLAGS} -pthread -D_REENTRANT -c ap-sample-threads.c -o $@ ++ $(CC) ${CFLAGS} -pthread -D_REENTRANT -c ap-sample-threads.c -o $@ + + ap-sample: ap-sample.o ${LIBS} +- gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS} ++ $(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS} + + ap-sample3: ap-sample3.o ${LIBS} +- gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample3.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS} ++ $(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample3.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS} + + ap-sample2: ap-sample2.o ${LIBS} +- gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample2.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS} ++ $(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ ap-sample2.o -L. -L/usr/local/lib -lspamtest ${LDFLAGS} + + dump-actions: dump-actions.o ${LIBS} +- gcc ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ dump-actions.o -L. -lspamtest ${LDFLAGS} ++ $(CC) ${CFLAGS} -DBUFIO_USE_INLINE -Wall -o $@ dump-actions.o -L. -lspamtest ${LDFLAGS} + + ap-sample-threads: ap-sample-threads.o ${LIBS} +- gcc ${CFLAGS} -pthread -DBUFIO_USE_INLINE -Wall -o $@ ap-sample-threads.o -L. -lspamtest_r ${LDFLAGS} ++ $(CC) ${CFLAGS} -pthread -DBUFIO_USE_INLINE -Wall -o $@ ap-sample-threads.o -L. -lspamtest_r ${LDFLAGS} + + msgstore: msgstore.c heap.c +- gcc ${CFLAGS} ${LDFLAGS} -DMSGTEST2 -DBUFIO_USE_INLINE -Wall -g -o $@ msgstore.c heap.c ++ $(CC) ${CFLAGS} ${LDFLAGS} -DMSGTEST2 -DBUFIO_USE_INLINE -Wall -g -o $@ msgstore.c heap.c + + addrlist: addrlist.c msgstore.c msgstore.h mess822.c mess822.h heap.o +- gcc ${CFLAGS} ${LDFLAGS} -g -DTEST -Wall -o addrlist addrlist.c msgstore.c mess822.c heap.o ++ $(CC) ${CFLAGS} ${LDFLAGS} -g -DTEST -Wall -o addrlist addrlist.c msgstore.c mess822.c heap.o +