svn commit: r491317 - head/comms/splat

[Diane Bruce]

Author: db
Date: Sat Jan 26 23:47:39 2019
New Revision: 491317
URL: https://svnweb.freebsd.org/changeset/ports/491317

Log:
  From submitter:
  The current port does not facilitate the installation of splat-hd.
  The attached patch resolves that.  Also this patch enables having splat-hd
  build out with 8x8 tiles.
  
  From db:
  - splat-hd was never being built and installed.
  - forced HRM build with new option
  - cleaned up HRM and pkg-plist
  - High resolution 6x6 7x7 and 8x8 need 64bit systems so mark description
    but allow foot shooting if user tries high resolution 8x8 on i386
  
  PR:		ports/235148
  Submitted by:	darcy at dbitech.ca

Modified:
  head/comms/splat/Makefile
  head/comms/splat/pkg-plist   (contents, props changed)

Modified: head/comms/splat/Makefile
==============================================================================
--- head/comms/splat/Makefile	Sat Jan 26 22:15:05 2019	(r491316)
+++ head/comms/splat/Makefile	Sat Jan 26 23:47:39 2019	(r491317)
@@ -2,23 +2,25 @@
 
 PORTNAME=	splat
 PORTVERSION=	1.4.2
+PORTREVISION=	1
 CATEGORIES=	comms hamradio
-MASTER_SITES=	http://www.qsl.net/kd2bd/
-#http://www.qsl.net/kd2bd/splat-1.4.2.tar.bz2
+MASTER_SITES=	http://www.qsl.net/kd2bd/ \
+		LOCAL/db
+
 MAINTAINER=	hamradio at FreeBSD.org
 COMMENT=	Used in calculating path losses, useful to ham radio and others
 
 LICENSE=	GPLv2
 
-USES=	tar:bzip2
+USES=		tar:bzip2
+
 PORTDOCS=	README README2 CHANGES
 
-OPTIONS_DEFINE=	DOCS
-OPTIONS_SINGLE=	SRM
-OPTIONS_RADIO=	HRM
+OPTIONS_DEFINE=	DOCS HRM
+OPTIONS_SINGLE=	SRM HRM
 OPTIONS_SINGLE_SRM=	SRM_2X2 SRM_3X3 SRM_4X4 SRM_5X5 SRM_6X6 SRM_7X7 SRM_8X8
-OPTIONS_RADIO_HRM=	HRM_1X1 HRM_2X2 HRM_3X3 HRM_4X4 HRM_5X5 HRM_6X6
-OPTIONS_DEFAULT=	SRM_4X4
+OPTIONS_SINGLE_HRM=	HRM_1X1 HRM_2X2 HRM_3X3 HRM_4X4 HRM_5X5 HRM_6X6 HRM_7X7 HRM_8X8
+OPTIONS_DEFAULT=	SRM_4X4 HRM_4X4
 
 SRM_2X2_DESC=	2 x 2 degrees
 SRM_3X3_DESC=	3 x 3 degrees
@@ -34,12 +36,15 @@ HRM_2X2_DESC=	2 x 2 degrees
 HRM_3X3_DESC=	3 x 3 degrees
 HRM_4X4_DESC=	4 x 4 degrees
 HRM_5X5_DESC=	5 x 5 degrees
-HRM_6X6_DESC=	6 X 6 degrees
+HRM_6X6_DESC=	6 X 6 degrees (For 64 bit systems)
+HRM_7X7_DESC=	7 x 7 degrees (For 64 bit systems)
+HRM_8X8_DESC=	8 x 8 degrees (For 64 bit systems)
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MHRM}
 PLIST_FILES+=	bin/splat-hd
+PLIST_FILES+=	bin/srtm2sdf-hd
 .endif
 
 do-build:
@@ -70,9 +75,11 @@ do-build:
 	@${ECHO_CMD}	"#define MAXPAGES 16"	>> ${WRKSRC}/splat.h
 .endif
 	cd ${WRKSRC} && \
