Attachment #105691 for bug #146200

View | Details | Raw Unified | Return to bug 146200
Collapse All | Expand All





PORTNAME=	shapelib
PORTVERSION=	1.3.0
PORTREVISION=	3
CATEGORIES=	devel geography
MASTER_SITES=	http://download.osgeo.org/shapelib/ \
		ftp://ftp.remotesensing.org/shapelib/ \
		http://sunpoet.net/distfiles/
DISTNAME=	${PORTNAME}-${SHAPELIB_VER}

MAINTAINER=	sunpoet@sunpoet.net
COMMENT=	C API for reading and writing ArcView Shapefiles

MAKE_JOBS_UNSAFE=	yes
USE_AUTOTOOLS=	libtool:22:env
USE_LDCONFIG=	yes
WRKSRC=		${WRKDIR}/${PORTNAME}-${SHAPELIB_VER}
MAKE_JOBS_UNSAFE=	yes

OPTIONS=	DEBUG "Debugging" off \
		PROJ4 "Cartographic Projections library" off

SHAPELIB_VER=	${PORTVERSION}b2

.include <bsd.port.pre.mk>

.if defined(WITH_DEBUG)
DEBUG=		-DDEBUG -DDEBUG2 -g
PLIST_SUB+=	PROJ4=""
PROJ4=		-DPROJ4
.else
DEBUG=
PROJ4=		-DNO_PROJ4
.endif

.if ${ARCH} == "amd64" || ${ARCH} == "i386" || ${ARCH} == "ia64"

ENDIAN=		-D_BIG_ENDIAN
.endif

.if defined(WITH_PROJ4)
LIB_DEPENDS+=	proj:${PORTSDIR}/graphics/proj
PLIST_SUB+=	PROJ4=""
PROJ4=		-DPROJ4
.else
PLIST_SUB+=	PROJ4="@comment "
PROJ4=		-DNO_PROJ4
.endif

post-patch:
	@${REINPLACE_CMD} \
		-e 's#%%DEBUG%%#${DEBUG}#g' \
		-e 's#%%INSTALL%%#${INSTALL}#g' \
		-e 's#%%INSTALL_PROGRAM%%#${INSTALL_PROGRAM}#g' \
		-e 's#%%LIBTOOL%%#${LIBTOOL}#g' \
		-e 's#%%PREFIX%%#${PREFIX}#g' \
		-e 's#%%ENDIAN%%#${ENDIAN}#g' \

Lines 1-3 Link Here

(-)/usr/ports/sunpoet/shapelib/distinfo (-3 / +3 lines)
1	MD5 (shapelib-1.3.0b1.tar.gz) = b8da228374611880ab52179b70c72f16	1	MD5 (shapelib-1.3.0b2.tar.gz) = 708ea578bc299dcd9f723569d12bee8d
2	SHA256 (shapelib-1.3.0b1.tar.gz) = 43ee1c4df76e9fb5c0bbebd3def7b6c02151547a5c447ee044419505bdf07d60	2	SHA256 (shapelib-1.3.0b2.tar.gz) = a3c6975730039668f5e89320ddfccbe0659dd31ff8f4cddd93f1cb8bb2541387
3	SIZE (shapelib-1.3.0b1.tar.gz) = 182144	3	SIZE (shapelib-1.3.0b2.tar.gz) = 182558




--- contrib/Makefile.orig	2010-01-04 12:08:02.000000000 +0800
+++ contrib/Makefile	2010-05-01 05:26:53.000000000 +0800
@@ -3,19 +3,36 @@
 #CFLAGS	=	-g
 
 # Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
-ENDIAN	=	-D_LITTLE_ENDIAN
+#ENDIAN	=	-D_LITTLE_ENDIAN
 
-CFLAGS	=	-g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 
+CFLAGS	+=	%%DEBUG%% %%ENDIAN%% %%PROJ4%% -I.. -I%%PREFIX%%/include -L%%PREFIX%%/lib
 
 SHPOBJ	=	../shpopen.o ../dbfopen.o ../safileio.o
+SHPOBJ	=	../shpopen.o ../dbfopen.o ../safileio.o
 
 SHPGOBJ =	../shpopen.o ../dbfopen.o ../safileio.o shpgeo.o
+SHPGOBJ =	../shpopen.o ../dbfopen.o ../safileio.o shpgeo.o
 
-GEOOBJ	=	./shpgeo.o -lm -L$(HOME)/bld/lib -lproj
+GEOOBJ	=	./shpgeo.o -lm -lproj
 
 default:	all
 
-all:	shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
+#all:	shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
+
+ALLPROG=	dbfcat dbfinfo shpcat shpdxf shpfix Shape_PointInPoly
+ALLPROJ=	shpcentrd shpdata shpinfo shpproj shpwkb shpsort
+
+.if defined(PROJ4)
+all:		$(ALLPROG) $(ALLPROJ)
+install:	allprog_install allproj_install
+.else
+all:		$(ALLPROG)
+install:	allprog_install
+.endif
+
+ALLPROG=	dbfcat dbfinfo shpcat shpdxf shpfix Shape_PointInPoly
+ALLPROJ=	shpcentrd shpdata shpinfo shpproj shpwkb shpsort
+
+allprog:	$(ALLPROG)
+
+allprog_install:	$(ALLPROG)
+	%%INSTALL_PROGRAM%% $(ALLPROG) %%PREFIX%%/bin/
+	%%INSTALL%% -c -m 755 ${_ALLPROG} %%PREFIX%%/bin/${_ALLPROG}
+.endfor
+
+allproj:	$(ALLPROJ)
+
+allproj_install:	$(ALLPROJ)
+	%%INSTALL_PROGRAM%% $(ALLPROJ) %%PREFIX%%/bin/
+	%%INSTALL%% -c -m 755 ${_ALLPROJ} %%PREFIX%%/bin/${_ALLPROJ}
+.endfor
 
 clean:  
 	rm -f shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfcat dbfinfo shpinfo shpfix shpcat *.o

Lines 1-6 Link Here

(-)/usr/ports/sunpoet/shapelib/files/patch-shapefil.h (-3 / +3 lines)
1	--- shapefil.h.orig 2008-11-12 22:28:15.000000000 +0800	1	--- shapefil.h.orig 2010-01-28 19:34:34.000000000 +0800
2	+++ shapefil.h 2009-09-05 05:33:07.000000000 +0800	2	+++ shapefil.h 2010-05-01 05:04:28.000000000 +0800
3	@@ -123,6 +123,8 @@	3	@@ -126,6 +126,8 @@
4	*/	4	*/
5		5
6	#include <stdio.h>	6	#include <stdio.h>

Lines 1-18 Link Here

(-)/usr/ports/sunpoet/shapelib/pkg-plist (-9 / +9 lines)
1	bin/shpcreate
2	bin/shpadd
3	bin/shpdump
4	bin/shprewind
5	bin/dbfcreate
6	bin/dbfadd	1	bin/dbfadd
7	bin/dbfdump
8	bin/shptest
9	bin/shputils
10	bin/shptreedump
11	bin/dbfcat	2	bin/dbfcat
		3	bin/dbfcreate
		4	bin/dbfdump
12	bin/dbfinfo	5	bin/dbfinfo
		6	bin/shpadd
13	bin/shpcat	7	bin/shpcat
		8	bin/shpcreate
		9	bin/shpdump
14	bin/shpdxf	10	bin/shpdxf
15	bin/shpfix	11	bin/shpfix
		12	bin/shprewind
		13	bin/shptest
		14	bin/shptreedump
		15	bin/shputils
16	bin/Shape_PointInPoly	16	bin/Shape_PointInPoly
17	%%PROJ4%%bin/shpcentrd	17	%%PROJ4%%bin/shpcentrd
18	%%PROJ4%%bin/shpdata	18	%%PROJ4%%bin/shpdata

Return to bug 146200

Lines 7-39 Link Here

(-)/usr/ports/sunpoet/shapelib/Makefile (-11 / +21 lines)
7		7
8	PORTNAME= shapelib	8	PORTNAME= shapelib
9	PORTVERSION= 1.3.0	9	PORTVERSION= 1.3.0
10	PORTREVISION= 2	10	PORTREVISION= 3
11	CATEGORIES= devel	11	CATEGORIES= devel geography
12	MASTER_SITES= http://download.osgeo.org/shapelib/ \	12	MASTER_SITES= http://download.osgeo.org/shapelib/ \
		13	ftp://ftp.remotesensing.org/shapelib/ \
13	http://sunpoet.net/distfiles/	14	http://sunpoet.net/distfiles/
14	DISTNAME= ${PORTNAME}-${SHAPELIB_VER}	15	DISTNAME= ${PORTNAME}-${SHAPELIB_VER}
15		16
16	MAINTAINER= sunpoet@sunpoet.net	17	MAINTAINER= sunpoet@sunpoet.net
17	COMMENT= C API for reading and writing ArcView Shapefiles	18	COMMENT= C API for reading and writing ArcView Shapefiles
18		19
		20	MAKE_JOBS_UNSAFE= yes
19	USE_AUTOTOOLS= libtool:22:env	21	USE_AUTOTOOLS= libtool:22:env
20	USE_LDCONFIG= yes	22	USE_LDCONFIG= yes
21	WRKSRC= ${WRKDIR}/${PORTNAME}-${SHAPELIB_VER}	23	WRKSRC= ${WRKDIR}/${PORTNAME}-${SHAPELIB_VER}
22	MAKE_JOBS_UNSAFE= yes
23		24
24	OPTIONS= PROJ4 "Cartographic Projections library" off	25	OPTIONS= DEBUG "Debugging" off \
		26	PROJ4 "Cartographic Projections library" off
25		27
26	SHAPELIB_VER= ${PORTVERSION}b1	28	SHAPELIB_VER= ${PORTVERSION}b2
27		29
28	.include <bsd.port.pre.mk>	30	.include <bsd.port.pre.mk>
29		31
30	.if defined(WITH_PROJ4)	32	.if defined(WITH_DEBUG)
31	LIB_DEPENDS+= proj.6:${PORTSDIR}/graphics/proj	33	DEBUG= -DDEBUG -DDEBUG2 -g
32	PLIST_SUB+= PROJ4=""
33	PROJ4= -DPROJ4
34	.else	34	.else
35	PLIST_SUB+= PROJ4="@comment "	35	DEBUG=
36	PROJ4= -DNO_PROJ4
37	.endif	36	.endif
38		37
39	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386" \|\| ${ARCH} == "ia64"	38	.if ${ARCH} == "amd64" \|\| ${ARCH} == "i386" \|\| ${ARCH} == "ia64"
Lines 42-50 Link Here
42	ENDIAN= -D_BIG_ENDIAN	41	ENDIAN= -D_BIG_ENDIAN
43	.endif	42	.endif
44		43
		44	.if defined(WITH_PROJ4)
		45	LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj
		46	PLIST_SUB+= PROJ4=""
		47	PROJ4= -DPROJ4
		48	.else
		49	PLIST_SUB+= PROJ4="@comment "
		50	PROJ4= -DNO_PROJ4
		51	.endif
		52
45	post-patch:	53	post-patch:
46	@${REINPLACE_CMD} \	54	@${REINPLACE_CMD} \
		55	-e 's#%%DEBUG%%#${DEBUG}#g' \
47	-e 's#%%INSTALL%%#${INSTALL}#g' \	56	-e 's#%%INSTALL%%#${INSTALL}#g' \
		57	-e 's#%%INSTALL_PROGRAM%%#${INSTALL_PROGRAM}#g' \
48	-e 's#%%LIBTOOL%%#${LIBTOOL}#g' \	58	-e 's#%%LIBTOOL%%#${LIBTOOL}#g' \
49	-e 's#%%PREFIX%%#${PREFIX}#g' \	59	-e 's#%%PREFIX%%#${PREFIX}#g' \
50	-e 's#%%ENDIAN%%#${ENDIAN}#g' \	60	-e 's#%%ENDIAN%%#${ENDIAN}#g' \

Lines 1-52 Link Here

(-)/usr/ports/sunpoet/shapelib/files/patch-contrib-Makefile (-25 / +16 lines)
1	--- contrib/Makefile.orig 2004-06-24 08:55:52.000000000 +0800	1	--- contrib/Makefile.orig 2010-01-04 12:08:02.000000000 +0800
2	+++ contrib/Makefile 2009-09-06 05:35:24.000000000 +0800	2	+++ contrib/Makefile 2010-05-01 05:26:53.000000000 +0800
3	@@ -3,19 +3,44 @@	3	@@ -3,19 +3,36 @@
4	#CFLAGS = -g	4	#CFLAGS = -g
5		5
6	# Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN	6	# Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN
7	-ENDIAN = -D_LITTLE_ENDIAN	7	-ENDIAN = -D_LITTLE_ENDIAN
8	+#ENDIAN = -D_LITTLE_ENDIAN	8	+#ENDIAN = -D_LITTLE_ENDIAN
9		9
10	-CFLAGS = -g -I.. -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2	10	-CFLAGS = -g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2
11	+CFLAGS += -g -I.. -DDEBUG -DDEBUG2 %%ENDIAN%% %%PROJ4%% -I%%PREFIX%%/include -L%%PREFIX%%/lib	11	+CFLAGS += %%DEBUG%% %%ENDIAN%% %%PROJ4%% -I.. -I%%PREFIX%%/include -L%%PREFIX%%/lib
12		12
13	-SHPOBJ = ../shpopen.o ../dbfopen.o	13	SHPOBJ = ../shpopen.o ../dbfopen.o ../safileio.o
14	+SHPOBJ = ../shpopen.o ../dbfopen.o ../safileio.o
15		14
16	-SHPGOBJ = ../shpopen.o ../dbfopen.o shpgeo.o	15	SHPGOBJ = ../shpopen.o ../dbfopen.o ../safileio.o shpgeo.o
17	+SHPGOBJ = ../shpopen.o ../dbfopen.o ../safileio.o shpgeo.o
18		16
19	GEOOBJ = ./shpgeo.o -lm -lproj	17	-GEOOBJ = ./shpgeo.o -lm -L$(HOME)/bld/lib -lproj
		18	+GEOOBJ = ./shpgeo.o -lm -lproj
20		19
21	default: all	20	default: all
22		21
23	-all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort	22	-all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
24	+#all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort	23	+#all: shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfinfo dbfcat shpinfo shpfix shpcat Shape_PointInPoly shpsort
25	+	24	+
		25	+ALLPROG= dbfcat dbfinfo shpcat shpdxf shpfix Shape_PointInPoly
		26	+ALLPROJ= shpcentrd shpdata shpinfo shpproj shpwkb shpsort
		27	+
26	+.if defined(PROJ4)	28	+.if defined(PROJ4)
27	+all: allprog allproj	29	+all: $(ALLPROG) $(ALLPROJ)
28	+install: allprog_install allproj_install	30	+install: allprog_install allproj_install
29	+.else	31	+.else
30	+all: allprog	32	+all: $(ALLPROG)
31	+install: allprog_install	33	+install: allprog_install
32	+.endif	34	+.endif
33	+	35	+
34	+ALLPROG= dbfcat dbfinfo shpcat shpdxf shpfix Shape_PointInPoly
35	+ALLPROJ= shpcentrd shpdata shpinfo shpproj shpwkb shpsort
36	+
37	+allprog: $(ALLPROG)
38	+
39	+allprog_install: $(ALLPROG)	36	+allprog_install: $(ALLPROG)
40	+.for _ALLPROG in $(ALLPROG)	37	+ %%INSTALL_PROGRAM%% $(ALLPROG) %%PREFIX%%/bin/
41	+ %%INSTALL%% -c -m 755 ${_ALLPROG} %%PREFIX%%/bin/${_ALLPROG}
42	+.endfor
43	+
44	+allproj: $(ALLPROJ)
45	+	38	+
46	+allproj_install: $(ALLPROJ)	39	+allproj_install: $(ALLPROJ)
47	+.for _ALLPROJ in $(ALLPROJ)	40	+ %%INSTALL_PROGRAM%% $(ALLPROJ) %%PREFIX%%/bin/
48	+ %%INSTALL%% -c -m 755 ${_ALLPROJ} %%PREFIX%%/bin/${_ALLPROJ}
49	+.endfor
50		41
51	clean:	42	clean:
52	rm -f shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfcat dbfinfo shpinfo shpfix shpcat *.o	43	rm -f shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfcat dbfinfo shpinfo shpfix shpcat *.o