From 2586a2600287f624610b2acaa6e742fd65d53438 Mon Sep 17 00:00:00 2001 From: sunpoet Date: Fri, 12 Apr 2019 20:58:14 +0000 Subject: Update to 3.4.12 - Update WWW Changes: https://metacpan.org/changes/release/OCBNET/CSS-Sass-3.4.12 --- textproc/p5-CSS-Sass/Makefile | 2 +- textproc/p5-CSS-Sass/distinfo | 6 +- textproc/p5-CSS-Sass/files/patch-Makefile.PL | 86 +++++++++++++++++++++++++--- textproc/p5-CSS-Sass/pkg-descr | 2 +- 4 files changed, 82 insertions(+), 14 deletions(-) (limited to 'textproc') diff --git a/textproc/p5-CSS-Sass/Makefile b/textproc/p5-CSS-Sass/Makefile index 4b556f939fcf..db9a77b94f2d 100644 --- a/textproc/p5-CSS-Sass/Makefile +++ b/textproc/p5-CSS-Sass/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= CSS-Sass -PORTVERSION= 3.4.10 +PORTVERSION= 3.4.12 CATEGORIES= textproc perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- diff --git a/textproc/p5-CSS-Sass/distinfo b/textproc/p5-CSS-Sass/distinfo index 5b5986625bbc..89d451ce4ac6 100644 --- a/textproc/p5-CSS-Sass/distinfo +++ b/textproc/p5-CSS-Sass/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1548074445 -SHA256 (CSS-Sass-3.4.10.tar.gz) = 10fc854182dfc0e97bf06823c9dc79dcf9c2fd48fd1581d55b25a8517a2eb2be -SIZE (CSS-Sass-3.4.10.tar.gz) = 2577824 +TIMESTAMP = 1554992339 +SHA256 (CSS-Sass-3.4.12.tar.gz) = e10f9da6b3729a4f481a2bd4365118d1f6e148107a2e1d6636616a1d8437de98 +SIZE (CSS-Sass-3.4.12.tar.gz) = 2456595 diff --git a/textproc/p5-CSS-Sass/files/patch-Makefile.PL b/textproc/p5-CSS-Sass/files/patch-Makefile.PL index e8e8e44f0089..b881dd8fbdd7 100644 --- a/textproc/p5-CSS-Sass/files/patch-Makefile.PL +++ b/textproc/p5-CSS-Sass/files/patch-Makefile.PL @@ -1,16 +1,76 @@ ---- Makefile.PL.orig 2018-01-12 02:11:18 UTC +--- Makefile.PL.orig 2019-04-10 22:57:22 UTC +++ Makefile.PL -@@ -333,7 +333,8 @@ my $orig = \&ExtUtils::MM_Unix::c_o; - foreach (@rv) { +@@ -374,8 +374,8 @@ my $orig = \&ExtUtils::MM_Unix::c_o; + # sometimes g++, thus we need to force the + # compiler to compile in the specific language + # fixes https://github.com/sass/perl-libsass/issues/38 +- s/\$\*\.c\s*(?=\n|\r|\Z)/-xc \$\*\.c/g; +- s/\$\*\.c(pp|xx)\s*(?=\n|\r|\Z)/-xc++ \$\*\.c$1/g; ++ s/\$\*\.c\s*(?=\n|\r|\Z)/-xc \$\*\.c -o \$\*.o/g; ++ s/\$\*\.c(pp|xx)\s*(?=\n|\r|\Z)/-xc++ \$\*\.c$1 -o \$\*.o/g; # add c++0x flag only for cpp files # otherwise XS perl handshake fails -- s/\$\*\.c(pp|xx)\s*(?=\n|\r|\Z)/-xc++ -std=c++0x \$\*\.c$1/g -+ s/\$\*\.c\s*(?=\n|\r|\Z)/\$\*\.c$1 -o \$\*.o/g; -+ s/\$\*\.c(pp|xx)\s*(?=\n|\r|\Z)/-xc++ -std=c++0x \$\*\.c$1 -o \$\*\.o/g; + s/\$\*\.c(pp|xx)\s*(?=\n|\r|\Z)/-std=c++0x \$\*\.c$1/g +@@ -607,7 +607,7 @@ my $reported = 0; + sub compile_lib { + my ($mm, $name) = @_; + my @args = ( +- '$(LD) $(OPTIMIZE) -lstdc++ -shared', "-o ${name}", ++ '$(LD) $(OPTIMIZE) -shared', "-o ${name}", + ); + # need special path on windows and MSVC (cl) + if ($^O eq 'MSWin32' && $Config{cc} =~ /^cl/) { +@@ -644,10 +644,10 @@ sub libsass_sassc + else { + # create the sassc executable by linking against sassc and libsass + push @ret, "\t" . '$(LD) -o $(SASSC_EXE) $(LDFLAGS) $(SASSC_OBJ) $(LIBS)' +- . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_BIN) -lsass -lstdc++') +- . ' $(OPTIMIZE) -lstdc++ -std=c++0x ' . join(" ", @libs) ++ . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_ARCHLIB) -lsass') ++ . ' $(OPTIMIZE) -std=c++0x ' . join(" ", @libs) + . ($^O eq "linux" ? ' -ldl' : '') +- . ' -Wl,-rpath,$(INST_BIN)'; ++ . ' -Wl,-rpath,$(INST_ARCHLIB)'; } - return @rv; - }; -@@ -719,7 +720,7 @@ sub libsass_plugin_glob + # add target to virtual "pure_all" + push @cleanups, '$(SASSC_OBJ)'; +@@ -662,7 +662,7 @@ sub libsass_lib + # register our source and object files + my @ret = 'LIBSASS_OBJ = ' . join(" ", @SOURCES); + # location of the created object +- push @ret, 'LIBSASS_LIB = $(INST_BIN)/libsass.$(SO)'; ++ push @ret, 'LIBSASS_LIB = $(INST_ARCHLIB)/libsass.$(SO)'; + # create the target for the makefile + push @ret, '$(LIBSASS_LIB): $(LIBSASS_OBJ)'; + # create the libsass shared library by linking against all objects +@@ -686,7 +686,7 @@ sub libsass_plugin_math + push @ret, "\t" . '$(MKPATH) $(INST_ARCHAUTODIR)/plugins/math'; + # create the libsass shared library by linking against all objects + push @ret, "\t" . compile_lib($_[0], '$(MATH_LIB)') . ' $(MATH_OBJ)' +- . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_BIN) -lsass -lstdc++'); ++ . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_ARCHLIB) -lsass'); + # add target to virtual "pure_all" + push @cleanups, '$(MATH_OBJ)'; + push @cleanups, '$(MATH_LIB)'; +@@ -706,7 +706,7 @@ sub libsass_plugin_img_size + push @ret, "\t" . '$(MKPATH) $(INST_ARCHAUTODIR)/plugins/img-size'; + # create the libsass shared library by linking against all objects + push @ret, "\t" . compile_lib($_[0], '$(IMG_SIZE_LIB)') . ' $(IMG_SIZE_OBJ)' +- . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_BIN) -lsass -lstdc++'); ++ . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_ARCHLIB) -lsass'); + # add target to virtual "pure_all" + push @cleanups, '$(IMG_SIZE_OBJ)'; + push @cleanups, '$(IMG_SIZE_LIB)'; +@@ -731,7 +731,7 @@ sub libsass_plugin_digest + push @ret, "\t" . '$(MKPATH) $(INST_ARCHAUTODIR)/plugins/digest'; + # create the libsass shared library by linking against all objects + push @ret, "\t" . compile_lib($_[0], '$(DIGEST_LIB)') . ' $(DIGEST_OBJ)' +- . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_BIN) -lsass -lstdc++'); ++ . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_ARCHLIB) -lsass'); + # add target to virtual "pure_all" + push @cleanups, '$(DIGEST_OBJ)'; + push @cleanups, '$(DIGEST_LIB)'; +@@ -749,14 +749,14 @@ sub libsass_plugin_glob # special case (does not compile with perl inc path) # readdir and friends were not available from headers push @ret, 'plugins/glob/vendor/FS$(OBJ_EXT):'; @@ -19,3 +79,11 @@ # create the target for the makefile push @ret, '$(GLOB_LIB): $(LIBSASS_LIB) $(GLOB_OBJ)'; # make sure the plugin path exists for output + push @ret, "\t" . '$(MKPATH) $(INST_ARCHAUTODIR)/plugins/glob'; + # create the libsass shared library by linking against all objects + push @ret, "\t" . compile_lib($_[0], '$(GLOB_LIB)') . ' $(GLOB_OBJ)' +- . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_BIN) -lsass -lstdc++'); ++ . ' ' . ($static ? '$(LIBSASS_OBJ)' : '-L$(INST_ARCHLIB) -lsass'); + # add target to virtual "pure_all" + push @cleanups, '$(GLOB_OBJ)'; + push @cleanups, '$(GLOB_LIB)'; diff --git a/textproc/p5-CSS-Sass/pkg-descr b/textproc/p5-CSS-Sass/pkg-descr index f8a25cd4cdc0..aa61130403d1 100644 --- a/textproc/p5-CSS-Sass/pkg-descr +++ b/textproc/p5-CSS-Sass/pkg-descr @@ -2,4 +2,4 @@ CSS::Sass provides a perl interface to LibSass, a nearly complete Sass compiler written in C++. It is currently at ruby sass 3.4 feature parity and heading towards 3.5 compatibility. It can compile .scss and .sass files. -WWW: https://metacpan.org/release/CSS-Sass +WWW: https://metacpan.org/release/OCBNET/CSS-Sass-3.4.12 -- cgit