From owner-svn-ports-head@FreeBSD.ORG  Thu Feb  7 14:50:40 2013
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0E5CE921;
 Thu,  7 Feb 2013 14:50:40 +0000 (UTC)
 (envelope-from miwi@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id DC027368;
 Thu,  7 Feb 2013 14:50:39 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id r17Eodwk088594;
 Thu, 7 Feb 2013 14:50:39 GMT (envelope-from miwi@svn.freebsd.org)
Received: (from miwi@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id r17EodHd088592;
 Thu, 7 Feb 2013 14:50:39 GMT (envelope-from miwi@svn.freebsd.org)
Message-Id: <201302071450.r17EodHd088592@svn.freebsd.org>
From: Martin Wilke <miwi@FreeBSD.org>
Date: Thu, 7 Feb 2013 14:50:39 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r311860 - head/databases/typhoon
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.14
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 07 Feb 2013 14:50:40 -0000

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@FreeBSD.org
-#
+# Created by: erich@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@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>