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

- move declarations above statements

Browse Source 
- don't attempt to build .so on !shared systems
- remove redundant vars supplied by tk.port.mk
- remove USE_GMAKE, it's not needed
This commit is contained in:
sthen 2009-03-27 02:04:44 +00:00
parent 7a74c5fbba
commit 20dbfef735
3 changed files with 69 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
net/ssvnc/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.5 2009/03/11 21:39:10 sthen Exp $
# $OpenBSD: Makefile,v 1.6 2009/03/27 02:04:44 sthen Exp $
COMMENT-gui = enhanced TightVNC client GUI and wrappers
COMMENT-main = enhanced TightVNC client
@ -9,7 +9,7 @@ CATEGORIES = net x11
PKGNAME = ssvnc-$V
FULLPKGNAME-gui = ssvnc-$Vp0
FULLPKGNAME-main = ssvnc-viewer-$V
FULLPKGNAME-main = ssvnc-viewer-$Vp0
HOMEPAGE = http://www.karlrunge.com/x11vnc/ssvnc.html
@ -25,10 +25,8 @@ MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ssvnc/}
MULTI_PACKAGES =-main -gui
USE_X11 = Yes
USE_GMAKE = Yes
MAKE_ENV = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}"
MAKE_ENV = CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \
NO_SHARED_LIBS=${NO_SHARED_LIBS}
WRKDIST = ${WRKDIR}/ssvnc-$V
@ -51,8 +49,6 @@ XMKMF = xmkmf
VNCSRC = ${WRKSRC}/vnc_unixsrc/
VNCLIB = ${PREFIX}/lib/ssvnc/
SUBST_VARS = MODTK_BIN
pre-configure:
${SUBST_CMD} ${WRKSRC}/scripts/ssvnc
@ -75,8 +71,9 @@ do-install:
${INSTALL_PROGRAM} ${VNCSRC}/vncviewer/vncviewer ${PREFIX}/bin
${INSTALL_PROGRAM} ${WRKSRC}/vncstorepw/vncstorepw ${VNCLIB}
${INSTALL_PROGRAM} ${WRKSRC}/vncstorepw/ultravnc_dsm_helper ${VNCLIB}
${INSTALL_DATA} ${WRKSRC}/vncstorepw/lim_accept.so ${VNCLIB}
${INSTALL_DATA} ${WRKSRC}/vncstorepw/unwrap.so ${VNCLIB}
.for i in vncstorepw/lim_accept.so vncstorepw/unwrap.so
if test -r ${WRKSRC}/$i; then ${INSTALL_DATA} ${WRKSRC}/$i ${VNCLIB}; fi
.endfor
.for i in ssvnc tsvnc sshvnc
${WRKSRC}/wr_tool ${PREFIX}/bin/$i ${TRUEPREFIX}/lib/ssvnc/$i
.endfor

32
net/ssvnc/patches/patch-vnc_unixsrc_vncviewer_rfbproto_c Normal file
View File

@ -0,0 +1,32 @@
$OpenBSD: patch-vnc_unixsrc_vncviewer_rfbproto_c,v 1.1 2009/03/27 02:04:44 sthen Exp $
allow to build with GCC 2
--- vnc_unixsrc/vncviewer/rfbproto.c.orig Thu Mar 26 20:24:19 2009
+++ vnc_unixsrc/vncviewer/rfbproto.c Thu Mar 26 20:25:24 2009
@@ -1705,8 +1705,8 @@ extern void raiseme(int force);
Bool
SendTextChatOpen(void)
{
- raiseme(0);
rfbTextChatMsg chat;
+ raiseme(0);
chat.type = rfbTextChat;
chat.pad1 = 0;
chat.pad2 = 0;
@@ -2070,6 +2070,7 @@ HandleRFBServerMessage()
int area_zrle = 0;
int area_raw = 0;
static int rdb = -1;
+ int skip_incFBU = 0;
if (db) fprintf(stderr, "FBU-0: %.6f\n", dnow());
if (rdb < 0) {
@@ -2080,7 +2081,6 @@ HandleRFBServerMessage()
}
}
- int skip_incFBU = 0;
sent_FBU = -1;
if (!ReadFromRFBServer(((char *)&msg.fu) + 1, sz_rfbFramebufferUpdateMsg - 1)) {

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

@ -0,0 +1,30 @@
$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':