Attachment 155273 Details for Bug 199235 – graphics_gpsmanshp.diff

[patch] graphics_gpsmanshp.diff

graphics_gpsmanshp.diff (text/plain), 5.36 KB, created by tkato432 on 2015-04-06 18:49:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: tkato432

Created: 2015-04-06 18:49:35 UTC

Size: 5.36 KB

patch

obsolete

>diff -urN /usr/ports/graphics/gpsmanshp/Makefile graphics/gpsmanshp/Makefile
>--- /usr/ports/graphics/gpsmanshp/Makefile	2015-04-06 05:21:04.439827000 +0900
>+++ graphics/gpsmanshp/Makefile	2015-04-07 00:00:00.000000000 +0900
>@@ -2,29 +2,30 @@
> # $FreeBSD: head/graphics/gpsmanshp/Makefile 383293 2015-04-05 14:01:51Z antoine $
> 
> 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}"
>+
>+PORTDOCS=	*
>+PLIST_FILES=	${TCL_LIBDIR:S,${PREFIX}/,,}/gpsmanshp-${PORTVERSION}/gpsmanshp.so \
>+		${TCL_LIBDIR:S,${PREFIX}/,,}/gpsmanshp-${PORTVERSION}/pkgIndex.tcl
> 
> OPTIONS_DEFINE=	DOCS
> 
> post-install:
>-	${MKDIR} ${STAGEDIR}${DOCSDIR}
>-	${INSTALL_MAN} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
>+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
>+	(cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${STAGEDIR}${DOCSDIR})
> 
> .include <bsd.port.mk>
>diff -urN /usr/ports/graphics/gpsmanshp/distinfo graphics/gpsmanshp/distinfo
>--- /usr/ports/graphics/gpsmanshp/distinfo	2014-06-21 17:44:58.000000000 +0900
>+++ graphics/gpsmanshp/distinfo	2015-04-07 00:00:00.000000000 +0900
>@@ -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
>diff -urN /usr/ports/graphics/gpsmanshp/files/patch-Makefile graphics/gpsmanshp/files/patch-Makefile
>--- /usr/ports/graphics/gpsmanshp/files/patch-Makefile	2014-09-06 22:49:45.000000000 +0900
>+++ graphics/gpsmanshp/files/patch-Makefile	2015-04-07 00:00:00.000000000 +0900
>@@ -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
>+@@ -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 @@
>  	chmod 644 gpsmanshp.so pkgIndex.tcl
>  
>  install: pkgIndex.tcl
>diff -urN /usr/ports/graphics/gpsmanshp/files/patch-gpsmanshp.c graphics/gpsmanshp/files/patch-gpsmanshp.c
>--- /usr/ports/graphics/gpsmanshp/files/patch-gpsmanshp.c	2014-06-21 17:44:58.000000000 +0900
>+++ graphics/gpsmanshp/files/patch-gpsmanshp.c	1970-01-01 09:00:00.000000000 +0900
>@@ -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 <stdlib.h>
>- #include <string.h>
>--#include <libshp/shapefil.h>
>-+#include <shapefil.h>
>- #include <tcl.h>
>- 
>- #define VERSION "1.1"
>diff -urN /usr/ports/graphics/gpsmanshp/pkg-descr graphics/gpsmanshp/pkg-descr
>--- /usr/ports/graphics/gpsmanshp/pkg-descr	2014-06-21 17:44:58.000000000 +0900
>+++ graphics/gpsmanshp/pkg-descr	2015-04-07 00:00:00.000000000 +0900
>@@ -3,4 +3,4 @@
> 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/
>diff -urN /usr/ports/graphics/gpsmanshp/pkg-plist graphics/gpsmanshp/pkg-plist
>--- /usr/ports/graphics/gpsmanshp/pkg-plist	2014-10-21 02:13:02.000000000 +0900
>+++ graphics/gpsmanshp/pkg-plist	1970-01-01 09:00:00.000000000 +0900
>@@ -1,17 +0,0 @@
>-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

Actions: View | Diff

Attachments on bug 199235: 155273