Index: Makefile =================================================================== --- Makefile (revision 522215) +++ Makefile (working copy) @@ -12,17 +12,18 @@ LICENSE= APACHE20 -ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS= amd64 powerpc64 LIB_DEPENDS= libcurl.so:ftp/curl \ libhwloc.so:devel/hwloc \ - libluajit-5.1.so:lang/luajit \ libpcre.so:devel/pcre \ libxml2.so:textproc/libxml2 \ - libbrotlienc.so:archivers/brotli + libbrotlienc.so:archivers/brotli \ + ${LIB_DEPENDS_${ARCH}} +LIB_DEPENDS_amd64= libluajit-5.1.so:lang/luajit -USES= compiler:c++17-lang cpe gmake libtool ncurses pathfix \ - perl5 pkgconfig sqlite ssl tar:bzip2 tcl +USES= compiler:c++17-lang cpe gmake libtool localbase ncurses \ + pathfix perl5 pkgconfig sqlite ssl tar:bzip2 tcl CPE_VENDOR= apache CPE_PRODUCT= traffic_server @@ -38,11 +39,8 @@ GROUPS= ${WWWGRP} PLIST_SUB= WWWOWN="${WWWOWN}" WWWGRP="${WWWGRP}" PORTVERSION="${PORTVERSION}" -LIBS+= -L${LOCALBASE}/lib -CONFIGURE_ARGS= --with-libxml2=${LOCALBASE} \ - --with-pcre=${LOCALBASE} \ +CONFIGURE_ARGS= --with-pcre=${LOCALBASE} \ --with-openssl=${OPENSSLBASE} \ - --with-xml=libxml2 \ --with-tcl=${TCL_LIBDIR} \ --localstatedir=/var \ --with-user=${USERS} \ @@ -54,6 +52,7 @@ OPTIONS_DEFINE= DOCS WCCP MEMCACHED IMAGEMAGICK X11 OPTIONS_SUB= yes +PLIST_SUB+= ARCH="${ARCH:S/powerpc64/powerpc/}" WCCP_DESC= Enable WCCPv2 protocol WCCP_CONFIGURE_ENABLE= wccp @@ -64,6 +63,12 @@ .include +.if ${ARCH} == amd64 +PLIST_SUB+= LUAJIT="" +.else +PLIST_SUB+= LUAJIT="@comment " +.endif + .if ${PORT_OPTIONS:MMEMCACHED} LIB_DEPENDS+= libmemcached.so:databases/libmemcached PLIST_SUB+= MEMCACHED="" @@ -102,6 +107,6 @@ ${MKDIR} ${STAGEDIR}${ETCDIR}/snapshots (cd ${STAGEDIR}${ETCDIR} && for f in *.config *.yaml; do ${MV} $$f $$f.sample; done) ${SED} -i '' -e 's|^${STAGEDIR}||g' \ - ${STAGEDIR}${PREFIX}/lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist + ${STAGEDIR}${PREFIX}/lib/perl5/${ARCH:S/powerpc64/powerpc/}-freebsd-thread-multi/auto/Apache/TS/.packlist .include Index: files/patch-configure =================================================================== --- files/patch-configure (nonexistent) +++ files/patch-configure (working copy) @@ -0,0 +1,13 @@ +--- configure.orig 2020-01-03 10:44:56 UTC ++++ configure +@@ -23922,7 +23922,9 @@ $as_echo "$as_me: adding ${ssldir}/lib64 to RPATH" >&6 + + fi + else +- OPENSSL_LDFLAGS="-L$ssldir/lib" ++ if [ $ssldir != "/usr" ]; then ++ OPENSSL_LDFLAGS="-L$ssldir/lib" ++ fi + if test "$overriden_with_ssl"; then + + { $as_echo "$as_me:${as_lineno-$LINENO}: adding ${ssldir}/lib to RPATH" >&5 Property changes on: files/patch-configure ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: pkg-plist =================================================================== --- pkg-plist (revision 522215) +++ pkg-plist (working copy) @@ -156,12 +156,12 @@ libexec/trafficserver/test_cppapi.so libexec/trafficserver/tls_bridge.so libexec/trafficserver/traffic_dump.so -libexec/trafficserver/tslua.so +%%LUAJIT%%libexec/trafficserver/tslua.so libexec/trafficserver/tsmemcache.so libexec/trafficserver/url_sig.so libexec/trafficserver/xdebug.so -lib/perl5/amd64-freebsd-thread-multi/auto/Apache/TS/.packlist -lib/perl5/amd64-freebsd-thread-multi/perllocal.pod +lib/perl5/%%ARCH%%-freebsd-thread-multi/auto/Apache/TS/.packlist +lib/perl5/%%ARCH%%-freebsd-thread-multi/perllocal.pod lib/perl5/Apache/TS.pm lib/perl5/Apache/TS/AdminClient.pm lib/perl5/Apache/TS/Config.pm