svn commit: r395476 - in head/devel/sgb: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Aug 28 13:27:54 2015
New Revision: 395476
URL: https://svnweb.freebsd.org/changeset/ports/395476

Log:
  - Fix installed files referencing STAGEDIR
  - Simplify the port a bit in the process
  
  Approved by:	portmgr blanket
  MFH:		2015Q3

Modified:
  head/devel/sgb/Makefile
  head/devel/sgb/files/patch-Makefile

Modified: head/devel/sgb/Makefile
==============================================================================
--- head/devel/sgb/Makefile	Fri Aug 28 13:25:53 2015	(r395475)
+++ head/devel/sgb/Makefile	Fri Aug 28 13:27:54 2015	(r395476)
@@ -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: head/devel/sgb/files/patch-Makefile
==============================================================================
--- head/devel/sgb/files/patch-Makefile	Fri Aug 28 13:25:53 2015	(r395475)
+++ head/devel/sgb/files/patch-Makefile	Fri Aug 28 13:27:54 2015	(r395476)
@@ -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)