Date: Mon, 14 Oct 2013 11:03:14 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r330291 - in head/devel/shapelib: . files Message-ID: <201310141103.r9EB3EwM039373@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Mon Oct 14 11:03:14 2013 New Revision: 330291 URL: http://svnweb.freebsd.org/changeset/ports/330291 Log: - Support STAGEDIR - Convert to new options helper - Convert to new LIB_DEPENDS format - Remove DEBUG option Modified: head/devel/shapelib/Makefile head/devel/shapelib/files/patch-Makefile (contents, props changed) head/devel/shapelib/files/patch-contrib-Makefile (contents, props changed) Modified: head/devel/shapelib/Makefile ============================================================================== --- head/devel/shapelib/Makefile Mon Oct 14 11:03:09 2013 (r330290) +++ head/devel/shapelib/Makefile Mon Oct 14 11:03:14 2013 (r330291) @@ -14,26 +14,19 @@ COMMENT= C API for reading and writing A LICENSE= LGPL20 +OPTIONS_DEFINE= DOCS PROJ +OPTIONS_SUB= yes + MAKE_JOBS_UNSAFE= yes USE_LDCONFIG= yes -OPTIONS_DEFINE= DEBUG DOCS PROJ +PROJ_LIB_DEPENDS= libproj.so:${PORTSDIR}/graphics/proj -NO_STAGE= yes .include <bsd.port.options.mk> -.if ${PORT_OPTIONS:MDEBUG} -DEBUG= -DDEBUG -DDEBUG2 -g -.else -DEBUG= # empty -.endif - .if ${PORT_OPTIONS:MPROJ} -LIB_DEPENDS+= proj:${PORTSDIR}/graphics/proj -PLIST_SUB+= PROJ="" PROJ= -DPROJ4 .else -PLIST_SUB+= PROJ="@comment " PROJ= -DNO_PROJ4 .endif @@ -48,17 +41,16 @@ ENDIAN= -D_BIG_ENDIAN # mips*eb, powerp post-patch: @${REINPLACE_CMD} \ - -e 's|%%DEBUG%%|${DEBUG}|g' \ -e 's|%%LIBTOOL%%|${LIBTOOL}|g' \ -e 's|%%ENDIAN%%|${ENDIAN}|g' \ -e 's|%%PROJ%%|${PROJ}|g' \ ${WRKSRC}/Makefile ${WRKSRC}/contrib/Makefile post-install: - ${LN} -s libshp.so.1 ${PREFIX}/lib/libshp.so + ${LN} -s libshp.so.1 ${STAGEDIR}${PREFIX}/lib/libshp.so .if ${PORT_OPTIONS:MDOCS} - ${MKDIR} ${DOCSDIR}/ - ${INSTALL_DATA} ${WRKSRC}/web/*.html ${DOCSDIR}/ + ${MKDIR} ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/web/*.html ${STAGEDIR}${DOCSDIR}/ .endif .include <bsd.port.post.mk> Modified: head/devel/shapelib/files/patch-Makefile ============================================================================== --- head/devel/shapelib/files/patch-Makefile Mon Oct 14 11:03:09 2013 (r330290) +++ head/devel/shapelib/files/patch-Makefile Mon Oct 14 11:03:14 2013 (r330291) @@ -1,5 +1,5 @@ ---- Makefile.orig 2011-07-24 14:15:51.000000000 +0800 -+++ Makefile 2011-12-24 03:00:00.000000000 +0800 +--- Makefile.orig 2011-07-24 12:32:26.000000000 +0800 ++++ Makefile 2013-10-13 21:38:40.590435497 +0800 @@ -1,16 +1,19 @@ -PREFIX = /usr/local @@ -36,12 +36,12 @@ lib_install: libshp.a - cp libshp.a $(PREFIX)/lib - cp shapefil.h $(PREFIX)/include -+ $(BSD_INSTALL_DATA) shapefil.h $(PREFIX)/include/ -+ $(BSD_INSTALL_LIB) libshp.a libshp.so.1 $(PREFIX)/lib/ ++ $(BSD_INSTALL_DATA) shapefil.h $(DESTDIR)$(PREFIX)/include/ ++ $(BSD_INSTALL_LIB) libshp.a libshp.so.1 $(DESTDIR)$(PREFIX)/lib/ bin_install: $(SHPBIN) - cp $(SHPBIN) $(PREFIX)/bin -+ $(BSD_INSTALL_PROGRAM) $(SHPBIN) $(PREFIX)/bin/ ++ $(BSD_INSTALL_PROGRAM) $(SHPBIN) $(DESTDIR)$(PREFIX)/bin/ + +contrib_install: + (cd contrib/; ${MAKE} %%PROJ%% install; cd ..) Modified: head/devel/shapelib/files/patch-contrib-Makefile ============================================================================== --- head/devel/shapelib/files/patch-contrib-Makefile Mon Oct 14 11:03:09 2013 (r330290) +++ head/devel/shapelib/files/patch-contrib-Makefile Mon Oct 14 11:03:14 2013 (r330291) @@ -1,5 +1,5 @@ ---- contrib/Makefile.orig 2011-07-24 14:15:51.000000000 +0800 -+++ contrib/Makefile 2011-12-24 03:00:00.000000000 +0800 +--- contrib/Makefile.orig 2010-01-04 12:08:02.000000000 +0800 ++++ contrib/Makefile 2013-10-13 21:39:57.405429171 +0800 @@ -3,19 +3,36 @@ #CFLAGS = -g @@ -34,10 +34,10 @@ +.endif + +allprog_install: $(ALLPROG) -+ $(BSD_INSTALL_PROGRAM) $(ALLPROG) $(PREFIX)/bin/ ++ $(BSD_INSTALL_PROGRAM) $(ALLPROG) $(DESTDIR)$(PREFIX)/bin/ + +allproj_install: $(ALLPROJ) -+ $(BSD_INSTALL_PROGRAM) $(ALLPROJ) $(PREFIX)/bin/ ++ $(BSD_INSTALL_PROGRAM) $(ALLPROJ) $(DESTDIR)$(PREFIX)/bin/ clean: rm -f shpdxf shpproj dbfinfo shpcentrd shpdata shpwkb dbfcat dbfinfo shpinfo shpfix shpcat *.o
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310141103.r9EB3EwM039373>