View | Details | Raw Unified | Return to bug 236780
Collapse All | Expand All

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

Return to bug 236780