svn commit: r385718 - in head/graphics/gpsmanshp: . files

[Jan Beich]

Author: jbeich
Date: Fri May  8 00:34:49 2015
New Revision: 385718
URL: https://svnweb.freebsd.org/changeset/ports/385718

Log:
  graphics/gpsmanshp: update to 1.2.3
  
  - Chase new home
  - Define LICENSE
  - Convert to USES=tcl
  - Convert to USES=tar
  - Convert to COPYTREE_SHARE
  
  Changes:	http://gpsmanshp.sourceforge.net/GPSManSHP_3.html
  PR:		199235
  Submitted by:	tkato432 at yahoo.com

Deleted:
  head/graphics/gpsmanshp/files/patch-gpsmanshp.c
Modified:
  head/graphics/gpsmanshp/Makefile   (contents, props changed)
  head/graphics/gpsmanshp/distinfo   (contents, props changed)
  head/graphics/gpsmanshp/files/patch-Makefile   (contents, props changed)
  head/graphics/gpsmanshp/pkg-descr   (contents, props changed)
  head/graphics/gpsmanshp/pkg-plist   (contents, props changed)

Modified: head/graphics/gpsmanshp/Makefile
==============================================================================
--- head/graphics/gpsmanshp/Makefile	Fri May  8 00:07:13 2015	(r385717)
+++ head/graphics/gpsmanshp/Makefile	Fri May  8 00:34:49 2015	(r385718)
@@ -2,29 +2,28 @@
 # $FreeBSD$
 
 PORTNAME=	gpsmanshp
-PORTVERSION=	1.2
-PORTREVISION=	2
+PORTVERSION=	1.2.3
 CATEGORIES=	graphics tcl geography
-MASTER_SITES=	http://www.ncc.up.pt/gpsmanshp/
+MASTER_SITES=	SF/${PORTNAME}/distr
 DISTNAME=	${PORTNAME}_${PORTVERSION}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	Shapelib support for gpsman
 
-BROKEN=		No public distfiles
+LICENSE=	GPLv3 # (or later)
 
+LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib
 RUN_DEPENDS=	gpsman:${PORTSDIR}/astro/gpsman
-LIB_DEPENDS=	libshp.so:${PORTSDIR}/devel/shapelib \
-		libtcl${TCLVERSION:S/.//}.so:${PORTSDIR}/lang/tcl${TCLVERSION:S/.//}
 
-TCLVERSION?=	8.4
-PLIST_SUB=	TCLVERSION=${TCLVERSION} PORTVERSION=${PORTVERSION}
+USES=		tar:tgz tcl
+MAKE_ENV=	TCLVERSION="${TCL_VER}"
+PLIST_SUB=	TCLVERSION="${TCL_VER}" PORTVERSION="${PORTVERSION}"
 
 OPTIONS_DEFINE=	DOCS
 
 post-install:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_MAN} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
+	(cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \
+		. ${STAGEDIR}${DOCSDIR} \
+		"! -name gpl-3_0.txt")
 
 .include <bsd.port.mk>

Modified: head/graphics/gpsmanshp/distinfo
==============================================================================
--- head/graphics/gpsmanshp/distinfo	Fri May  8 00:07:13 2015	(r385717)
+++ head/graphics/gpsmanshp/distinfo	Fri May  8 00:34:49 2015	(r385718)
@@ -1,2 +1,2 @@
-SHA256 (gpsmanshp_1.2.tgz) = f216332c8d42f7c6d6f3a3111835e55793e5fc562036299dd8c4ace406f30cd3
-SIZE (gpsmanshp_1.2.tgz) = 104092
+SHA256 (gpsmanshp_1.2.3.tgz) = 2803524aa8f87db6ff1eaec93cef9619c944c9aa00149e554be11f6e2f1cafd2
+SIZE (gpsmanshp_1.2.3.tgz) = 150070

