Date: Fri, 28 Aug 2015 17:00:47 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r395515 - in branches/2015Q3/devel/sgb: . files Message-ID: <201508281700.t7SH0lwe076601@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Fri Aug 28 17:00:47 2015 New Revision: 395515 URL: https://svnweb.freebsd.org/changeset/ports/395515 Log: MFH: r395476 - Fix installed files referencing STAGEDIR - Simplify the port a bit in the process Approved by: portmgr blanket Approved by: ports-secteam (delphij) Modified: branches/2015Q3/devel/sgb/Makefile branches/2015Q3/devel/sgb/files/patch-Makefile Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/sgb/Makefile ============================================================================== --- branches/2015Q3/devel/sgb/Makefile Fri Aug 28 16:56:52 2015 (r395514) +++ branches/2015Q3/devel/sgb/Makefile Fri Aug 28 17:00:47 2015 (r395515) @@ -3,6 +3,7 @@ PORTNAME= sgb PORTVERSION= 20090810 +PORTREVISION= 1 CATEGORIES= devel MASTER_SITES= ftp://ftp.cs.stanford.edu/pub/sgb/ \ GENTOO @@ -16,11 +17,8 @@ BUILD_DEPENDS= ctangle:${PORTSDIR}/devel NO_WRKSUBDIR= yes ALL_TARGET= lib tests MAKE_JOBS_UNSAFE= yes -MAKE_ENV+= STAGEDIR=${STAGEDIR} - -.include <bsd.port.pre.mk> post-extract: ${CP} ${WRKSRC}/PROTOTYPES/* ${WRKSRC} -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: branches/2015Q3/devel/sgb/files/patch-Makefile ============================================================================== --- branches/2015Q3/devel/sgb/files/patch-Makefile Fri Aug 28 16:56:52 2015 (r395514) +++ branches/2015Q3/devel/sgb/files/patch-Makefile Fri Aug 28 17:00:47 2015 (r395515) @@ -1,11 +1,11 @@ ---- Makefile Mon Dec 27 23:27:24 1999 -+++ /home/pfeifer/Makefile Sat Feb 3 16:08:07 2007 +--- Makefile.orig 1999-12-27 22:27:24 UTC ++++ Makefile @@ -8,22 +8,22 @@ # current directory. (Not recommended for serious users.) # Change SGBDIR to the directory where all GraphBase files will go: -SGBDIR = /usr/local/sgb -+SGBDIR = ${STAGEDIR}/${PREFIX} ++SGBDIR = ${PREFIX} # Change DATADIR to the directory where GraphBase data files will go: -DATADIR = $(SGBDIR)/data @@ -28,14 +28,37 @@ # SHORTCUT: Uncomment these lines, for single-directory installation: #DATADIR = . -@@ -130,9 +130,9 @@ +@@ -130,22 +130,22 @@ tests: test_io test_graph test_flip install: lib if test ! -r certified; then echo "Please run 'make tests' first!"; fi test -r certified -- make installdata - - mkdir $(LIBDIR) - - cp libgb.a $(LIBDIR) -+ make installdata - - mkdir $(CWEBINPUTS) - - cp -p boilerplate.w gb_types.w $(CWEBINPUTS) - - mkdir $(INCLUDEDIR) ++ - mkdir ${DESTDIR}$(LIBDIR) ++ - cp libgb.a ${DESTDIR}$(LIBDIR) + make installdata +- - mkdir $(LIBDIR) +- - cp libgb.a $(LIBDIR) +- - mkdir $(CWEBINPUTS) +- - cp -p boilerplate.w gb_types.w $(CWEBINPUTS) +- - mkdir $(INCLUDEDIR) +- - cp -p $(HEADERS) Makefile $(INCLUDEDIR) ++ - mkdir ${DESTDIR}$(CWEBINPUTS) ++ - cp -p boilerplate.w gb_types.w ${DESTDIR}$(CWEBINPUTS) ++ - mkdir ${DESTDIR}$(INCLUDEDIR) ++ - cp -p $(HEADERS) Makefile ${DESTDIR}$(INCLUDEDIR) + + installdata: $(DATAFILES) +- - mkdir $(SGBDIR) +- - mkdir $(DATADIR) +- - cp -p $(DATAFILES) $(DATADIR) ++ - mkdir ${DESTDIR}$(SGBDIR) ++ - mkdir ${DESTDIR}$(DATADIR) ++ - cp -p $(DATAFILES) ${DESTDIR}$(DATADIR) + + installdemos: lib $(DEMOS) +- - mkdir $(BINDIR) +- - mv $(DEMOS) $(BINDIR) ++ - mkdir ${DESTDIR}$(BINDIR) ++ - mv $(DEMOS) ${DESTDIR}$(BINDIR) + + uninstalldemos: + - cd $(BINDIR); rm -f $(DEMOS)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201508281700.t7SH0lwe076601>