Bug 175045 - games/jzip: Fix build with clang
Summary: games/jzip: Fix build with clang
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Martin Wilke
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-01-05 18:10 UTC by tkato432
Modified: 2013-02-07 14:50 UTC (History)
0 users

See Also:

Attachments
file.diff (2.76 KB, patch)
2013-01-05 18:10 UTC, tkato432 		no flags Details | Diff
View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-01-05 18:10:12 UTC 
- Fix build with clang
- Add MAKE_JOBS_SAFE

Remove file:
files/patch-aa
pkg-plist
Comment 1 Marcelo Araujo freebsd_committer freebsd_triage 2013-01-18 06:17:24 UTC 
Responsible Changed
From-To: freebsd-ports-bugs->araujo

I'll take it.
Comment 2 Martin Wilke freebsd_committer freebsd_triage 2013-02-07 14:40:12 UTC 
State Changed
From-To: open->closed

- Take
Comment 3 Martin Wilke freebsd_committer freebsd_triage 2013-02-07 14:40:12 UTC 
Responsible Changed
From-To: araujo->miwi

Committed
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-02-07 14:40:25 UTC 
Author: miwi
Date: Thu Feb  7 14:40:12 2013
New Revision: 311853
URL: http://svnweb.freebsd.org/changeset/ports/311853

Log:
  - Fix build with clang
  - Trim header
  - Add MAKE_JOBS_SAFE
  
  PR:		175045
  Submitted by:	Ports Fury

Deleted:
  head/games/jzip/files/patch-aa
  head/games/jzip/pkg-plist
Modified:
  head/games/jzip/Makefile   (contents, props changed)

Modified: head/games/jzip/Makefile
==============================================================================
--- head/games/jzip/Makefile	Thu Feb  7 14:38:10 2013	(r311852)
+++ head/games/jzip/Makefile	Thu Feb  7 14:40:12 2013	(r311853)
@@ -1,32 +1,44 @@
-# New ports collection makefile for:	jzip
-# Date created:				7 May 1998
-# Whom:					Matthew Hunt <mph@FreeBSD.org>
-#
+# Created by: Matthew Hunt <mph@FreeBSD.org>
 # $FreeBSD$
-#
 
-PORTNAME=		jzip
-PORTVERSION=		2.0.1g
-CATEGORIES=		games
-MASTER_SITES=   	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mph
-DISTNAME=		jzip201g
-
-MAINTAINER=		ports@FreeBSD.org
-COMMENT=	A text-mode Infocom game interpreter
-
-USE_ZIP=		yes
-
-NO_WRKSUBDIR=		yes
-
-MAN1=			jzip.1
+PORTNAME=	jzip
+PORTVERSION=	2.0.1g
+CATEGORIES=	games
+MASTER_SITES=	LOCAL/mph
+DISTNAME=	${PORTNAME}${PORTVERSION:S/.//g}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Text-mode Infocom game interpreter
+
+NO_WRKSUBDIR=	yes
+
+USE_ZIP=	yes
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-DPOSIX -DHAVE_GETOPT
+
+MAN1=		jzip.1
+PORTDOCS=	Jzip.doc
+PLIST_FILES=	bin/jzip
+
+.include <bsd.port.options.mk>
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|^CC =|CC ?=| ; \
+		 s|^CFLAGS =|CFLAGS +=| ; \
+		 s|-DPOSIX|$${CPPFLAGS}| ; \
+		 s|^LDFLAGS|#LDFLAGS| ; \
+		 s|-lcurses|-ltermcap|' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e \
+		's|^void main|int main|' ${WRKSRC}/jzexe.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/jzip ${PREFIX}/bin
-	${INSTALL_DATA} ${WRKSRC}/jzip.1 ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/jzip
-	${INSTALL_DATA} ${WRKSRC}/Jzip.doc ${PREFIX}/share/doc/jzip
+	(cd ${WRKSRC} && ${INSTALL_PROGRAM} jzip ${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_DATA} jzip.1 ${MANPREFIX}/man/man1)
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${DOCSDIR}
+	(cd ${WRKSRC} && ${INSTALL_DATA} Jzip.doc ${DOCSDIR})
 .endif
 
 .include <bsd.port.mk>
_______________________________________________
svn-ports-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-ports-all
To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"