sync/ports
1
0
Fork 0
mirror of https://git.freebsd.org/ports.git synced 2025-07-18 01:39:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Change OPTIONS: PROJ4 -> PROJ

Browse source
This commit is contained in:
Sunpoet Po-Chuan Hsieh 2011-08-16 08:07:40 +00:00
parent b1db61c735
commit b3394ff195
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=279799
4 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
devel/shapelib/Makefile
View file

@ -23,7 +23,7 @@ USE_LDCONFIG= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${SHAPELIB_VER} WRKSRC= ${WRKDIR}/${PORTNAME}-${SHAPELIB_VER}
OPTIONS= DEBUG "Debugging" off \ OPTIONS= DEBUG "Debugging" off \
PROJ4 "Cartographic Projections library" off PROJ "Cartographic Projections library" off
SHAPELIB_VER= ${PORTVERSION}b2 SHAPELIB_VER= ${PORTVERSION}b2
@ -41,13 +41,13 @@ ENDIAN= -D_LITTLE_ENDIAN
ENDIAN= -D_BIG_ENDIAN ENDIAN= -D_BIG_ENDIAN
.endif .endif
.if defined(WITH_PROJ4) .if defined(WITH_PROJ)
LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj
PLIST_SUB+= PROJ4="" PLIST_SUB+= PROJ=""
PROJ4= -DPROJ4 PROJ= -DPROJ4
.else .else
PLIST_SUB+= PROJ4="@comment " PLIST_SUB+= PROJ="@comment "
PROJ4= -DNO_PROJ4 PROJ= -DNO_PROJ4
.endif .endif
post-patch: post-patch:
@ -58,7 +58,7 @@ post-patch:
-e 's#%%LIBTOOL%%#${LIBTOOL}#g' \ -e 's#%%LIBTOOL%%#${LIBTOOL}#g' \
-e 's#%%PREFIX%%#${PREFIX}#g' \ -e 's#%%PREFIX%%#${PREFIX}#g' \
-e 's#%%ENDIAN%%#${ENDIAN}#g' \ -e 's#%%ENDIAN%%#${ENDIAN}#g' \
-e 's#%%PROJ4%%#${PROJ4}#g' \ -e 's#%%PROJ%%#${PROJ}#g' \
${WRKSRC}/Makefile ${WRKSRC}/contrib/Makefile ${WRKSRC}/Makefile ${WRKSRC}/contrib/Makefile
post-install: post-install:

4
devel/shapelib/files/patch-Makefile
View file

@ -34,7 +34,7 @@
+.endfor +.endfor
+ +
+contrib_tools: +contrib_tools:
+ (cd contrib; ${MAKE} %%PROJ4%% all; cd ..) + (cd contrib; ${MAKE} %%PROJ%% all; cd ..)
+ +
+tools_install: +tools_install:
+.for _TOOL in ${TOOLS} +.for _TOOL in ${TOOLS}
@ -42,7 +42,7 @@
+.endfor +.endfor
+ +
+contrib_install: +contrib_install:
+ (cd contrib; ${MAKE} %%PROJ4%% install; cd ..) + (cd contrib; ${MAKE} %%PROJ%% install; cd ..)
shpopen.o: shpopen.c shapefil.h shpopen.o: shpopen.c shapefil.h
$(CC) $(CFLAGS) -c shpopen.c $(CC) $(CFLAGS) -c shpopen.c

2
devel/shapelib/files/patch-contrib-Makefile
View file

@ -8,7 +8,7 @@
+#ENDIAN = -D_LITTLE_ENDIAN +#ENDIAN = -D_LITTLE_ENDIAN
-CFLAGS = -g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 -CFLAGS = -g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2
+CFLAGS += %%DEBUG%% %%ENDIAN%% %%PROJ4%% -I.. -I%%PREFIX%%/include -L%%PREFIX%%/lib +CFLAGS += %%DEBUG%% %%ENDIAN%% %%PROJ%% -I.. -I%%PREFIX%%/include -L%%PREFIX%%/lib
SHPOBJ = ../shpopen.o ../dbfopen.o ../safileio.o SHPOBJ = ../shpopen.o ../dbfopen.o ../safileio.o

12
devel/shapelib/pkg-plist
View file

@ -14,12 +14,12 @@ bin/shptest
bin/shptreedump bin/shptreedump
bin/shputils bin/shputils
bin/Shape_PointInPoly bin/Shape_PointInPoly
%%PROJ4%%bin/shpcentrd %%PROJ%%bin/shpcentrd
%%PROJ4%%bin/shpdata %%PROJ%%bin/shpdata
%%PROJ4%%bin/shpinfo %%PROJ%%bin/shpinfo
%%PROJ4%%bin/shpproj %%PROJ%%bin/shpproj
%%PROJ4%%bin/shpsort %%PROJ%%bin/shpsort
%%PROJ4%%bin/shpwkb %%PROJ%%bin/shpwkb
include/shapefil.h include/shapefil.h
lib/libshp.a lib/libshp.a
lib/libshp.la lib/libshp.la