mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-22 20:41:26 +00:00
Code Issues Releases Activity

Now we use system nss.

Browse Source
This commit is contained in:
Maho Nakata 2014-02-03 11:31:17 +00:00
parent 833a82123a
commit 73e752268b
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=342426
2 changed files with 49 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
editors/openoffice-devel/Makefile
View File

@ -4,6 +4,7 @@
PORTNAME= apache-openoffice
PORTVERSION= 4.0.${SVNREVISION}
PORTEPOCH= 1
PORTREVISION= 1
CATEGORIES= editors java
MASTER_SITES= ${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR= maho/openoffice
@ -24,7 +25,7 @@ USE_XORG= x11 ice xaw xau xext xrender xrandr \
xi xt xcursor xdamage xcomposite xfixes
USE_GL= gl glu
USE_GSTREAMER= yes
#USE_GCC= 4.6+
USE_GCC= 4.6+
USE_PYTHON= yes
USE_BZIP2= yes
USES+= bison perl5 gmake pkgconfig
@ -124,7 +125,8 @@ LIB_DEPENDS= cairo:${PORTSDIR}/graphics/cairo \
CoinMP:${PORTSDIR}/math/coinmp \
serf-1:${PORTSDIR}/www/serf \
freetype:${PORTSDIR}/print/freetype2 \
textcat:${PORTSDIR}/textproc/libtextcat
textcat:${PORTSDIR}/textproc/libtextcat \
nss3:${PORTSDIR}/security/nss
BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip \
${LOCALBASE}/bin/unzip:${PORTSDIR}/archivers/unzip \
@ -205,7 +207,8 @@ CONFIGURE_ARGS+= --enable-verbose \
--with-system-beanshell \
--with-beanshell-jar=${JAVALIBDIR}/bsh.jar \
--without-fonts \
--with-system-serf
--with-system-serf \
--with-system-nss
# --with-system-jpeg
# --enable-pdfimport
# --without-stlport --disable-mozilla \

43
editors/openoffice-devel/files/patch-nss Normal file
View File

@ -0,0 +1,43 @@
--- set_soenv.in~ 2014-01-22 15:21:04.000000000 +0900
+++ set_soenv.in 2014-02-03 12:12:03.000000000 +0900
@@ -1864,6 +1864,8 @@
ToFile( "SYSTEM_STDLIBS", "@SYSTEM_STDLIBS@", "e" );
ToFile( "SYSTEM_ZLIB", "@SYSTEM_ZLIB@", "e" );
ToFile( "SYSTEM_NSS", "@SYSTEM_NSS@", "e" );
+ToFile( "NSS_CFLAGS", "@NSS_CFLAGS@", "e" );
+ToFile( "NSS_LIBS", "@NSS_LIBS@", "e" );
ToFile( "SYSTEM_OPENSSL", "@SYSTEM_OPENSSL@", "e" );
ToFile( "OPENSSL_CFLAGS", "@OPENSSL_CFLAGS@", "e" );
ToFile( "OPENSSL_LIBS", "@OPENSSL_LIBS@", "e" );
--- xmlsecurity/util/makefile.mk 2014-02-03 15:50:50.000000000 +0900
+++ xmlsecurity/util/makefile.mk 2014-02-03 16:03:11.000000000 +0900
@@ -98,12 +98,12 @@
SHL2STDLIBS +=-ldl
.ENDIF
-.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"!="YES"
+.IF "$(ENABLE_NSS_MODULE)"=="YES" && "$(SYSTEM_NSS)"=="YES"
.IF "$(NSPR_LIB)" != ""
SHL2STDLIBS += $(NSPR_LIB)
.ENDIF
-.IF "$(NSS_LIB)" != ""
-SHL2STDLIBS += $(NSS_LIB)
+.IF "$(NSS_LIBS)" != ""
+SHL2STDLIBS += $(NSS_LIBS)
.ENDIF
.ENDIF
--- xmlsecurity/source/xmlsec/nss/makefile.mk 2014-01-22 15:07:16.000000000 +0900
+++ xmlsecurity/source/xmlsec/nss/makefile.mk 2014-02-03 16:13:30.000000000 +0900
@@ -48,8 +48,8 @@
NSPR_INC = $(MOZ_INC)$/nspr
.ELSE
# TODO: better use pkgconfig to find the proper system include path
-NSS_INC = /usr/include/nss3
-NSPR_INC = /usr/include/nspr4
+NSS_INC = $(NSS_CFLAGS)
+NSPR_INC = $(NSS_CFLAGS)
.ENDIF
.IF "$(GUI)" == "WNT"