From 9e9d988f842033e039bc66c3548d6f02510ffd5c Mon Sep 17 00:00:00 2001 From: Martin Wilke Date: Thu, 7 Feb 2013 14:50:39 +0000 Subject: [PATCH] - Fix build with clang - Trim header PR: 175024 Submitted by: Ports Fury --- databases/typhoon/Makefile | 34 +++++++++++++++------------------- 1 file changed, 15 insertions(+), 19 deletions(-) diff --git a/databases/typhoon/Makefile b/databases/typhoon/Makefile index 57b01d09e86b..c73ee347ae04 100644 --- a/databases/typhoon/Makefile +++ b/databases/typhoon/Makefile @@ -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_crset.3 d_dbdpath.3 d_dbfpath.3 \ 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,,,' \ - ${WRKSRC}/util/dbdview.c +post-patch: + @${REINPLACE_CMD} -e \ + 's||| ; \ + 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