svn commit: r362998 - in head/x11-toolkits/blt: . files

[John Marino]

Author: marino
Date: Sat Jul 26 23:40:50 2014
New Revision: 362998
URL: http://svnweb.freebsd.org/changeset/ports/362998
QAT: https://qat.redports.org/buildarchive/r362998/

Log:
  x11-toolkits/blt: install libBLTstubs.a too
  
  PR:		190646
  Submitted by:	darius (dons.net.au)

Modified:
  head/x11-toolkits/blt/Makefile
  head/x11-toolkits/blt/files/patch-generic_Makefile.in
  head/x11-toolkits/blt/pkg-plist

Modified: head/x11-toolkits/blt/Makefile
==============================================================================
--- head/x11-toolkits/blt/Makefile	Sat Jul 26 23:24:45 2014	(r362997)
+++ head/x11-toolkits/blt/Makefile	Sat Jul 26 23:40:50 2014	(r362998)
@@ -3,7 +3,7 @@
 
 PORTNAME=	blt
 PORTVERSION=	2.5.3
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11-toolkits tk
 MASTER_SITES=	SF/wize
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}

Modified: head/x11-toolkits/blt/files/patch-generic_Makefile.in
==============================================================================
--- head/x11-toolkits/blt/files/patch-generic_Makefile.in	Sat Jul 26 23:24:45 2014	(r362997)
+++ head/x11-toolkits/blt/files/patch-generic_Makefile.in	Sat Jul 26 23:40:50 2014	(r362998)
@@ -1,10 +1,21 @@
---- generic/Makefile.in.orig	2010-12-11 00:39:42.000000000 +0100
-+++ generic/Makefile.in	2013-11-20 09:13:25.000000000 +0100
-@@ -216,10 +216,10 @@
+--- generic/Makefile.in.orig	2010-12-11 10:09:42.000000000 +1030
++++ generic/Makefile.in	2014-05-06 06:41:23.000000000 +0930
+@@ -161,6 +161,8 @@
+ libvers_a =	libBLT$(version).a
+ tcl_only_lib_a =  libBLTlite.a
+ tcl_only_libvers_a = libBLTlite$(version).a
++stub_a =	libBLTstub.a
++stub_libvers_a = libBLTstub$(version).a
+ 
+ CC_SWITCHES =	$(EXTRA_CFLAGS) $(CFLAGS) $(DEFINES) $(INCLUDES)
+ INSTALL =	@INSTALL@
+@@ -215,13 +217,15 @@
+ 	$(INSTALL) -m 0755 $(bltwish) $(INSTALL_ROOT)$(bindir)
  	$(INSTALL) -m 0755 $(bltsh) $(INSTALL_ROOT)$(bindir)
  
- install-lib: $(lib_a) $(tcl_only_lib_a)
+-install-lib: $(lib_a) $(tcl_only_lib_a)
 -	$(INSTALL_DATA) $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
++install-lib: $(lib_a) $(tcl_only_lib_a) $(stub_a)
 +	$(INSTALL_DATA) -m 0644 $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
  	(cd $(INSTALL_ROOT)$(libdir); $(RM) $(lib_a) ; $(LN_S) $(libvers_a) $(lib_a))
  	$(RANLIB) $(INSTALL_ROOT)$(libdir)/$(libvers_a)
@@ -12,4 +23,17 @@
 +	$(INSTALL_DATA) -m 0644 $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
  	(cd $(INSTALL_ROOT)$(libdir); $(RM) $(tcl_only_lib_a) ; $(LN_S) $(tcl_only_libvers_a) $(tcl_only_lib_a))
  	$(RANLIB) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
++	$(INSTALL_DATA) -m 0644 $(stub_a) $(INSTALL_ROOT)$(libdir)/$(stub_libvers_a)
++	(cd $(INSTALL_ROOT)$(libdir); $(RM) $(stub_a) ; $(LN_S) $(stub_libvers_a) $(stub_a))
  	(cd shared; $(MAKE) install) 
+ 
+ mkdirs:
+@@ -244,7 +248,7 @@
+ 	$(LINT) $(LINTFLAGS) $(DEFINES) $(INCLUDES) $(SRCS)
+ 
+ libBLTstub.a:
+-	$(CC) -I$(srcdir) @INCLUDES@ -c $(srcdir)/bltStubLib.c
++	$(CC) -fPIC -I$(srcdir) @INCLUDES@ -c $(srcdir)/bltStubLib.c
+ 	$(AR) libBLTstub.a bltStubLib.o
+ 	$(RANLIB) libBLTstub.a
+ 

Modified: head/x11-toolkits/blt/pkg-plist
==============================================================================
--- head/x11-toolkits/blt/pkg-plist	Sat Jul 26 23:24:45 2014	(r362997)
+++ head/x11-toolkits/blt/pkg-plist	Sat Jul 26 23:40:50 2014	(r362998)
@@ -4,6 +4,8 @@ lib/libBLTlite%%BLTSHORTVER%%.so
 lib/libBLT.a
 lib/libBLTlite.a
 lib/libBLTlite%%BLTSHORTVER%%.a
+lib/libBLTstub.a
+lib/libBLTstub%%BLTSHORTVER%%.a
 bin/bltwish%%BLTSHORTVER%%
 bin/bltsh%%BLTSHORTVER%%
 bin/bltwish