svn commit: r311860 - head/databases/typhoon

[Martin Wilke]

Author: miwi
Date: Thu Feb  7 14:50:39 2013
New Revision: 311860
URL: http://svnweb.freebsd.org/changeset/ports/311860

Log:
  - Fix build with clang
  - Trim header
  
  PR:		175024
  Submitted by:	Ports Fury

Modified:
  head/databases/typhoon/Makefile   (contents, props changed)

Modified: head/databases/typhoon/Makefile
==============================================================================
--- head/databases/typhoon/Makefile	Thu Feb  7 14:49:27 2013	(r311859)
+++ head/databases/typhoon/Makefile	Thu Feb  7 14:50:39 2013	(r311860)
@@ -1,19 +1,14 @@
-# New ports collection makefile for: typhoon
-# Date created:		Wed Dec 11 15:16:19 CST 1996
-# Whom:			erich at FreeBSD.org
-#
+# Created by: erich at FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	typhoon
 PORTVERSION=	1.10.3
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	libs/db
+MASTER_SITES=	SUNSITE/libs/db
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at FreeBSD.org
-COMMENT=	A relational database library
+COMMENT=	Relational database library
 
 HAS_CONFIGURE=	yes
 USE_LDCONFIG=	yes
@@ -26,21 +21,22 @@ MAN3=	d_close.3 d_crget.3 d_crread.3 d_c
 	d_keyread.3 d_open.3 d_recfrst.3 d_reclast.3 d_recnext.3 d_recprev.3 \
 	d_recread.3 d_recwrite.3 d_setfiles.3
 
-pre-patch:
-	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
-		${WRKSRC}/util/dbdview.c
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|<malloc.h>|<stdlib.h>| ; \
+		 s|^void main|int main|' ${WRKSRC}/util/dbdview.c
 
 post-install:
-.for file in ${MAN1}
-	${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man1
+.for i in ${MAN1}
+	(cd ${WRKSRC}/man && ${INSTALL_MAN} ${i} ${MAN1PREFIX}/man/man1)
 .endfor
-.for file in ${MAN3}
-	${INSTALL_MAN} ${WRKSRC}/man/${file} ${PREFIX}/man/man3
+.for i in ${MAN3}
+	(cd ${WRKSRC}/man && ${INSTALL_MAN} ${i} ${MAN3PREFIX}/man/man3)
 .endfor
-	@${MKDIR} ${PREFIX}/share/typhoon
-	${INSTALL_DATA} ${WRKSRC}/man/manual.asc ${PREFIX}/share/typhoon
-.for file in environ.h typhoon.h
-	${INSTALL_DATA} ${WRKSRC}/include/${file} ${PREFIX}/include
+	@${MKDIR} ${DATADIR}
+	(cd ${WRKSRC}/man && ${INSTALL_DATA} manual.asc ${DATADIR})
+.for i in environ.h typhoon.h
+	(cd ${WRKSRC}/include && ${INSTALL_DATA} ${i} ${PREFIX}/include)
 .endfor
 
 .include <bsd.port.mk>