-		${CXX} ${CXXFLAGS} -lm -lbz2 -o splat itwom3.0.cpp splat.cpp
+		${CXX} ${CXXFLAGS} -fPIC -lm -lbz2 -o splat itwom3.0.cpp splat.cpp
 
 .if ${PORT_OPTIONS:MHRM}
+	@${ECHO_CMD}	"Building HD"
+	@${RM}		${WRKSRC}/splat.h
 	@${ECHO_CMD}	"#define HD_MODE	 1"	> ${WRKSRC}/splat.h
 .if ${PORT_OPTIONS:MHRM_1X1}
 	@${ECHO_CMD}	"#define MAXPAGES 1"	>> ${WRKSRC}/splat.h
@@ -92,9 +99,15 @@ do-build:
 .if ${PORT_OPTIONS:MHRM_6X6}
 	@${ECHO_CMD}	"#define MAXPAGES 36"	>> ${WRKSRC}/splat.h
 .endif
-	cd ${WRKSRC} && \
-		${CXX} ${CXXFLAGS} -fPIC -lm -lbz2 -o splat-hd itwom3.0.cpp splat.cpp
+.if ${PORT_OPTIONS:MHRM_7X7}
+	@${ECHO_CMD}    "#define MAXPAGES 49"   >> ${WRKSRC}/splat.h
+.endif
+.if ${PORT_OPTIONS:MHRM_8X8}
+	@${ECHO_CMD}    "#define MAXPAGES 64"   >> ${WRKSRC}/splat.h
+.endif
 
+	cd ${WRKSRC} && \
+		${CXX} ${CXXFLAGS} -mcmodel=medium -lm -lbz2 -o splat-hd itwom3.0.cpp splat.cpp
 .endif
 	cd ${WRKSRC}/utils && \
 		${CC} ${CFLAGS} -o citydecoder citydecoder.c && \
@@ -106,17 +119,17 @@ do-build:
 do-install:
 .for f in splat utils/citydecoder utils/usgs2sdf utils/srtm2sdf \
 	utils/fontdata utils/bearing
-	@${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/${f} ${STAGEDIR}${PREFIX}/bin
 .endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/utils/postdownload ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/docs/english/man/splat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+.for f in ${PORTDOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
+.endfor
 .if ${PORT_OPTIONS:MHRM}
-	@${INSTALL_PROGRAM} ${WRKSRC}/splat-hd ${STAGEDIR}${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/splat-hd ${STAGEDIR}${PREFIX}/bin
+	${LN} -s srtm2sdf ${STAGEDIR}${PREFIX}/bin/srtm2sdf-hd
 .endif
-	@${INSTALL_SCRIPT} ${WRKSRC}/utils/postdownload ${STAGEDIR}${PREFIX}/bin
-	@${INSTALL_MAN} ${WRKSRC}/docs/english/man/splat.1 ${STAGEDIR}${MAN1PREFIX}/man/man1
-	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.  for f in ${PORTDOCS}
-	@${INSTALL_DATA} ${WRKSRC}/${f} ${STAGEDIR}${DOCSDIR}
-.  endfor
 
-	@${LN} -s srtm2sdf ${STAGEDIR}${PREFIX}/bin/srtm2sdf-hd
 .include <bsd.port.mk>

Modified: head/comms/splat/pkg-plist
==============================================================================
--- head/comms/splat/pkg-plist	Sat Jan 26 22:15:05 2019	(r491316)
+++ head/comms/splat/pkg-plist	Sat Jan 26 23:47:39 2019	(r491317)
@@ -2,7 +2,6 @@ bin/splat
 bin/citydecoder
 bin/usgs2sdf
 bin/srtm2sdf
-bin/srtm2sdf-hd
 bin/fontdata
 bin/bearing
 bin/postdownload