cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove NO_SHARED_LIBS and merge PFRAG.shared into PLIST; ok sthen@

Browse Source
This commit is contained in:
naddy 2016-03-11 23:03:21 +00:00
parent c1bb2926ea
commit 061bb68878
8 changed files with 25 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
net/ssvnc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.29 2015/02/16 22:57:11 naddy Exp $
# $OpenBSD: Makefile,v 1.30 2016/03/11 23:03:21 naddy Exp $
COMMENT-gui = enhanced TightVNC client GUI and wrappers
COMMENT-main = enhanced TightVNC client
@ -10,7 +10,7 @@ PKGNAME = ssvnc-$V
EPOCH = 0
FULLPKGNAME-gui = ssvnc-$V
FULLPKGNAME-main = ssvnc-viewer-$V
REVISION-gui = 1
REVISION-gui = 2
REVISION-main = 0
CATEGORIES = net x11
@ -26,8 +26,7 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ssvnc/}
MULTI_PACKAGES =-main -gui
MAKE_ENV = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
NO_SHARED_LIBS=${NO_SHARED_LIBS}
MAKE_ENV = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
WRKDIST = ${WRKDIR}/ssvnc-$V

30
net/ssvnc/patches/patch-vncstorepw_Makefile
View File

@ -1,30 +0,0 @@
$OpenBSD: patch-vncstorepw_Makefile,v 1.1 2009/03/27 02:04:44 sthen Exp $
--- vncstorepw/Makefile.orig Mon Nov 10 22:54:24 2008
+++ vncstorepw/Makefile Wed Mar 25 23:37:44 2009
@@ -3,8 +3,10 @@
EPATH = /usr/ccs/bin:/usr/sfw/bin:/usr/local/bin
CMD = vncstorepw
+.if ${NO_SHARED_LIBS:L} == "no"
UNWRAP = unwrap.so
LIMACC = lim_accept.so
+.endif
ULTDSM = ultravnc_dsm_helper
# gcc must be used:
@@ -17,6 +19,7 @@ $(CMD): vncauth.o vncstorepw.o d3des.o
PATH=$$PATH:$(EPATH) strip $(CMD)
@ls -l $(CMD)
+.if ${NO_SHARED_LIBS:L} == "no"
$(UNWRAP): unwrap.c
if [ `uname` = "Darwin" ]; then \
PATH=$$PATH:$(EPATH) $(CC) -o $(UNWRAP) -dynamiclib -fPIC unwrap.c; \
@@ -32,6 +35,7 @@ $(LIMACC): lim_accept.c
PATH=$$PATH:$(EPATH) $(CC) -o $(LIMACC) -shared -fPIC -nostartfiles lim_accept.c; \
fi
@ls -l $(LIMACC)
+.endif
# use: LD_SSL='-L/usr/foo/lib' CPP_SSL='-I /usr/foo/include':

3
net/ssvnc/pkg/PFRAG.shared-gui
View File

@ -1,3 +0,0 @@
@comment $OpenBSD: PFRAG.shared-gui,v 1.1 2009/01/13 15:08:27 sthen Exp $
lib/ssvnc/lim_accept.so
lib/ssvnc/unwrap.so

5
net/ssvnc/pkg/PLIST-gui
View File

@ -1,8 +1,9 @@
@comment $OpenBSD: PLIST-gui,v 1.6 2013/04/20 16:26:25 sthen Exp $
@comment $OpenBSD: PLIST-gui,v 1.7 2016/03/11 23:03:21 naddy Exp $
bin/sshvnc
bin/ssvnc
bin/tsvnc
lib/ssvnc/
lib/ssvnc/lim_accept.so
lib/ssvnc/sshvnc
lib/ssvnc/ssvnc
@comment lib/ssvnc/ssvnc.beforesubst
@ -10,13 +11,13 @@ lib/ssvnc/ssvnc
lib/ssvnc/ssvnc_cmd
lib/ssvnc/tsvnc
@bin lib/ssvnc/ultravnc_dsm_helper
lib/ssvnc/unwrap.so
lib/ssvnc/util/
lib/ssvnc/util/ss_vncviewer
lib/ssvnc/util/ssvnc.tcl
@comment lib/ssvnc/util/ssvnc.tcl.orig
lib/ssvnc/util/stunnel-server.conf
@man man/man1/ssvnc.1
%%SHARED%%
share/applications/ssvnc.desktop
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

