svn commit: r340011 - in head/graphics/Hermes: . files
Rusmir Dusko
nemysis at FreeBSD.org
Fri Jan 17 03:31:59 UTC 2014
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 at FreeBSD.org
+MAINTAINER= nemysis at 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 <bsd.port.pre.mk>
.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 <bsd.port.post.mk>
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:
More information about the svn-ports-all
mailing list