aboutsummaryrefslogtreecommitdiff
path: root/x11-toolkits
diff options
context:
space:
mode:
authorAntoine Brodin <antoine@FreeBSD.org>2014-09-04 19:26:24 +0000
committerAntoine Brodin <antoine@FreeBSD.org>2014-09-04 19:26:24 +0000
commit228ab588738952bd42427886fd5368181243ba6e (patch)
tree7fe589d0d1b0e6d00b7aa9cd05fc46ca15de7655 /x11-toolkits
parent7374b5a054d87d64914c6c36520e15fa14f3f31b (diff)
downloadports-228ab588738952bd42427886fd5368181243ba6e.tar.gz
ports-228ab588738952bd42427886fd5368181243ba6e.zip
Change INSTALL_DATA to install with mode 644
Remove patches and hacks that were used to work around the previous situation This allows to stage more ports as a regular user Differential Revision: https://reviews.freebsd.org/D703 Reviewed by and discussed with: bapt With hat: portmgr
Notes
Notes: svn path=/head/; revision=367307
Diffstat (limited to 'x11-toolkits')
-rw-r--r--x11-toolkits/blt/files/patch-generic_Makefile.in12
-rw-r--r--x11-toolkits/plib/Makefile1
2 files changed, 5 insertions, 8 deletions
diff --git a/x11-toolkits/blt/files/patch-generic_Makefile.in b/x11-toolkits/blt/files/patch-generic_Makefile.in
index bc5a096b55c3..be0a3a5d3a62 100644
--- a/x11-toolkits/blt/files/patch-generic_Makefile.in
+++ b/x11-toolkits/blt/files/patch-generic_Makefile.in
@@ -1,5 +1,5 @@
---- generic/Makefile.in.orig 2010-12-11 10:09:42.000000000 +1030
-+++ generic/Makefile.in 2014-05-06 06:41:23.000000000 +0930
+--- generic/Makefile.in.orig 2010-12-10 23:39:42 UTC
++++ generic/Makefile.in
@@ -161,6 +161,8 @@
libvers_a = libBLT$(version).a
tcl_only_lib_a = libBLTlite.a
@@ -14,16 +14,14 @@
$(INSTALL) -m 0755 $(bltsh) $(INSTALL_ROOT)$(bindir)
-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)
+ $(INSTALL_DATA) $(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)
-- $(INSTALL_DATA) $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
-+ $(INSTALL_DATA) -m 0644 $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir)/$(tcl_only_libvers_a)
+ $(INSTALL_DATA) $(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)
++ $(INSTALL_DATA) $(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)
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index e93f0bf50a20..65cad5c6b375 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -25,7 +25,6 @@ post-patch:
@${REINPLACE_CMD} -e 's|-lpthread||g ; \
s|-ldl||g ; \
s|-lc_r||g' ${WRKSRC}/configure
- @${REINPLACE_CMD} -e '/echo.*RANLIB/,+1d' ${WRKSRC}/src/*/Makefile.in
@${ECHO} "JS component is not compiled with new usb stack"
post-build: