ports/175024: databases/typhoon: Fix build with clang

KATO Tsuguru tkato432 at yahoo.com
Sat Jan 5 18:10:06 UTC 2013


>Number:         175024
>Category:       ports
>Synopsis:       databases/typhoon: Fix build with clang
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Jan 05 18:10:06 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix build with clang

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/databases/typhoon/Makefile databases/typhoon/Makefile
--- /usr/ports/databases/typhoon/Makefile	2012-11-08 09:06:55.000000000 +0900
+++ databases/typhoon/Makefile	2013-01-05 22:48:23.000000000 +0900
@@ -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: head/databases/typhoon/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
 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 @@
 	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>
>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list