diff options
author | 2014-07-05 02:50:58 -0700 | |
---|---|---|
committer | 2014-07-05 02:50:58 -0700 | |
commit | 77861e9ea07071cf24096732d9e69f60ed1d54f6 (patch) | |
tree | e3c29e2e9b003e725586ca9d4497c4e2ef39188f | |
parent | net-libs/libsoup-gnome: version-bump: 2.46.0-r1 (diff) | |
download | gmt-77861e9ea07071cf24096732d9e69f60ed1d54f6.tar.gz gmt-77861e9ea07071cf24096732d9e69f60ed1d54f6.tar.bz2 gmt-77861e9ea07071cf24096732d9e69f60ed1d54f6.zip |
dev-tcltk/blt-2.4z-r13: minor enhancements to upstream codebase
This ebuild was failing, due, apperently, to its poorly constructed
makefile. While I was at it, I noticed some QAwarns apperently due
to a missing prototype in upstream code.
Fixed both via patches.
Signed-off-by: Gregory M. Tuner <gmt@be-evil.net>
-rw-r--r-- | dev-tcltk/blt/Manifest | 4 | ||||
-rw-r--r-- | dev-tcltk/blt/blt-2.4z-r13.ebuild | 6 | ||||
-rw-r--r-- | dev-tcltk/blt/files/blt-2.4z-TreeViewTextbox_prototype.patch | 13 | ||||
-rw-r--r-- | dev-tcltk/blt/files/blt-2.4z-mkdir-safely.patch | 387 |
4 files changed, 407 insertions, 3 deletions
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest index fdead72..ec6ee51 100644 --- a/dev-tcltk/blt/Manifest +++ b/dev-tcltk/blt/Manifest @@ -1,3 +1,4 @@ +AUX blt-2.4z-TreeViewTextbox_prototype.patch 642 SHA256 cc5d47739283e1a427206683c61178d3dbda4053f58411f7cff42bed2ded51f2 SHA512 9dbffe29ec3fb453b18d2ae3b7f7da8f06774d67cfd98903b32aa85b8771715a2f9d430f24162f07830dc096b04ba910bac4702abc0bfefd726a3d5760e4cfdb WHIRLPOOL 4ec57f28e1e52dfa35265eecdcdfea9abce8efae737ea094363c46f7c70e87fc56d68a92baac4e4ee202a0037249e3a2de28bfcdebab4feee0e221e96b2b91fb AUX blt-2.4z-aclocal.patch 1705 SHA256 7b9b496f68ee8215b7404e1750955cb03e9188d19a523495c5ac33074500fc7e SHA512 dfc4eb375b12d8ae87a65c039bae6445b70008ff1681cf1a40028a04685bbfcbb5dc841b25b475285679aac9303e0807f88c061f983a26a3de66fc1e1dc2ad12 WHIRLPOOL 824a80c2b05ab023c5a4e5321aa29ea793212db311ffa817f2fb6b711480561fd226a6e3d0341c00e90dd8ec2b8d9b31d9a57935e9a8b49d07380560d4288aeb AUX blt-2.4z-ar-withval.patch 1364 SHA256 b2b0a0df4ab4f517b366e864b8a69d50917c11e6b80bc764795424f510a59c99 SHA512 88833412b1cfd9d38b6571f9e879bc731ffbfa67c7d9e1fee646122b41d963f3cce0206f798bbbc11823fa428461f1653c4b1ddfae8dfc917abd947d5f59c647 WHIRLPOOL c1f56e4cc39f80631e1c01fe6880f17220e6429297687c3194caa9b9458a101f78fb16321f8b8dbbf9012caa7011b2012a11cbc3bfde13def4e1ccd69f0f5e23 AUX blt-2.4z-darwin.patch 1186 SHA256 3cbdbbf123aeb4b4a727704c2daabddb7a4a44e23c2d0bd7652c0b0b0aa8d297 SHA512 31941da432004eec1837fda164365327e39f44345581c8f87d6c37e95ed609b61ee6420e832c67b91277418ff232cc1b6c7ee85cd5e9a8859bf8530e16d354c5 WHIRLPOOL 33a3fce0e6066e975ee2d564ae7176cfb4220f3371576531e4be3821a7cc43c96cd80892bb138006f5ce4dc38e1c970e68640b0e565a45634cc12427454730ac @@ -7,6 +8,7 @@ AUX blt-2.4z-gentoo-libdir.patch 2621 SHA256 3483f95a1d4f549413c3964fa5b9b7fbbe2 AUX blt-2.4z-ldflags-v2.patch 5447 SHA256 e676423ffb20eb6989f373ff71404c732243b4c66a46ed49f8fd3bb622d74333 SHA512 6bd1d638eaa563fac9c44be017dfdf8d5b425b99729bf3c62919273a75c5d43ff9c096084c84bc1248c05e940877e3488d7a9f67cb6ed95262cce45b16985853 WHIRLPOOL b08c8c113b4fa715ab330ca85dfc5714be1dff86f0bda2f0ac1aa6499fd46c3fbd49de7fdbb6b42d9a2f0080a7814f817a29fe7f3651eeda7e51cdf7c5792716 AUX blt-2.4z-ldflags.patch 1086 SHA256 20245d45dfb0e96afe1127fa40209a7881fbd3f3880ef04af9496809a308f06e SHA512 d2e19fc9caab2ae013c01e66c9674906bda2f01190bf6e9da93c2d22cb4a36a167f7de34649e6d3efc84b0094b1710fc3380347367830dc012873c3845716445 WHIRLPOOL bd0564162e27c97ecca7c8c017345d005871aec2f97bebf8f4a7b2667f4163f051df58379649e40b8c200b4155d2b6049cdf3e2db15753b715a2aa4adabd8467 AUX blt-2.4z-linking.patch 684 SHA256 cd19df698ca40ce743c81fe2c18dce615a6db385c6a973b9a14201f45e5467a2 SHA512 09ad0d4b43d51b33020a13ecbe31d04d5ddcdf2134d0c0e1275b4de3127adad624d222f492a6d9b0a4f198537afb30d9af70f8685668bf7eba966f020c34368e WHIRLPOOL a5a993a06467a81e1987c04bd709859c725f438b5aa334b2eb1c3806567447dbc290f9a464800919d7fdb5ca0832053d1da9fc91346dc4455ea18ec353e10875 +AUX blt-2.4z-mkdir-safely.patch 14253 SHA256 72a8e47d6e5e4bc4eba645510b9d0dbb14bc2c50cb929d84262545618e002735 SHA512 923511296a6f351c124c1a14295eabfa081425b2f3fc43223a9d7624664a05363cb3f8bad3edd81435bceb3cb1397d735e7cc5bc286ad14474fa0afd526c738e WHIRLPOOL e40ae753f239a371457a9ca8eb057222aabeaabf5961f6adbc7f2756b12dd1cb6ab143c85da436fa1f8328d68eb3f636a837a70931ed4461fbfeaea13fcbd7b0 AUX blt-2.4z-parallelmake.patch 8988 SHA256 26359c11981d521e32de11b19096b14ab93d4c346a8cb348adce6ced475a96c6 SHA512 810b50439c05c2f83174070a9863cef920359127c1af5d04bfe6a33ac8ee03a7c7ebfbf29c365c9a74efd964c2a6423973ee8f44e4b6ac90635b494388b6b603 WHIRLPOOL c31714fd6ae0a6b6abb75a6b9901bb05e5933f230e57664a7c69bdfb0cdfa363c9d2cdabddfbd293887f393ca9fae038f38ecb968445f91ea74cb82a6d2715dc AUX blt-2.4z-r13-fix-makefile.patch 509 SHA256 0ac21b9e7fc3e9e5bb7a44d195d8d6cdba05216cf2d9d09709bfc4628d371de1 SHA512 77f432a8ae319ae552a0803c949e4de3e4d1ce258d1f41347481f162d084668c125971ccea5e4fc53dd806054596a4d620786aca41275789c393cf499c9a93b4 WHIRLPOOL e16dc72e20e83de59684a0936c2571fa5ea00c7b20e91e54abc6eb3a7e5fdd7c328e9ea2a16a48fa7288dc8642d33b245fad3a4113a14770bc95349f08a2d76a AUX blt-2.4z-r4-fix-makefile.patch 817 SHA256 fd8ada3720c85856770f4770a93f4e668a75de3cf68d35d25597215996e023e8 SHA512 c3b9aedc9c0557a10f66f0d1f9e61a028367e190fcb49ae0af8acdacc5a466168f4a1f26012a8b4f6aceb644adc532bcf0e1348cd0231efd821b66107cf5c7b9 WHIRLPOOL 2f54db3233eb62e805d072448d31c5dd7c69d8fb15aec902a1f12c8b7e82aa6ff9604504b1b021a4dbaf3b00cc2ee0974bb0f5bd0f176f475b41c8a6a3fc0e70 @@ -18,6 +20,6 @@ AUX blt2.4z-64bit.patch 891 SHA256 a0a3da1016eea86279d1648f4390b38083484582bdb5b AUX blt2.4z-install.diff 1057 SHA256 6849139557c2846c332c4d81b04c03872933adfef0fa8432d6b757cfd02774c8 SHA512 2786eb7d59ef4f3e0b2e846f906e6f92cece13b8003ed220ddcdd22b42b761fa6aa31905a3a62af54e02db96bda37e21fae2361589d8c393586c37bcd33ef842 WHIRLPOOL a0db9fdc9d2199ac0e217015826a0ffe7b70c619e55e85a13a941202be3a325356cde627714d16d315f1647b5f95d16a6219720048b14560fdf7445c170995b2 AUX pkgIndex.tcl 146 SHA256 79ff9c41afa3157d6f180dce21ddf82f5a55ed24a274eea0eeef511ec2f2659d SHA512 fedb327153b670f370773c1b57f7f831c291962fb375e27ba0b31314a94128edc7a4e6b9377e7c19426beb672fcb9b1b10f7e45ca0f197e19863b40d27bef439 WHIRLPOOL b3f6534323e28097656cfd2ff42433e07460d6dc3b247ed666712b7e664e086421640ff2320e8d71e5037e07fcefd690b845c9dd08e54baf0562c8659919bc6d DIST blt2.4z-8.5.2.tar.gz 2326234 SHA256 e4e60628f79e1899175b51a3398133131fac52021b9b9019b4483525c48d6d16 SHA512 afc465ba47ae43a0c6be17400d0a572dccd8c2a8adfd8fc3ed50f9ec28d02129f069d88096c1428c4b242550131092b4141035d7ce90c9e7181ccf712502f09a WHIRLPOOL a00a029e075916dd7656ca85acb308a48e6d80563a91ada9e9e7df7518ef0d4de2200b54e5d9c8a9602520c03472e73968956c0df30afb8ef7f7b364fdd5524f -EBUILD blt-2.4z-r13.ebuild 4221 SHA256 f2d158264ba3e72bfce91e182030c2c2268f9148c0cb9e0e159eb69360b6f552 SHA512 2683ee9241a3aa3fc7cbb9673e9c3ce6837c56df52e58b51ee8f064fe64ef58bfb9aec0b827e0e65f414a3f56ef57a4b32cbb165cc4e877ebdbe4828e529e61c WHIRLPOOL 05d57d121058851c968083374801c8dd7460d9734583c52d10d892b6e8210187ce9b3d2f053a94ebaa0a255f8d92d328f90a7095c7d4b6ca67d2bc86af5f2cd5 +EBUILD blt-2.4z-r13.ebuild 4320 SHA256 356e3390d161bb01c631e7b982b1bdd93cd941658a9ca639e579f1505d5ba6e5 SHA512 d8b3b4826bc30eea7cd99963efb1c99b10239c86d549ee35313f5b794e5efe3dc7209d9d4938931c16b1b213bb8d1244c00b7c5028b3adf196101991b3ed2d07 WHIRLPOOL 6756de8b391f0579fbc3eb81d073a8cf475aefccba40199430662a170b9f05d8b798659d568d717a2694fcd6cee8b85036c6baf34f70c4af95010d1c23700035 MISC ChangeLog 9103 SHA256 a0c8bf63e3325dbfc6ac1c0c18b6499c02c3739720ccfe19096a38ca5647b122 SHA512 0997e28c1b3f9a166ba6c94baba7a1e1aa043901251b83d8dd42edbe9d21b7ffe8a19d3a1f555c55f2a8959239c4d3b3fb1693598610428516e7742171fc61e2 WHIRLPOOL 10be00d2671bfade334975ce2405b8eac227aa88c0843fe7bc17fc47b7dfa715166ef58d602d3bd519079c86fd863aa1d5d199cd3875b793018869368239630c MISC metadata.xml 160 SHA256 225a6f78d287329cdf2f4ed57468be28bd6565fd9a62207c2cc48e25ac9d3537 SHA512 a50627bda9ed953daf422b5a2e89b5b64e296d1a023d767c8a4ebb2cd51cd0036cecce455762a54e7d669f94d17d9de21052bac94fc08b1365ef42eb2f267742 WHIRLPOOL 61fa22d50aaf2bdecc467e26c9675cf7949ad55a4a8821730c91d1bd73f83fc4c35660851961310efa450e337a7ef572a925e186b8b05984d6315efc509fd365 diff --git a/dev-tcltk/blt/blt-2.4z-r13.ebuild b/dev-tcltk/blt/blt-2.4z-r13.ebuild index 7d8e174..f04be20 100644 --- a/dev-tcltk/blt/blt-2.4z-r13.ebuild +++ b/dev-tcltk/blt/blt-2.4z-r13.ebuild @@ -60,7 +60,9 @@ src_prepare() { "${FILESDIR}"/${P}-deprecated-ac-output.patch \ "${FILESDIR}"/${P}-gentoo-libdir.patch \ "${FILESDIR}"/${P}-ar-withval.patch \ - "${FILESDIR}"/${P}-parallelmake.patch + "${FILESDIR}"/${P}-parallelmake.patch \ + "${FILESDIR}"/${P}-mkdir-safely.patch \ + "${FILESDIR}"/${P}-TreeViewTextbox_prototype.patch append-cflags -fPIC @@ -139,7 +141,7 @@ abi_post_src_install() { rm -f ${ED}usr/$(get_libdir)/blt2.4/{NEWS,PROBLEMS,README} || die # remove demos from libdirs & install as doc - if multilib_is_best_abi ; then + if multilib_is_native_abi ; then docompress -x /usr/share/doc/${PF}/demos dodoc -r "${ED}"usr/$(get_libdir)/blt2.4/demos fi diff --git a/dev-tcltk/blt/files/blt-2.4z-TreeViewTextbox_prototype.patch b/dev-tcltk/blt/files/blt-2.4z-TreeViewTextbox_prototype.patch new file mode 100644 index 0000000..57ff77d --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.4z-TreeViewTextbox_prototype.patch @@ -0,0 +1,13 @@ +diff -urpN blt2.4z-8.5.2.orig/src/bltTreeView.h blt2.4z-8.5.2/src/bltTreeView.h +--- blt2.4z-8.5.2.orig/src/bltTreeView.h 2008-04-15 08:31:25.000000000 -0700 ++++ blt2.4z-8.5.2/src/bltTreeView.h 2014-07-05 02:41:54.495301957 -0700 +@@ -1100,6 +1100,9 @@ extern TreeViewEntry *Blt_NodeToEntry _A + Blt_TreeNode node)); + extern int Blt_TreeViewStyleOp _ANSI_ARGS_((TreeView *tvPtr, Tcl_Interp *interp, + int objc, Tcl_Obj *CONST *objv)); ++extern int Blt_TreeViewTextbox _ANSI_ARGS_((TreeView *tvPtr, ++ TreeViewEntry *entryPtr, TreeViewColumn *columnPtr)); ++ + + #define CHOOSE(default, override) \ + (((override) == NULL) ? (default) : (override)) diff --git a/dev-tcltk/blt/files/blt-2.4z-mkdir-safely.patch b/dev-tcltk/blt/files/blt-2.4z-mkdir-safely.patch new file mode 100644 index 0000000..638491a --- /dev/null +++ b/dev-tcltk/blt/files/blt-2.4z-mkdir-safely.patch @@ -0,0 +1,387 @@ +From: Gregory M. Turner <gmt@be-evil.net> + +Somehow (I suspect it is some subtle bug in the xattr-wrapper(!), but I +didn't investigate carefully), this ebuild mysteriously started failing due +to installing files where there were supposed to be directories. + +Not sure what changed, but it's pretty easy to see how, if this makefile +were being run by a sufficiently creative make, how the current implementation +could break. I guess we could fix it by placing a dependency on mkdirs for +all of the subsequent targets requisite to "install". But, sheesh, gross. + +Better just to fix the underlying problem by using install in a fully consistent +manner. This patch changes blt to do just that, always using install -t or +install -T, and always preceeding those calls by one to install -d (which +wont run in parallel no matter what :)). + +I even fixed it for cygwin. TODO: submit to upstream. + +-gmt + +diff -urpN blt2.4z-8.5.2.orig/demos/Makefile.in blt2.4z-8.5.2/demos/Makefile.in +--- blt2.4z-8.5.2.orig/demos/Makefile.in 2014-07-05 01:46:30.058060792 -0700 ++++ blt2.4z-8.5.2/demos/Makefile.in 2014-07-05 01:43:08.391034175 -0700 +@@ -17,17 +17,6 @@ INSTALL = @INSTALL@ + INSTALL_DATA = @INSTALL_DATA@ + INSTALL_ROOT = + +-instdirs = $(prefix) \ +- $(exec_prefix) \ +- $(libdir) \ +- $(scriptdir) \ +- $(destdir) \ +- $(destdir)/bitmaps \ +- $(destdir)/bitmaps/hand \ +- $(destdir)/bitmaps/fish \ +- $(destdir)/images \ +- $(destdir)/scripts +- + demos = barchart1.tcl barchart2.tcl barchart3.tcl barchart4.tcl \ + barchart5.tcl \ + bgexec1.tcl bgexec2.tcl bgexec3.tcl bgexec4.tcl \ +@@ -48,42 +37,37 @@ demos = barchart1.tcl barchart2.tcl bar + + all: + +-install: mkdirs install-bitmaps install-images install-scripts ++install: install-bitmaps install-images install-scripts + + install-scripts: ++ $(INSTALL) -d $(INSTALL_ROOT)$(destdir)/scripts + for i in $(srcdir)/scripts/*.tcl ; do \ +- $(INSTALL) $$i $(INSTALL_ROOT)$(destdir)/scripts ; \ ++ $(INSTALL) -t $(INSTALL_ROOT)$(destdir)/scripts $$i ; \ + done + for i in $(demos) ; do \ +- $(INSTALL) $(srcdir)/$$i $(INSTALL_ROOT)$(destdir)/$$i ; \ ++ $(INSTALL) -t $(INSTALL_ROOT)$(destdir) $(srcdir)/$$i ; \ + done + + install-bitmaps: ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(destdir)/bitmaps/hand \ ++ $(INSTALL_ROOT)$(destdir)/bitmaps/fish \ ++ $(INSTALL_ROOT)$(destdir)/images + for i in $(srcdir)/bitmaps/*.xbm ; do \ +- $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(destdir)/bitmaps ; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(destdir)/bitmaps $$i ; \ + done + for i in $(srcdir)/bitmaps/hand/*.xbm ; do \ +- $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(destdir)/bitmaps/hand ; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(destdir)/bitmaps/hand $$i ; \ + done + for i in $(srcdir)/bitmaps/fish/*.xbm ; do \ +- $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(destdir)/bitmaps/fish ; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(destdir)/bitmaps/fish $$i ; \ + done + + install-images: ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(destdir)/images + for i in $(srcdir)/images/*.gif $(srcdir)/images/*.ps ; do \ +- $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(destdir)/images ; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(destdir)/images $$i ; \ + done + +-mkdirs: +- @for i in $(instdirs) ; do \ +- if test -d $(INSTALL_ROOT)"$$i" ; then \ +- : ; \ +- else \ +- echo " mkdir $(INSTALL_ROOT)$$i" ; \ +- mkdir $(INSTALL_ROOT)"$$i" ; \ +- fi ; \ +- done +- + clean: + $(RM) $(srcdir)/*.bak $(srcdir)/*\~ $(srcdir)/"#"* + +diff -urpN blt2.4z-8.5.2.orig/library/Makefile.in blt2.4z-8.5.2/library/Makefile.in +--- blt2.4z-8.5.2.orig/library/Makefile.in 2014-07-05 01:46:30.058060792 -0700 ++++ blt2.4z-8.5.2/library/Makefile.in 2014-07-05 01:43:08.127036759 -0700 +@@ -38,9 +38,6 @@ ddFiles = dd-color.tcl \ + dd-text.tcl \ + tclIndex + +-instdirs = $(prefix) $(exec_prefix) \ +- $(libdir) $(prefix)/lib $(scriptdir) $(scriptdir)/dd_protocols +- + all: pkgIndex + + pkgIndex: +@@ -50,25 +47,16 @@ pkgIndex: + sed -e 's;%LIB_DIR%;$(libdir);' > pkgIndex.tcl + + +-install: mkdirs pkgIndex ++install: pkgIndex ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(scriptdir)/dd_protocols + for i in $(ddFiles) ; do \ +- $(INSTALL_DATA) $(srcdir)/dd_protocols/$$i \ +- $(INSTALL_ROOT)$(scriptdir)/dd_protocols ; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(scriptdir)/dd_protocols \ ++ $(srcdir)/dd_protocols/$$i ; \ + done + for i in $(miscFiles) ; do \ +- $(INSTALL_DATA) $(srcdir)/$$i $(INSTALL_ROOT)$(scriptdir) ; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(scriptdir) $(srcdir)/$$i ; \ + done +- $(INSTALL_DATA) pkgIndex.tcl $(INSTALL_ROOT)$(scriptdir) +- +-mkdirs: +- @for i in $(instdirs) ; do \ +- if test -d $(INSTALL_ROOT)$$i ; then \ +- : ; \ +- else \ +- echo " mkdir $(INSTALL_ROOT)$$i" ; \ +- mkdir $(INSTALL_ROOT)$$i ; \ +- fi ; \ +- done ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(scriptdir) pkgIndex.tcl + + clean: + $(RM) pkgIndex.tcl +diff -urpN blt2.4z-8.5.2.orig/Makefile.in blt2.4z-8.5.2/Makefile.in +--- blt2.4z-8.5.2.orig/Makefile.in 2014-07-05 01:46:30.058060792 -0700 ++++ blt2.4z-8.5.2/Makefile.in 2014-07-05 01:43:08.390034185 -0700 +@@ -16,13 +16,6 @@ version = @BLT_VERSION@ + gentoo_libdir = @GENTOO_LIBDIR@ + scriptdir = $(prefix)/$(gentoo_libdir)/blt$(version) + +-instdirs = $(prefix) \ +- $(exec_prefix) \ +- $(bindir) \ +- $(libdir) \ +- $(includedir) \ +- $(scriptdir) +- + # ------------------------------------------------------------------------ + # Don't edit anything beyond this point + # ------------------------------------------------------------------------ +@@ -41,26 +34,15 @@ all: + (cd man; $(MAKE) all) + (cd demos; $(MAKE) all) + +-install: mkdirs install-all ++install: install-all + + install-all: + (cd src; $(MAKE) install) + (cd library; $(MAKE) install) + (cd man; $(MAKE) install) + (cd demos; $(MAKE) install) +- $(INSTALL_DATA) $(srcdir)/README $(INSTALL_ROOT)$(scriptdir) +- $(INSTALL_DATA) $(srcdir)/PROBLEMS $(INSTALL_ROOT)$(scriptdir) +- $(INSTALL_DATA) $(srcdir)/NEWS $(INSTALL_ROOT)$(scriptdir) +- +-mkdirs: +- @for i in $(instdirs) ; do \ +- if test -d $(INSTALL_ROOT)$$i ; then \ +- : ; \ +- else \ +- echo " mkdir $(INSTALL_ROOT)$$i" ; \ +- mkdir $(INSTALL_ROOT)$$i ; \ +- fi ; \ +- done ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(scriptdir) ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(scriptdir) $(srcdir)/README $(srcdir)/PROBLEMS $(srcdir)/NEWS + + clean: + (cd src; $(MAKE) clean) +diff -urpN blt2.4z-8.5.2.orig/man/Makefile.in blt2.4z-8.5.2/man/Makefile.in +--- blt2.4z-8.5.2.orig/man/Makefile.in 2014-07-05 01:46:30.058060792 -0700 ++++ blt2.4z-8.5.2/man/Makefile.in 2014-07-05 01:43:08.127036759 -0700 +@@ -8,8 +8,6 @@ sectiondir = $(mandir)/mann + srcdir = @srcdir@ + version = @BLT_VERSION@ + +-instdirs = $(mandir) $(mandir)/mann $(mandir)/man3 +- + MAN_N = BLT.n barchart.n beep.n bgexec.n bitmap.n \ + bltdebug.n busy.n container.n cutbuffer.n \ + dragdrop.n eps.n graph.n hierbox.n \ +@@ -34,26 +32,17 @@ VPATH = $(srcdir) + + all: man.macros $(MANPAGES) + +-install: mkdirs install-mann install-man3 ++install: install-mann install-man3 + + install-mann: $(MAN_N) ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(mandir)/mann $(INSTALL_ROOT)$(mandir)/man3 + for i in *.n ; do \ +- $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(mandir)/mann; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(mandir)/mann $$i ; \ + done + + install-man3: $(MAN_3) + for i in *.3 ; do \ +- $(INSTALL_DATA) $$i $(INSTALL_ROOT)$(mandir)/man3; \ +- done +- +-mkdirs: +- @for i in $(instdirs) ; do \ +- if test -d $(INSTALL_ROOT)$$i ; then \ +- : ; \ +- else \ +- echo " mkdir $(INSTALL_ROOT)$$i" ; \ +- mkdir $(INSTALL_ROOT)$$i ; \ +- fi ; \ ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(mandir)/man3 $$i ; \ + done + + .SUFFIXES: .n .mann .3 .man3 +diff -urpN blt2.4z-8.5.2.orig/src/Makefile-cyg.in blt2.4z-8.5.2/src/Makefile-cyg.in +--- blt2.4z-8.5.2.orig/src/Makefile-cyg.in 2014-07-05 01:46:30.058060792 -0700 ++++ blt2.4z-8.5.2/src/Makefile-cyg.in 2014-07-05 01:50:53.702482022 -0700 +@@ -32,8 +32,6 @@ scriptdir = @BLT_LIBRARY@ + prefix = @prefix@ + srcdir = @srcdir@ + +-instdirs = $(prefix) $(exec_prefix) $(bindir) $(scriptdir) $(libdir) $(incdir) +- + # ------------------------------------------------------------------------ + # Directories containing Tcl and Tk include files and libraries + # ------------------------------------------------------------------------ +@@ -216,34 +214,26 @@ $(tcl_only_lib_so): $(TCL_ONLY_OBJS) bl + $(SHLIB_LD) $(SHLIB_LD_FLAGS) ${LDFLAGS} -o $@ bltInit_tclonly.o $(TCL_ONLY_OBJS) \ + $(TCL_ONLY_LIBS) + +-install: mkdirs install-lib install-demo install-headers ++install: install-lib install-demo install-headers + + install-demo: $(bltwish) $(bltsh) +- $(INSTALL) -m 0755 $(bltwish) $(INSTALL_ROOT)$(bindir) +- $(INSTALL) -m 0755 $(bltsh) $(INSTALL_ROOT)$(bindir) ++ $(INSTALL) -d $(INSTALL_ROOT)$(bindir) ++ $(INSTALL) -m 0755 $(INSTALL_ROOT)$(bindir) $(bltwish) $(bltsh) + + install-lib: $(lib_a) $(tcl_only_lib_a) $(lib_so) $(tcl_only_lib_so) +- $(INSTALL_DATA) $(lib_a) $(INSTALL_ROOT)$(libdir) ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(libdir) ++ $(INSTALL) -d $(INSTALL_ROOT)$(bindir) ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(libdir) $(lib_a) + $(RANLIB) $(INSTALL_ROOT)$(libdir)/$(lib_a) +- $(INSTALL_DATA) $(tcl_only_lib_a) $(INSTALL_ROOT)$(libdir) ++ $(INSTALL_DATA) -t $(INSTALL_ROOT)$(libdir) $(tcl_only_lib_a) + $(RANLIB) $(INSTALL_ROOT)$(libdir)/$(tcl_only_lib_a) +- $(INSTALL) -m 0755 $(lib_so) $(INSTALL_ROOT)$(bindir) +- $(INSTALL) -m 0755 $(tcl_only_lib_so) $(INSTALL_ROOT)$(bindir) +- +-mkdirs: +- @for i in $(instdirs) ; do \ +- if test -d $(INSTALL_ROOT)$$i ; then \ +- : ; \ +- else \ +- echo " mkdir $(INSTALL_ROOT)$$i" ; \ +- mkdir $(INSTALL_ROOT)$$i ; \ +- fi ; \ +- done ++ $(INSTALL) -m 0755 -t $(INSTALL_ROOT)$(bindir) $(lib_so) $(tcl_only_lib_so) + + install-headers: ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(incdir) + @for i in $(headers) ; do \ + echo "installing $$i..." ; \ +- $(INSTALL_DATA) -m 0444 $$i $(INSTALL_ROOT)$(incdir) ; \ ++ $(INSTALL_DATA) -m 0444 -t $(INSTALL_ROOT)$(incdir) $$i ; \ + done + + lint: +diff -urpN blt2.4z-8.5.2.orig/src/Makefile.in blt2.4z-8.5.2/src/Makefile.in +--- blt2.4z-8.5.2.orig/src/Makefile.in 2014-07-05 01:46:30.059060782 -0700 ++++ blt2.4z-8.5.2/src/Makefile.in 2014-07-05 01:43:08.459033510 -0700 +@@ -29,8 +29,6 @@ scriptdir = $(exec_prefix)/lib + prefix = @prefix@ + srcdir = @srcdir@ + +-instdirs = $(prefix) $(exec_prefix) $(bindir) $(libdir) $(incdir) +- + # ------------------------------------------------------------------------ + # Directories containing Tcl and Tk include files and libraries + # ------------------------------------------------------------------------ +@@ -193,35 +191,27 @@ $(tcl_only_lib_a): $(TCL_ONLY_OBJS) blt + $(AR) $@ $(TCL_ONLY_OBJS) bltInit_tclonly.o + $(RANLIB) $@ + +-install: mkdirs install-lib install-demo install-headers ++install: install-lib install-demo install-headers + + install-demo: $(bltwish) $(bltsh) +- $(INSTALL) -m 0755 $(bltwish) $(INSTALL_ROOT)$(bindir) +- $(INSTALL) -m 0755 $(bltsh) $(INSTALL_ROOT)$(bindir) ++ $(INSTALL) -d $(INSTALL_ROOT)$(bindir) ++ $(INSTALL) -m 0755 -t $(INSTALL_ROOT)$(bindir) $(bltwish) $(bltsh) + + install-lib: $(lib_a) $(tcl_only_lib_a) +- $(INSTALL_DATA) $(lib_a) $(INSTALL_ROOT)$(libdir)/$(libvers_a) ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(libdir) ++ $(INSTALL_DATA) -T $(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) -T $(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) + (cd shared; $(MAKE) install) + +-mkdirs: +- @for i in $(instdirs) ; do \ +- if test -d $(INSTALL_ROOT)$$i ; then \ +- : ; \ +- else \ +- echo " mkdir $(INSTALL_ROOT)$$i" ; \ +- mkdir $(INSTALL_ROOT)$$i ; \ +- fi ; \ +- done +- + install-headers: ++ $(INSTALL_DATA) -d $(INSTALL_ROOT)$(incdir) + @for i in $(headers) ; do \ + echo "installing $$i..." ; \ +- $(INSTALL_DATA) -m 0444 $$i $(INSTALL_ROOT)$(incdir) ; \ ++ $(INSTALL_DATA) -m 0444 -t $(INSTALL_ROOT)$(incdir) $$i ; \ + done + + lint: +diff -urpN blt2.4z-8.5.2.orig/src/shared/Makefile.in blt2.4z-8.5.2/src/shared/Makefile.in +--- blt2.4z-8.5.2.orig/src/shared/Makefile.in 2014-07-05 01:46:30.059060782 -0700 ++++ blt2.4z-8.5.2/src/shared/Makefile.in 2014-07-05 01:51:45.929971311 -0700 +@@ -26,8 +26,6 @@ libdir = @libdir@ + bindir = $(exec_prefix)/bin + srcdir = @srcdir@/.. + +-instdirs = $(exec_prefix) $(libdir) +- + scriptdir = @BLT_LIBRARY@ + + LIBS = @LIB_SPECS@ @EXTRA_LIB_SPECS@ +@@ -162,25 +160,16 @@ $(tcl_only_lib_so): $(TCL_ONLY_OBJS) blt + $(SHLIB_LD) $(SHLIB_LD_FLAGS) $(LDFLAGS) -o $@ bltInit_tclonly.o $(TCL_ONLY_OBJS) \ + $(SHLIB_TCL_ONLY_LIB_SPECS) $(LIBS) + +-install: mkdirs install-lib install-demo ++install: install-lib install-demo + + install-demo: $(bltwish) +- $(INSTALL) -m 0755 bltwish$(version) $(INSTALL_ROOT)$(bindir) +- $(INSTALL) -m 0755 bltsh$(version) $(INSTALL_ROOT)$(bindir) ++ $(INSTALL) -d $(INSTALL_ROOT)$(bindir) ++ $(INSTALL) -m 0755 -t $(INSTALL_ROOT)$(bindir) bltwish$(version) bltsh$(version) + + install-lib: $(lib_so) $(tcl_only_lib_so) +- $(INSTALL) -m 0755 $(lib_so) $(INSTALL_ROOT)$(libdir) +- $(INSTALL) -m 0755 $(tcl_only_lib_so) $(INSTALL_ROOT)$(libdir) ++ $(INSTALL) -d $(INSTALL_ROOT)$(libdir) ++ $(INSTALL) -m 0755 -t $(INSTALL_ROOT)$(libdir) $(lib_so) $(tcl_only_lib_so) + +-mkdirs: +- @for i in $(instdirs) ; do \ +- if test -d $(INSTALL_ROOT)$$i ; then \ +- : ;\ +- else \ +- echo " mkdir $(INSTALL_ROOT)$$i" ; \ +- mkdir $(INSTALL_ROOT)$$i ; \ +- fi ; \ +- done + clean: + $(RM) $(OBJS) $(lib_so) $(tcl_only_lib_so) $(bltwish) $(bltsh) \ + *pure* .pure* bltInit_tcltk.o bltInit_tclonly.o \ |