From a73d9ee9a90d3ca67330c1aeccf6aeac37add65b Mon Sep 17 00:00:00 2001 From: knu <knu@FreeBSD.org> Date: Wed, 27 Nov 2002 17:14:23 +0000 Subject: Fix the build of lang/ruby_static-devel, i.e. the build of archiver/ruby-zlib with lang/ruby-devel in the correct way. The cause of this problem is that FreeBSD's make(1) got a bit too sensitive about a mixture of `target:' and `target::'. --- archivers/ruby-zlib/Makefile | 3 +++ lang/ruby-devel/files/patch-mkmf.rb | 33 --------------------------------- lang/ruby18/files/patch-mkmf.rb | 33 --------------------------------- 3 files changed, 3 insertions(+), 66 deletions(-) delete mode 100644 lang/ruby-devel/files/patch-mkmf.rb delete mode 100644 lang/ruby18/files/patch-mkmf.rb diff --git a/archivers/ruby-zlib/Makefile b/archivers/ruby-zlib/Makefile index 2a33e87..e0b6726 100644 --- a/archivers/ruby-zlib/Makefile +++ b/archivers/ruby-zlib/Makefile @@ -23,6 +23,9 @@ INSTALL_TARGET= site-install DOCS_EN= ChangeLog zlib.rd.en zlib.en.html DOCS_JA= zlib.rd.ja zlib.ja.html +post-extract: + ${RM} ${WRKSRC}/depend + post-install: .if !defined(NOPORTDOCS) ${MKDIR} ${RUBY_MODDOCDIR}/ja diff --git a/lang/ruby-devel/files/patch-mkmf.rb b/lang/ruby-devel/files/patch-mkmf.rb deleted file mode 100644 index d121d10..0000000 --- a/lang/ruby-devel/files/patch-mkmf.rb +++ /dev/null @@ -1,33 +0,0 @@ -Index: lib/mkmf.rb -=================================================================== -RCS file: /src/ruby/lib/mkmf.rb,v -retrieving revision 1.116 -diff -u -1 -r1.116 mkmf.rb ---- lib/mkmf.rb 14 Nov 2002 13:51:19 -0000 1.116 -+++ lib/mkmf.rb 22 Nov 2002 12:38:13 -0000 -@@ -688,7 +688,6 @@ - mfile.print %{ --all: $(DLLIB) -+CLEANLIBS = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB) -+CLEANOBJS = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}" - --clean:: -- @$(RM) "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB) -- @$(RM) "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}" -+all: $(DLLIB) - } -@@ -850,6 +849,6 @@ - CLEANINGS = " --clean:: -- @$(RM) $(CLEANFILES) -+clean: -+ @$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) - --distclean:: clean -+distclean: clean - @$(RM) Makefile extconf.h conftest.* mkmf.log -@@ -857,3 +856,3 @@ - --realclean:: distclean -+realclean: distclean - " diff --git a/lang/ruby18/files/patch-mkmf.rb b/lang/ruby18/files/patch-mkmf.rb deleted file mode 100644 index d121d10..0000000 --- a/lang/ruby18/files/patch-mkmf.rb +++ /dev/null @@ -1,33 +0,0 @@ -Index: lib/mkmf.rb -=================================================================== -RCS file: /src/ruby/lib/mkmf.rb,v -retrieving revision 1.116 -diff -u -1 -r1.116 mkmf.rb ---- lib/mkmf.rb 14 Nov 2002 13:51:19 -0000 1.116 -+++ lib/mkmf.rb 22 Nov 2002 12:38:13 -0000 -@@ -688,7 +688,6 @@ - mfile.print %{ --all: $(DLLIB) -+CLEANLIBS = "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB) -+CLEANOBJS = "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}" - --clean:: -- @$(RM) "$(TARGET).{lib,exp,il?,tds,map}" $(DLLIB) -- @$(RM) "*.{#{$OBJEXT},#{$LIBEXT},s[ol],pdb,bak}" -+all: $(DLLIB) - } -@@ -850,6 +849,6 @@ - CLEANINGS = " --clean:: -- @$(RM) $(CLEANFILES) -+clean: -+ @$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES) - --distclean:: clean -+distclean: clean - @$(RM) Makefile extconf.h conftest.* mkmf.log -@@ -857,3 +856,3 @@ - --realclean:: distclean -+realclean: distclean - " -- cgit v1.1