From owner-svn-ports-head@FreeBSD.ORG Fri Jan 17 03:31:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org 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 2524F2E7; Fri, 17 Jan 2014 03:31:59 +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 111C71783; Fri, 17 Jan 2014 03:31:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s0H3VwXm053560; Fri, 17 Jan 2014 03:31:58 GMT (envelope-from nemysis@svn.freebsd.org) Received: (from nemysis@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s0H3VwXe053552; Fri, 17 Jan 2014 03:31:58 GMT (envelope-from nemysis@svn.freebsd.org) Message-Id: <201401170331.s0H3VwXe053552@svn.freebsd.org> From: Rusmir Dusko Date: Fri, 17 Jan 2014 03:31:58 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r340011 - in head/graphics/Hermes: . 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, 17 Jan 2014 03:31:59 -0000 Author: nemysis Date: Fri Jan 17 03:31:57 2014 New Revision: 340011 URL: http://svnweb.freebsd.org/changeset/ports/340011 QAT: https://qat.redports.org/buildarchive/r340011/ Log: - Take maintainership - USES gmake instead of USE_GMAKE - Disable all warnings with -w - Support STAGEDIR, fix proper installation includes - Install proper DOCS and add Option - Recreate patches with make makepatch Added: head/graphics/Hermes/files/patch-src__HeadMMX.h (contents, props changed) head/graphics/Hermes/files/patch-src__HeadX86.h (contents, props changed) head/graphics/Hermes/files/patch-src__Makefile.in (contents, props changed) Deleted: head/graphics/Hermes/files/patch-aa head/graphics/Hermes/files/patch-src-HeadMMX.h head/graphics/Hermes/files/patch-src-HeadX86.h Modified: head/graphics/Hermes/Makefile (contents, props changed) head/graphics/Hermes/files/patch-configure (contents, props changed) Modified: head/graphics/Hermes/Makefile ============================================================================== --- head/graphics/Hermes/Makefile Fri Jan 17 02:56:01 2014 (r340010) +++ head/graphics/Hermes/Makefile Fri Jan 17 03:31:57 2014 (r340011) @@ -6,23 +6,36 @@ PORTVERSION= 1.3.3 PORTREVISION= 2 CATEGORIES= graphics MASTER_SITES= ftp://ftp.su.se/pub/lunar/source-archive/ \ - ${MASTER_SITE_GENTOO} + GENTOO MASTER_SITE_SUBDIR= distfiles -MAINTAINER= ports@FreeBSD.org +MAINTAINER= nemysis@FreeBSD.org COMMENT= Fast pixel formats conversion library -USE_AUTOTOOLS= libtool USE_BZIP2= yes -USE_GMAKE= yes +USES= gmake +USE_AUTOTOOLS= libtool GNU_CONFIGURE= yes MAKE_ARGS= ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \ AUTOHEADER="${TRUE}" +CFLAGS+= -w USE_LDCONFIG= yes PORTDOCS= * -NO_STAGE= yes +DOCSRCDIR1= ${WRKSRC} +DOC_FILES1= AUTHORS ChangeLog FAQ README TODO TODO.conversion + +DOCSRCDIR2= ${WRKSRC}/docs/api +DOCSDIR2= ${DOCSDIR}/docs/api +DOC_FILES2= *.htm api.ps api.txt + +DOCSRCDIR3= ${WRKSRC}/docs/api/sgml +DOCSDIR3= ${DOCSDIR}/docs/api/sgml +DOC_FILES3= api.sgml + +OPTIONS_DEFINE= DOCS + .include .if ${ARCH} == sparc64 @@ -30,16 +43,10 @@ IGNORE= is broken on sparc64: interchan .endif post-install: -.if !defined(NOPORTDOCS) - @${MKDIR} ${DOCSDIR} -.for file in AUTHORS ChangeLog FAQ README TODO TODO.conversion - ${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR} -.endfor - @${MKDIR} ${DOCSDIR}/API -.for f in api-1.htm api-2.htm api-3.htm api-4.htm api.htm api.ps api.txt - ${INSTALL_DATA} ${WRKSRC}/docs/api/${f} ${DOCSDIR}/API -.endfor - ${INSTALL_DATA} ${WRKSRC}/docs/api/sgml/api.sgml ${DOCSDIR}/API -.endif + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${DOC_FILES1:S|^|${DOCSRCDIR1}/|} ${STAGEDIR}${DOCSDIR} + @${MKDIR} ${STAGEDIR}${DOCSDIR3} + ${INSTALL_DATA} ${DOC_FILES2:S|^|${DOCSRCDIR2}/|} ${STAGEDIR}${DOCSDIR2} + ${INSTALL_DATA} ${DOC_FILES3:S|^|${DOCSRCDIR3}/|} ${STAGEDIR}${DOCSDIR3} .include Modified: head/graphics/Hermes/files/patch-configure ============================================================================== --- head/graphics/Hermes/files/patch-configure Fri Jan 17 02:56:01 2014 (r340010) +++ head/graphics/Hermes/files/patch-configure Fri Jan 17 03:31:57 2014 (r340011) @@ -1,10 +1,16 @@ ---- configure.orig Mon Jul 7 00:56:59 2003 -+++ configure Sun Aug 10 18:45:41 2003 -@@ -7767,6 +7767,7 @@ +--- ./configure.orig 2003-07-06 17:56:59.000000000 +0200 ++++ ./configure 2014-01-17 03:59:56.000000000 +0100 +@@ -7766,10 +7766,11 @@ + # This can be used to rebuild libtool when needed - LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" +-LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh" ++LIBTOOL_DEPS=" /usr/local/share/libtool/config/ltmain.sh" +$ac_aux_dir/ltconfig $LIBTOOL_DEPS # Always use our own libtool. - LIBTOOL='$(SHELL) $(top_builddir)/libtool' +-LIBTOOL='$(SHELL) $(top_builddir)/libtool' ++LIBTOOL='$(SHELL) /usr/local/bin/libtool' + + # Prevent multiple expansion + Added: head/graphics/Hermes/files/patch-src__HeadMMX.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/Hermes/files/patch-src__HeadMMX.h Fri Jan 17 03:31:57 2014 (r340011) @@ -0,0 +1,11 @@ +--- ./src/HeadMMX.h.orig 2000-12-06 05:55:28.000000000 +0100 ++++ ./src/HeadMMX.h 2014-01-17 03:59:56.000000000 +0100 +@@ -51,7 +51,7 @@ + + /* Fix the underscore business with ELF compilers */ + +-#if defined(__ELF__) && defined(__GNUC__) ++#if defined(__ELF__) && defined(__GNUC__) && __GNUC__ < 4 + #ifdef __cplusplus + extern "C" { + #endif Added: head/graphics/Hermes/files/patch-src__HeadX86.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/Hermes/files/patch-src__HeadX86.h Fri Jan 17 03:31:57 2014 (r340011) @@ -0,0 +1,11 @@ +--- ./src/HeadX86.h.orig 2000-12-06 05:55:28.000000000 +0100 ++++ ./src/HeadX86.h 2014-01-17 03:59:56.000000000 +0100 +@@ -83,7 +83,7 @@ + + /* Now fix up the ELF underscore problem */ + +-#if defined(__ELF__) && defined(__GNUC__) ++#if defined(__ELF__) && defined(__GNUC__) && __GNUC__ < 4 + #ifdef __cplusplus + extern "C" { + #endif Added: head/graphics/Hermes/files/patch-src__Makefile.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/graphics/Hermes/files/patch-src__Makefile.in Fri Jan 17 03:31:57 2014 (r340011) @@ -0,0 +1,19 @@ +--- ./src/Makefile.in.orig 2003-07-06 17:56:57.000000000 +0200 ++++ ./src/Makefile.in 2014-01-17 04:02:38.000000000 +0100 +@@ -540,13 +540,13 @@ + + + .S.o: +- gcc -c -o $@ $< ++ $(CC) -c -o $@ $< + cp $@ `echo $@ | sed -e 's/\.lo$$/.o/'` + + install-data-local: +- $(INSTALL) -m 0755 -d $(includedir)/Hermes ++ $(mkinstalldirs) $(DESTDIR)$(includedir)/Hermes + for incfile in $(publicheaders); do \ +- $(INSTALL) -m 0644 $$incfile $(includedir)/Hermes; \ ++ $(INSTALL_DATA) $$incfile $(DESTDIR)$(includedir)/Hermes; \ + done + + uninstall-local: