Bug 184843 - games/netspades: Fix build with clang
Summary: games/netspades: 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: Pawel Pekala
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2013-12-16 18:10 UTC by tkato432
Modified: 2013-12-26 13:20 UTC (History)
0 users

See Also:


Attachments
file.diff (2.37 KB, patch)
2013-12-16 18:10 UTC, tkato432
no flags Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description tkato432 2013-12-16 18:10:11 UTC
- Fix build with clang
- Update MASTER_SITES
- Add OPTIONS for GTK1 and SLANG support
- Support PLIST_FILES

Remove file:
pkg-plist
Comment 1 Pawel Pekala freebsd_committer freebsd_triage 2013-12-25 13:02:14 UTC
Responsible Changed
From-To: freebsd-ports-bugs->pawel

I'll take it.
Comment 2 dfilter service freebsd_committer freebsd_triage 2013-12-25 13:13:09 UTC
Author: pawel
Date: Wed Dec 25 13:13:02 2013
New Revision: 337413
URL: http://svnweb.freebsd.org/changeset/ports/337413

Log:
  - Fix build with clang
  - Update MASTER_SITES
  - Add LICENSE, desktop entry file
  - Add OPTIONS for GTK1 and SLANG support
  - Support staging
  - Switch to PLIST_FILES
  
  PR:		ports/184843
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>

Deleted:
  head/games/netspades/pkg-plist
Modified:
  head/games/netspades/Makefile

Modified: head/games/netspades/Makefile
==============================================================================
--- head/games/netspades/Makefile	Wed Dec 25 12:58:11 2013	(r337412)
+++ head/games/netspades/Makefile	Wed Dec 25 13:13:02 2013	(r337413)
@@ -3,22 +3,64 @@
 
 PORTNAME=	NetSpades
 PORTVERSION=	4.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
-MASTER_SITES=	http://www.ece.rice.edu/~brentmh/spades/
+MASTER_SITES=	TUCOWS/x11/entertain \
+		http://www.ece.rice.edu/~brentmh/spades/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very popular card game for 1-4 players over a network
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
+LICENSE=	GPLv2 # (or later)
 
+OPTIONS_DEFINE=	GTK1 SLANG
+OPTIONS_DEFAULT=	GTK1 SLANG
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk12
+
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -ltermcap
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	bin/spadesd man/man6/spadesd.6.gz
 
-MAN6=		gspades.6 slspades.6 spadesd.6
+GTK1_USE=		GNOME=gtk12
+GTK1_CONFIGURE_OFF=	--without-gtk
+GTK1_PLIST_FILES=	bin/gspades man/man6/gspades.6.gz
+
+SLANG_USES=		readline
+SLANG_CONFIGURE_OFF=	--without-slang
+SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LDFLAGS=		-ltermcap
+SLANG_PLIST_FILES=	bin/slspades man/man6/slspades.6.gz
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGTK1}
+DESKTOP_ENTRIES="GSpades" "" "" "gspades" "" ""
+.endif
+
+post-patch:
+.for i in engine_func.c gtk_connect.c listen.c sl_io.c
+	@${REINPLACE_CMD} -e \
+		's| log| ns_log|g' ${WRKSRC}/src/${i}
+.endfor
+
+do-install:
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} spadesd \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} spadesd.6 \
+		${STAGEDIR}${MANPREFIX}/man/man6)
+.if ${PORT_OPTIONS:MGTK1}
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} gspades \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} gspades.6 \
+		${STAGEDIR}${MANPREFIX}/man/man6)
+.endif
+.if ${PORT_OPTIONS:MSLANG}
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} slspades \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} slspades.6 \
+		${STAGEDIR}${MANPREFIX}/man/man6)
+.endif
 
-NO_STAGE=	yes
 .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"
Comment 3 Pawel Pekala freebsd_committer freebsd_triage 2013-12-25 13:13:10 UTC
State Changed
From-To: open->closed

Committed, with minor changes. Thanks!
Comment 4 dfilter service freebsd_committer freebsd_triage 2013-12-26 13:13:38 UTC
Author: mat
Date: Thu Dec 26 13:13:30 2013
New Revision: 337497
URL: http://svnweb.freebsd.org/changeset/ports/337497

Log:
  MFH: r337413
  
  - Fix build with clang
  - Update MASTER_SITES
  - Add LICENSE, desktop entry file
  - Add OPTIONS for GTK1 and SLANG support
  - Support staging
  - Switch to PLIST_FILES
  
  PR:		ports/184843
  Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
  Approved by:	portmgr (implicit)

Deleted:
  branches/2014Q1/games/netspades/pkg-plist
Modified:
  branches/2014Q1/games/netspades/Makefile
Directory Properties:
  branches/2014Q1/   (props changed)

Modified: branches/2014Q1/games/netspades/Makefile
==============================================================================
--- branches/2014Q1/games/netspades/Makefile	Thu Dec 26 13:11:44 2013	(r337496)
+++ branches/2014Q1/games/netspades/Makefile	Thu Dec 26 13:13:30 2013	(r337497)
@@ -3,22 +3,64 @@
 
 PORTNAME=	NetSpades
 PORTVERSION=	4.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	games
-MASTER_SITES=	http://www.ece.rice.edu/~brentmh/spades/
+MASTER_SITES=	TUCOWS/x11/entertain \
+		http://www.ece.rice.edu/~brentmh/spades/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Very popular card game for 1-4 players over a network
 
-LIB_DEPENDS=	slang.2:${PORTSDIR}/devel/libslang2
+LICENSE=	GPLv2 # (or later)
 
+OPTIONS_DEFINE=	GTK1 SLANG
+OPTIONS_DEFAULT=	GTK1 SLANG
 
 GNU_CONFIGURE=	yes
-USE_GNOME=	gtk12
+
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -ltermcap
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+PLIST_FILES=	bin/spadesd man/man6/spadesd.6.gz
 
-MAN6=		gspades.6 slspades.6 spadesd.6
+GTK1_USE=		GNOME=gtk12
+GTK1_CONFIGURE_OFF=	--without-gtk
+GTK1_PLIST_FILES=	bin/gspades man/man6/gspades.6.gz
+
+SLANG_USES=		readline
+SLANG_CONFIGURE_OFF=	--without-slang
+SLANG_LIB_DEPENDS=	libslang.so:${PORTSDIR}/devel/libslang2
+SLANG_LDFLAGS=		-ltermcap
+SLANG_PLIST_FILES=	bin/slspades man/man6/slspades.6.gz
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MGTK1}
+DESKTOP_ENTRIES="GSpades" "" "" "gspades" "" ""
+.endif
+
+post-patch:
+.for i in engine_func.c gtk_connect.c listen.c sl_io.c
+	@${REINPLACE_CMD} -e \
+		's| log| ns_log|g' ${WRKSRC}/src/${i}
+.endfor
+
+do-install:
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} spadesd \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} spadesd.6 \
+		${STAGEDIR}${MANPREFIX}/man/man6)
+.if ${PORT_OPTIONS:MGTK1}
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} gspades \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} gspades.6 \
+		${STAGEDIR}${MANPREFIX}/man/man6)
+.endif
+.if ${PORT_OPTIONS:MSLANG}
+	(cd ${WRKSRC}/src && ${INSTALL_PROGRAM} slspades \
+		${STAGEDIR}${PREFIX}/bin)
+	(cd ${WRKSRC} && ${INSTALL_MAN} slspades.6 \
+		${STAGEDIR}${MANPREFIX}/man/man6)
+.endif
 
-NO_STAGE=	yes
 .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"