Modified: head/graphics/gpsmanshp/files/patch-Makefile
==============================================================================
--- head/graphics/gpsmanshp/files/patch-Makefile	Fri May  8 00:07:13 2015	(r385717)
+++ head/graphics/gpsmanshp/files/patch-Makefile	Fri May  8 00:34:49 2015	(r385718)
@@ -1,30 +1,27 @@
---- Makefile.orig	Fri Jul  9 11:05:39 2004
-+++ Makefile	Fri Jul  9 11:18:01 2004
-@@ -25,11 +25,15 @@
- VERSION = 1.2
- 
- TCLVERSION = 8.4
-+TCLLVERSION = 84
+--- Makefile.orig	2013-10-06 18:44:14 UTC
++++ Makefile
+@@ -24,12 +24,16 @@
+ 
+ VERSION = 1.2.3
+ 
+-TCLVERSION = 8.4
++TCLVERSION ?= 8.4
++TCLLVERSION = $(TCLVERSION:S/.//)
  
 -INSTALLDIR = /usr/lib/tcl$(TCLVERSION)
 +INSTALLDIR = ${DESTDIR}${PREFIX}/lib/tcl$(TCLVERSION)/gpsmanshp-$(VERSION)
  
 -CFLAGS = -Wall -fPIC -c -I/usr/include/tcl$(TCLVERSION)
 -LINKOPT = -lshp -ltcl$(TCLVERSION)
-+CFLAGS += -Wall -fPIC -c -I${PREFIX}/include/tcl$(TCLVERSION)
-+CFLAGS += -I${PREFIX}/include
-+LINKOPT = -L${PREFIX}/lib -lshp -ltcl$(TCLLVERSION)
++CFLAGS += -Wall -fPIC -c -I${LOCALBASE}/include/tcl$(TCLVERSION)
++CFLAGS += -I${LOCALBASE}/include
++LINKOPT = -L${LOCALBASE}/lib -lshp -ltcl$(TCLLVERSION)
 +
 +all:	pkgIndex.tcl
  
  gpsmanshp.so: gpsmanshp.o
  	$(CC) -shared -o gpsmanshp.so $(LINKOPT) gpsmanshp.o
-@@ -38,12 +42,13 @@
- 	$(CC) $(CFLAGS) gpsmanshp.c
- 
- pkgIndex.tcl: gpsmanshp.so
--	echo "source package-8.3.tcl ; pkg_mkIndex -lazy -verbose . gpsmanshp.so" | tclsh$(TCLVERSION)
-+	echo "pkg_mkIndex -lazy -verbose . gpsmanshp.so" | tclsh$(TCLVERSION)
+@@ -42,8 +46,9 @@ pkgIndex.tcl: gpsmanshp.so
  	chmod 644 gpsmanshp.so pkgIndex.tcl
  
  install: pkgIndex.tcl

Modified: head/graphics/gpsmanshp/pkg-descr
==============================================================================
--- head/graphics/gpsmanshp/pkg-descr	Fri May  8 00:07:13 2015	(r385717)
+++ head/graphics/gpsmanshp/pkg-descr	Fri May  8 00:34:49 2015	(r385718)
@@ -3,4 +3,4 @@ A Tcl Package to Read and Write Shapefil
 Gpsmanshp was developed for use in GPSMan, a manager of GPS receiver
 data. It is written in C and is based on shapelib.
 
-WWW: http://www.ncc.up.pt/gpsmanshp/
+WWW: http://gpsmanshp.sourceforge.net/

Modified: head/graphics/gpsmanshp/pkg-plist
==============================================================================
--- head/graphics/gpsmanshp/pkg-plist	Fri May  8 00:07:13 2015	(r385717)
+++ head/graphics/gpsmanshp/pkg-plist	Fri May  8 00:34:49 2015	(r385718)
@@ -1,17 +1,3 @@
 lib/tcl%%TCLVERSION%%/gpsmanshp-%%PORTVERSION%%/gpsmanshp.so
 lib/tcl%%TCLVERSION%%/gpsmanshp-%%PORTVERSION%%/pkgIndex.tcl
-%%PORTDOCS%%%%DOCSDIR%%/GPL.txt
-%%PORTDOCS%%%%DOCSDIR%%/GPSManSHP.html
 %%PORTDOCS%%%%DOCSDIR%%/GPSManSHP.pdf
-%%PORTDOCS%%%%DOCSDIR%%/GPSManSHP_1.html
-%%PORTDOCS%%%%DOCSDIR%%/GPSManSHP_2.html
-%%PORTDOCS%%%%DOCSDIR%%/GPSManSHP_3.html
-%%PORTDOCS%%%%DOCSDIR%%/GPSManSHP_4.html
-%%PORTDOCS%%%%DOCSDIR%%/backgr.gif
-%%PORTDOCS%%%%DOCSDIR%%/blank.gif
-%%PORTDOCS%%%%DOCSDIR%%/gpsman-logo-small.gif
-%%PORTDOCS%%%%DOCSDIR%%/newarr.gif
-%%PORTDOCS%%%%DOCSDIR%%/newearr.gif
-%%PORTDOCS%%%%DOCSDIR%%/next.gif
-%%PORTDOCS%%%%DOCSDIR%%/previous.gif
-%%PORTDOCS%%%%DOCSDIR%%/up.gif