Index: head/graphics/gpsmanshp/Makefile =================================================================== --- head/graphics/gpsmanshp/Makefile (revision 385717) +++ head/graphics/gpsmanshp/Makefile (revision 385718) @@ -1,30 +1,29 @@ # Created by: John Hay # $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@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 Index: head/graphics/gpsmanshp/distinfo =================================================================== --- head/graphics/gpsmanshp/distinfo (revision 385717) +++ head/graphics/gpsmanshp/distinfo (revision 385718) @@ -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 Index: head/graphics/gpsmanshp/files/patch-gpsmanshp.c =================================================================== --- head/graphics/gpsmanshp/files/patch-gpsmanshp.c (revision 385717) +++ head/graphics/gpsmanshp/files/patch-gpsmanshp.c (nonexistent) @@ -1,11 +0,0 @@ ---- gpsmanshp.c.org Mon Jan 26 14:10:32 2004 -+++ gpsmanshp.c Wed Jul 7 20:53:40 2004 -@@ -65,7 +65,7 @@ - - #include - #include --#include -+#include - #include - - #define VERSION "1.1" Property changes on: head/graphics/gpsmanshp/files/patch-gpsmanshp.c ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/graphics/gpsmanshp/files/patch-Makefile =================================================================== --- head/graphics/gpsmanshp/files/patch-Makefile (revision 385717) +++ head/graphics/gpsmanshp/files/patch-Makefile (revision 385718) @@ -1,38 +1,35 @@ ---- Makefile.orig Fri Jul 9 11:05:39 2004 -+++ Makefile Fri Jul 9 11:18:01 2004 -@@ -25,11 +25,15 @@ - VERSION = 1.2 +--- Makefile.orig 2013-10-06 18:44:14 UTC ++++ Makefile +@@ -24,12 +24,16 @@ - TCLVERSION = 8.4 -+TCLLVERSION = 84 + 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 - -mkdir $(INSTALLDIR) - cp gpsmanshp.so pkgIndex.tcl $(INSTALLDIR) + -mkdir -p $(INSTALLDIR) + $(BSD_INSTALL_LIB) gpsmanshp.so $(INSTALLDIR)/ + $(BSD_INSTALL_SCRIPT) pkgIndex.tcl $(INSTALLDIR)/ clean: rm -f gpsmanshp.o gpsmanshp.so pkgIndex.tcl G*.aux G*.log Index: head/graphics/gpsmanshp/pkg-descr =================================================================== --- head/graphics/gpsmanshp/pkg-descr (revision 385717) +++ head/graphics/gpsmanshp/pkg-descr (revision 385718) @@ -1,6 +1,6 @@ A Tcl Package to Read and Write Shapefiles 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/ Index: head/graphics/gpsmanshp/pkg-plist =================================================================== --- head/graphics/gpsmanshp/pkg-plist (revision 385717) +++ head/graphics/gpsmanshp/pkg-plist (revision 385718) @@ -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