svn commit: r357319 - in head/science/simlib: . files

[Vanilla I. Shu]

Author: vanilla
Date: Tue Jun 10 15:07:59 2014
New Revision: 357319
URL: http://svnweb.freebsd.org/changeset/ports/357319
QAT: https://qat.redports.org/buildarchive/r357319/

Log:
  Stagify.

Modified:
  head/science/simlib/Makefile
  head/science/simlib/files/patch-src__Makefile.generic

Modified: head/science/simlib/Makefile
==============================================================================
--- head/science/simlib/Makefile	Tue Jun 10 14:48:43 2014	(r357318)
+++ head/science/simlib/Makefile	Tue Jun 10 15:07:59 2014	(r357319)
@@ -19,7 +19,6 @@ CXXFLAGS+=	-fPIC
 NOT_FOR_ARCHS=		ia64 powerpc sparc64
 NOT_FOR_ARCHS_REASON=	contains not working ${ARCH}-dependent assembly code
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|make|gmake|g' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e 's#%%PREFIX%%#${PREFIX}#g' \

Modified: head/science/simlib/files/patch-src__Makefile.generic
==============================================================================
--- head/science/simlib/files/patch-src__Makefile.generic	Tue Jun 10 14:48:43 2014	(r357318)
+++ head/science/simlib/files/patch-src__Makefile.generic	Tue Jun 10 15:07:59 2014	(r357319)
@@ -1,15 +1,22 @@
---- src/Makefile.generic.orig	2008-04-06 14:25:38.000000000 +0800
-+++ src/Makefile.generic	2008-04-06 14:26:50.000000000 +0800
-@@ -225,9 +225,9 @@
+--- src/Makefile.generic.orig	2014-06-10 23:04:24.274911932 +0800
++++ src/Makefile.generic	2014-06-10 23:05:00.866911669 +0800
+@@ -224,15 +224,10 @@ clean:
+ 
  #TODO: add version and symlink
  install: all
- 	install -d $(PREFIX)/include $(PREFIX)/lib
+-	install -d $(PREFIX)/include $(PREFIX)/lib
 -	install -m0644 $(SIMLIB_HEADERS) $(PREFIX)/include
 -	install -m0644 $(LIBNAME).a      $(PREFIX)/lib/lib$(LIBNAME).a
 -	install -m0644 $(LIBNAME).so     $(PREFIX)/lib/lib$(LIBNAME).so
-+	$(BSD_INSTALL_DATA) $(SIMLIB_HEADERS) %%PREFIX%%/include
-+	$(BSD_INSTALL_PROGRAM) $(LIBNAME).a      %%PREFIX%%/lib/lib$(LIBNAME).a
-+	$(BSD_INSTALL_PROGRAM) $(LIBNAME).so     %%PREFIX%%/lib/lib$(LIBNAME).so
- 	@if ! grep '^'$(PREFIX)/lib'$$' /etc/ld.so.conf >/dev/null; then \
- 	  echo "Add $(PREFIX)/lib to /etc/ld.so.conf ";  \
- 	fi
+-	@if ! grep '^'$(PREFIX)/lib'$$' /etc/ld.so.conf >/dev/null; then \
+-	  echo "Add $(PREFIX)/lib to /etc/ld.so.conf ";  \
+-	fi
+-	@echo "This should be run as root"
+-	ldconfig # update dynamic linker cache
++	install -d $(DESTDIR)$(PREFIX)/include $(DESTDIR)$(PREFIX)/lib
++	install -m0644 $(SIMLIB_HEADERS) $(DESTDIR)$(PREFIX)/include
++	install -m0644 $(LIBNAME).a      $(DESTDIR)$(PREFIX)/lib/lib$(LIBNAME).a
++	install -m0644 $(LIBNAME).so     $(DESTDIR)$(PREFIX)/lib/lib$(LIBNAME).so
+ 
+ #############################################################################
+ # Uninstall library