Attachment 203125 Details for Bug 236780 – Patch against /usr/ports

[patch] Patch against /usr/ports

tomcat-native-1.2.21.patch (text/plain), 2.78 KB, created by Michael Osipov on 2019-03-25 12:32:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Osipov

Created: 2019-03-25 12:32:02 UTC

Size: 2.78 KB

patch

obsolete

>Index: www/tomcat-native/Makefile
>===================================================================
>--- www/tomcat-native/Makefile	(Revision 496560)
>+++ www/tomcat-native/Makefile	(Arbeitskopie)
>@@ -2,8 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	tomcat-native
>-PORTVERSION=	1.2.16
>-PORTREVISION=	2
>+PORTVERSION=	1.2.21
> CATEGORIES=	www java
> MASTER_SITES=	APACHE/tomcat/tomcat-connectors/native/${PORTVERSION}/source
> DISTNAME=	${PORTNAME}-${PORTVERSION}-src
>@@ -29,9 +28,9 @@
> PLIST_FILES=	lib/libtcnative-1.a \
> 		lib/libtcnative-1.so \
> 		lib/libtcnative-1.so.0 \
>-		lib/libtcnative-1.so.0.2.16
>+		lib/libtcnative-1.so.0.2.21
> 
> post-install:
>-	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.16
>+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtcnative-1.so.0.2.21
> 
> .include <bsd.port.mk>
>Index: www/tomcat-native/distinfo
>===================================================================
>--- www/tomcat-native/distinfo	(Revision 496560)
>+++ www/tomcat-native/distinfo	(Arbeitskopie)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1519390783
>-SHA256 (tomcat-native-1.2.16-src.tar.gz) = 1e9409584c19d868efd056f7dbafc767a630a5a95ee3cd516de8b7aaa4cd97b6
>-SIZE (tomcat-native-1.2.16-src.tar.gz) = 405109
>+TIMESTAMP = 1553515413
>+SHA256 (tomcat-native-1.2.21-src.tar.gz) = 05bba41671cc91c531c366a9ccd930b38a107a0212c73181961f3cda508d5007
>+SIZE (tomcat-native-1.2.21-src.tar.gz) = 418909
>Index: www/tomcat-native/files/patch-Makefile.in
>===================================================================
>--- www/tomcat-native/files/patch-Makefile.in	(Revision 496560)
>+++ www/tomcat-native/files/patch-Makefile.in	(Arbeitskopie)
>@@ -1,6 +1,6 @@
>---- Makefile.in.orig	2017-08-23 23:12:17 UTC
>+--- Makefile.in.orig	2018-12-20 18:48:22 UTC
> +++ Makefile.in
>-@@ -49,13 +49,9 @@
>+@@ -49,13 +49,9 @@ TARGETS = $(TARGET_LIB)
>  @INCLUDE_RULES@
>  @INCLUDE_OUTPUTS@
>  
>@@ -7,17 +7,16 @@
> -ifneq ($(CC_OLD),$(CC))
> -    CC=$(CC_OLD)
> -endif
>--
>++CC=$(CC_OLD)
>+ 
> -ifneq ($(LIBTOOL_OLD),$(LIBTOOL))
> -    LIBTOOL=$(LIBTOOL_OLD)
> -endif
>-+CC=$(CC_OLD)
>-+
> +LIBTOOL=$(LIBTOOL_OLD)
>  
>- LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
>+ LINK          = $(LIBTOOL) $(LTFLAGS) --mode=link --tag=CC $(LT_LDFLAGS) $(COMPILE) -version-info $(TCNATIVE_LIBTOOL_VERSION) $(ALL_LDFLAGS) -o $@
>  CLEAN_SUBDIRS = test
>-@@ -77,12 +73,7 @@
>+@@ -77,13 +73,7 @@ top_blddir=@abs_builddir@
>  
>  
>  install: $(TARGET_LIB)
>@@ -24,6 +23,7 @@
> -	$(APR_MKDIR) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/pkgconfig \
> -		     $(DESTDIR)$(libdir) $(DESTDIR)$(bindir)
> -	$(INSTALL_DATA) tcnative.pc $(DESTDIR)$(libdir)/pkgconfig/$(TCNATIVE_PCFILE)
>+-	$(INSTALL_DATA) include/*.h $(DESTDIR)$(includedir)
> -	list='$(INSTALL_SUBDIRS)'; for i in $$list; do \
> -		( cd $$i ; $(MAKE) DESTDIR=$(DESTDIR) install ); \
> -	done

Actions: View | Diff

Attachments on bug 236780: 203125