15
security/openssl/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.18 2016/03/07 10:58:49 sthen Exp $
# $OpenBSD: Makefile,v 1.19 2016/03/11 23:03:21 naddy Exp $
COMMENT= TLS/SSL library and tools
V= 1.0.2g
REVISION= 0
REVISION= 1
DISTNAME= openssl-$V
PKGNAME= openssl-$V
@ -33,7 +33,8 @@ CONFIGURE_ARGS+= --prefix=${PREFIX} \
--openssldir=${PREFIX}/share/eopenssl \
--install_prefix=${WRKINST} \
no-threads no-krb5 \
no-rc5 no-ssl2 no-ssl3
no-rc5 no-ssl2 no-ssl3 \
shared
# install to unusual directory name - this port is *not* intended to be
# picked up by configure scripts without explicitly CPPFLAGS/LDFLAGS.
@ -47,14 +48,6 @@ MAKE_FLAGS+= CC="${CC}" \
SHLIB_MINOR=${SHLIBVER:E}
MAKE_ENV+= LIBRPATH="${TRUEPREFIX}/lib/eopenssl"
.include <bsd.port.arch.mk>
.if ${NO_SHARED_LIBS} == "Yes"
CONFIGURE_ARGS+= no-shared
.else
CONFIGURE_ARGS+= shared
.endif
post-configure:
cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} \
${MAKE_FLAGS} -f ${MAKE_FILE} depend

13
security/openssl/pkg/PFRAG.shared
View File

@ -1,13 +0,0 @@
@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2014/07/15 22:23:16 sthen Exp $
lib/eopenssl/engines/lib4758cca.so
lib/eopenssl/engines/libaep.so
lib/eopenssl/engines/libatalla.so
lib/eopenssl/engines/libcapi.so
lib/eopenssl/engines/libchil.so
lib/eopenssl/engines/libcswift.so
lib/eopenssl/engines/libgmp.so
lib/eopenssl/engines/libgost.so
lib/eopenssl/engines/libnuron.so
lib/eopenssl/engines/libpadlock.so
lib/eopenssl/engines/libsureware.so
lib/eopenssl/engines/libubsec.so

15
security/openssl/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.8 2016/03/01 15:37:53 sthen Exp $
@comment $OpenBSD: PLIST,v 1.9 2016/03/11 23:03:21 naddy Exp $
@bin bin/eopenssl
include/eopenssl/
include/eopenssl/openssl/
@ -79,6 +79,18 @@ include/eopenssl/openssl/x509_vfy.h
include/eopenssl/openssl/x509v3.h
lib/eopenssl/
lib/eopenssl/engines/
lib/eopenssl/engines/lib4758cca.so
lib/eopenssl/engines/libaep.so
lib/eopenssl/engines/libatalla.so
lib/eopenssl/engines/libcapi.so
lib/eopenssl/engines/libchil.so
lib/eopenssl/engines/libcswift.so
lib/eopenssl/engines/libgmp.so
lib/eopenssl/engines/libgost.so
lib/eopenssl/engines/libnuron.so
lib/eopenssl/engines/libpadlock.so
lib/eopenssl/engines/libsureware.so
lib/eopenssl/engines/libubsec.so
lib/eopenssl/libcrypto.a
@lib lib/eopenssl/libcrypto.so.${LIBcrypto_VERSION}
lib/eopenssl/libssl.a
@ -1673,7 +1685,6 @@ lib/eopenssl/man/man7/
lib/pkgconfig/eopenssl.pc
lib/pkgconfig/libecrypto.pc
lib/pkgconfig/libessl.pc
%%SHARED%%
share/eopenssl/
share/eopenssl/certs/
share/eopenssl/misc/

11
textproc/podofo/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2015/10/18 13:09:38 sthen Exp $
# $OpenBSD: Makefile,v 1.4 2016/03/11 23:03:21 naddy Exp $
COMMENT= library and tools to modify and parse PDF documents
@ -30,6 +30,7 @@ LIB_DEPENDS= devel/libidn \
CONFIGURE_ARGS+= -DCMAKE_INCLUDE_PATH=${X11BASE}/include \
-DCMAKE_LIBRARY_PATH=${X11BASE}/lib \
-DFREETYPE_INCLUDE_DIR=${X11BASE}/include/freetype2 \
-DPODOFO_BUILD_SHARED=True \
-DPODOFO_BUILD_STATIC=True
post-extract:
@ -39,12 +40,4 @@ BUILD_DEPENDS= devel/cppunit
do-test:
${WRKBUILD}/test/unit/podofo-test
.include <bsd.port.arch.mk>
.if ${NO_SHARED_LIBS:L} == "yes"
CONFIGURE_ARGS+= -DPODOFO_BUILD_SHARED=False
.else
CONFIGURE_ARGS+= -DPODOFO_BUILD_SHARED=True
.endif
.include <bsd.port.mk>