ports/175045: games/jzip: Fix build with clang

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


>Number:         175045
>Category:       ports
>Synopsis:       games/jzip: 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:12 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        FreeBSD 7.4-RELEASE-p10 i386
>Organization:
>Environment:
>Description:
- Fix build with clang
- Add MAKE_JOBS_SAFE

Remove file:
files/patch-aa
pkg-plist

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/games/jzip/Makefile games/jzip/Makefile
--- /usr/ports/games/jzip/Makefile	2012-11-08 07:18:45.000000000 +0900
+++ games/jzip/Makefile	2013-01-05 13:36:08.000000000 +0900
@@ -1,32 +1,44 @@
-# New ports collection makefile for:	jzip
-# Date created:				7 May 1998
-# Whom:					Matthew Hunt <mph at FreeBSD.org>
-#
+# Created by: Matthew Hunt <mph at FreeBSD.org>
 # $FreeBSD: head/games/jzip/Makefile 300896 2012-07-14 13:54:48Z beat $
-#
 
-PORTNAME=		jzip
-PORTVERSION=		2.0.1g
-CATEGORIES=		games
-MASTER_SITES=   	${MASTER_SITE_LOCAL}
-MASTER_SITE_SUBDIR=	mph
-DISTNAME=		jzip201g
-
-MAINTAINER=		ports at 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 at 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>
diff -urN /usr/ports/games/jzip/files/patch-aa games/jzip/files/patch-aa
--- /usr/ports/games/jzip/files/patch-aa	2012-11-08 07:18:45.000000000 +0900
+++ games/jzip/files/patch-aa	1970-01-01 09:00:00.000000000 +0900
@@ -1,17 +0,0 @@
---- Makefile.orig	Tue Dec  5 09:57:04 1995
-+++ Makefile	Thu May  7 22:35:23 1998
-@@ -21,10 +21,10 @@
- # -DHARD_COLORS
- # to the CFLAGS line.
- 
--CC = cc
--CFLAGS = -c -DPOSIX 
--LDFLAGS = -O
--LIBS = -lcurses
-+#CC = cc
-+CFLAGS += -c -DPOSIX -DHAVE_GETOPT
-+#LDFLAGS = -O
-+LIBS = -ltermcap
- 
- INC = ztypes.h
- OBJS = jzip.o control.o extern.o fileio.o input.o interpre.o math.o memory.o \
diff -urN /usr/ports/games/jzip/pkg-plist games/jzip/pkg-plist
--- /usr/ports/games/jzip/pkg-plist	2012-11-08 07:18:45.000000000 +0900
+++ games/jzip/pkg-plist	1970-01-01 09:00:00.000000000 +0900
@@ -1,3 +0,0 @@
-bin/jzip
-%%PORTDOCS%%%%DOCSDIR%%/Jzip.doc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:


More information about the freebsd-ports-bugs mailing list