5 files changed, 41 insertions, 28 deletions

diff --git a/graphics/Hermes/Makefile b/graphics/Hermes/Makefile
index b1d36ee408ae..dced1e01dc57 100644
--- a/graphics/Hermes/Makefile
+++ b/graphics/Hermes/Makefile
@@ -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 <bsd.port.pre.mk>
 
 .if ${ARCH} == sparc64
@@ -30,16 +43,10 @@ IGNORE=		is broken on sparc64: interchanges red and blue colour channels in imag
 .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>
diff --git a/graphics/Hermes/files/patch-configure b/graphics/Hermes/files/patch-configure
index 87e1764cbc92..5aa1707c5b24 100644
--- a/graphics/Hermes/files/patch-configure
+++ b/graphics/Hermes/files/patch-configure
@@ -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
+ 
diff --git a/graphics/Hermes/files/patch-src-HeadMMX.h b/graphics/Hermes/files/patch-src__HeadMMX.h
index fa7a76eda017..1694f51cf052 100644
--- a/graphics/Hermes/files/patch-src-HeadMMX.h
+++ b/graphics/Hermes/files/patch-src__HeadMMX.h
@@ -1,5 +1,5 @@
---- src/HeadMMX.h.orig	Thu Aug 30 19:26:59 2007
-+++ src/HeadMMX.h	Thu Aug 30 19:27:59 2007
+--- ./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 */
diff --git a/graphics/Hermes/files/patch-src-HeadX86.h b/graphics/Hermes/files/patch-src__HeadX86.h
index e3cb4826eb11..b5fd20918c29 100644
--- a/graphics/Hermes/files/patch-src-HeadX86.h
+++ b/graphics/Hermes/files/patch-src__HeadX86.h
@@ -1,5 +1,5 @@
---- src/HeadX86.h.orig	Thu Aug 30 19:28:22 2007
-+++ src/HeadX86.h	Thu Aug 30 19:28:44 2007
+--- ./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 */
diff --git a/graphics/Hermes/files/patch-aa b/graphics/Hermes/files/patch-src__Makefile.in
index 249113bd39bb..7eed3c040885 100644
--- a/graphics/Hermes/files/patch-aa
+++ b/graphics/Hermes/files/patch-src__Makefile.in
@@ -1,5 +1,5 @@
---- src/Makefile.in.orig	Mon Jul  7 00:56:57 2003
-+++ src/Makefile.in	Sun Aug 10 18:54:05 2003
+--- ./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 @@
  
  
@@ -13,7 +13,7 @@
 +	$(mkinstalldirs) $(DESTDIR)$(includedir)/Hermes
  	for incfile in $(publicheaders); do \
 -	  $(INSTALL) -m 0644 $$incfile $(includedir)/Hermes; \
-+	  $(INSTALL_DATA) $$incfile $(includedir)/Hermes; \
++	  $(INSTALL_DATA) $$incfile $(DESTDIR)$(includedir)/Hermes; \
  	done
  
  uninstall-local: