Unnamed Fossil Project

Check-in [95da163d4b]
Login

Check-in [95da163d4b]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Fix rc scripts-- no need for the functions; they don't do anything! Put files into /var/db/softether Use SUB_LIST, ALL_TARGET, no slash after STAGEDIR $@* is probably a mistake; standard idiom is ${1+"$@"} for passing arguments.
Timelines: family | ancestors | trunk
Files: files | file ages | folders
SHA1: 95da163d4b5766e0531e468353ea8ee1448f57b5
User & Date: crees 2014-08-27 09:01:48
Context
2014-08-27
09:01
Fix rc scripts-- no need for the functions; they don't do anything! Put files into /var/db/softether Use SUB_LIST, ALL_TARGET, no slash after STAGEDIR $@* is probably a mistake; standard idiom is ${1+"$@"} for passing arguments. Leaf check-in: 95da163d4b user: crees tags: trunk
08:45
Initial import check-in: e377ed70ff user: crees tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile.

︙︙
20
21
22
23
24
25
26

27
28
29


30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45








46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77

OPTIONS_DEFINE=	DOCS

ONLY_FOR_ARCHS=	i386 amd64

USE_OPENSSL=	yes
USES=		iconv ncurses readline dos2unix gmake
USE_RC_SUBR=	softether_bridge softether_client softether_server


# a pity the source directory has such a naming scheme, but well
WRKSRC=		${WRKDIR}/v4.08-9449



.include <bsd.port.options.mk>

# requires OpenSSL from ports
.if ${OSVERSION} < 1000000
WITH_OPENSSL_PORT=	yes
.endif

# skip configure at all and copy the corresponding Makefile in place
post-extract:
.if ${ARCH} != "amd64"
	@${CP} ${WRKSRC}/src/makefiles/freebsd_32bit.mak ${WRKSRC}/Makefile
.else
	@${CP} ${WRKSRC}/src/makefiles/freebsd_64bit.mak ${WRKSRC}/Makefile
.endif









# pull in user specific CFLAGS and LDFLAGS
	@${REINPLACE_CMD} -e "s|OPTIONS_COMPILE_RELEASE=|OPTIONS_COMPILE_RELEASE=${CFLAGS} |g" ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e "s|OPTIONS_LINK_RELEASE=|OPTIONS_LINK_RELEASE=${LDFLAGS} |g" ${WRKSRC}/Makefile

# gmake all is not defined, use gmake build
do-build:
	@cd ${WRKSRC}/ && ${SETENV} ${GMAKE_ENV} ${GMAKE} build
	@${CP} ${FILESDIR}/vpncmd.in ${WRKDIR}/vpncmd
	@${REINPLACE_CMD} -e 's,%%PREFIX%%,${LOCALBASE},g' ${WRKDIR}/vpncmd

# manually install to libexec, then the final install will copy scripts
# into ${PREFIX}/sbin
do-install:
	@${MKDIR} ${STAGEDIR}/${PREFIX}/libexec/softether
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnbridge
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnclient
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpncmd
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/vpnserver
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}/${PREFIX}/libexec/${PORTNAME}/hamcore.se2
	@${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}/${PREFIX}/sbin/vpncmd
	@${ECHO} en > ${STAGEDIR}/${PREFIX}/libexec/softether/lang.config

post-install:
.for i in vpnbridge vpnclient vpncmd vpnserver
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
.endfor
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor

.include <bsd.port.mk>








>



>
>
















>
>
>
>
>
>
>
>




<
<
<
<
<
<



|
|
|
|
|
|
|
|












20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60






61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82

OPTIONS_DEFINE=	DOCS

ONLY_FOR_ARCHS=	i386 amd64

USE_OPENSSL=	yes
USES=		iconv ncurses readline dos2unix gmake
USE_RC_SUBR=	softether_bridge softether_client softether_server
SUB_FILES=	vpncmd

# a pity the source directory has such a naming scheme, but well
WRKSRC=		${WRKDIR}/v4.08-9449

ALL_TARGET=	build

.include <bsd.port.options.mk>

# requires OpenSSL from ports
.if ${OSVERSION} < 1000000
WITH_OPENSSL_PORT=	yes
.endif

# skip configure at all and copy the corresponding Makefile in place
post-extract:
.if ${ARCH} != "amd64"
	@${CP} ${WRKSRC}/src/makefiles/freebsd_32bit.mak ${WRKSRC}/Makefile
.else
	@${CP} ${WRKSRC}/src/makefiles/freebsd_64bit.mak ${WRKSRC}/Makefile
.endif

post-patch:
	${REINPLACE_CMD} 's,fopen(",&/var/db/softether/,g' \
		${WRKSRC}/src/Mayaqua/Kernel.c \
		${WRKSRC}/src/Cedar/winpcap/pcap.h \
		${WRKSRC}/src/Cedar/winpcap/Packet32.h \
		${WRKSRC}/src/SeeDll/Packet32.h \
		${WRKSRC}/src/See/Packet32.h

# pull in user specific CFLAGS and LDFLAGS
	@${REINPLACE_CMD} -e "s|OPTIONS_COMPILE_RELEASE=|OPTIONS_COMPILE_RELEASE=${CFLAGS} |g" ${WRKSRC}/Makefile
	@${REINPLACE_CMD} -e "s|OPTIONS_LINK_RELEASE=|OPTIONS_LINK_RELEASE=${LDFLAGS} |g" ${WRKSRC}/Makefile







# manually install to libexec, then the final install will copy scripts
# into ${PREFIX}/sbin
do-install:
	@${MKDIR} ${STAGEDIR}${PREFIX}/libexec/softether
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnbridge/vpnbridge ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/vpnbridge
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnclient/vpnclient ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/vpnclient
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpncmd/vpncmd ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/vpncmd
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/vpnserver ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/vpnserver
	@${INSTALL_SCRIPT} ${WRKSRC}/bin/vpnserver/hamcore.se2 ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/hamcore.se2
	@${INSTALL_SCRIPT} ${WRKDIR}/vpncmd ${STAGEDIR}${PREFIX}/sbin/vpncmd
	@${ECHO} en > ${STAGEDIR}${PREFIX}/libexec/softether/lang.config

post-install:
.for i in vpnbridge vpnclient vpncmd vpnserver
	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/libexec/${PORTNAME}/${i}
.endfor
	@${MKDIR} ${STAGEDIR}${DOCSDIR}
.for doc in ${PORTDOCS}
	${INSTALL_DATA} ${WRKSRC}/${doc} ${STAGEDIR}${DOCSDIR}
.endfor

.include <bsd.port.mk>

Changes to files/softether_bridge.in. 

1
2


3
4
5
6
7
8
9
10
11
12

13
14
15
16

17
18
19
20
21
22

23
24
25
26
27
28
29
30
31
32
33
34
35
36

#!/bin/sh



# PROVIDE: softether_bridge
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable softether_bridge:
# softether_bridge_enable (bool):  Set to "NO" by default.
#                                  Set it to "YES" to enable
#

. /etc/rc.subr

name=softether_bridge
rcvar=softether_bridge_enable

load_rc_config ${name}

: ${softether_bridge_enable:=NO}

command="%%PREFIX%%/libexec/softether/vpnbridge"


start_cmd="${command} start"
stop_cmd="${command} stop"

softether_bridge_start()
{
	${start_cmd}
}

softether_bridge_stop()
{
	${stop_cmd}
}

run_rc_command "$1"


|
>
>




|





>




>






>



<
<
<
<
<
<
<
<
<
<


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30










31

#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: softether_bridge
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown
#
#
# Add the following lines to /etc/rc.conf to enable softether_bridge:
# softether_bridge_enable (bool):  Set to "NO" by default.
#                                  Set it to "YES" to enable
#

. /etc/rc.subr

name=softether_bridge
rcvar=softether_bridge_enable

load_rc_config ${name}

: ${softether_bridge_enable:=NO}

command="%%PREFIX%%/libexec/softether/vpnbridge"

start_precmd="mkdir -p /var/db/softether"
start_cmd="${command} start"
stop_cmd="${command} stop"











run_rc_command "$1"

Changes to files/softether_client.in. 

1
2


3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22

23
24
25
26
27
28
29
30
31
32
33
34
35
36

#!/bin/sh



# PROVIDE: softether_client
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable softether_client:
# softether_client_enable (bool):  Set to "NO" by default.
#                                  Set it to "YES" to enable
#
. /etc/rc.subr

name=softether_client
rcvar=softether_client_enable
load_rc_config ${name}

: ${softether_client_enable:=NO}

command="%%PREFIX%%/libexec/softether/vpnclient"


start_cmd="${command} start"
stop_cmd="${command} stop"

softether_client_start()
{
	${start_cmd}
}

softether_client_stop()
{
	${stop_cmd}
}

run_rc_command "$1"


|
>
>




















>



<
<
<
<
<
<
<
<
<
<


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28










29

#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: softether_client
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable softether_client:
# softether_client_enable (bool):  Set to "NO" by default.
#                                  Set it to "YES" to enable
#
. /etc/rc.subr

name=softether_client
rcvar=softether_client_enable
load_rc_config ${name}

: ${softether_client_enable:=NO}

command="%%PREFIX%%/libexec/softether/vpnclient"

start_precmd="mkdir -p /var/db/softether"
start_cmd="${command} start"
stop_cmd="${command} stop"











run_rc_command "$1"

Changes to files/softether_server.in. 

1
2


3
4
5
6
7
8
9
10
11
12
13
14
15
16

17
18
19
20
21
22

23
24
25
26
27
28
29
30
31
32
33
34
35
36

#!/bin/sh



# PROVIDE: softether_server
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown

#
# Add the following lines to /etc/rc.conf to enable softether_server:
# softether_server_enable (bool):  Set to "NO" by default.
#                                  Set it to "YES" to enable
#
. /etc/rc.subr

name=softether_server
rcvar=softether_server_enable

load_rc_config ${name}

: ${softether_server_enable:=NO}

command="%%PREFIX%%/libexec/softether/vpnserver"


start_cmd="${command} start"
stop_cmd="${command} stop"

softether_server_start()
{
	${start_cmd}
}

softether_server_stop()
{
	${stop_cmd}
}

run_rc_command "$1"


|
>
>




|









>






>



<
<
<
<
<
<
<
<
<
<


1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29










30

#!/bin/sh
#
# $FreeBSD$
#
# PROVIDE: softether_server
# REQUIRE: NETWORKING SERVERS
# BEFORE: DAEMON
# KEYWORD: shutdown
#
#
# Add the following lines to /etc/rc.conf to enable softether_server:
# softether_server_enable (bool):  Set to "NO" by default.
#                                  Set it to "YES" to enable
#
. /etc/rc.subr

name=softether_server
rcvar=softether_server_enable

load_rc_config ${name}

: ${softether_server_enable:=NO}

command="%%PREFIX%%/libexec/softether/vpnserver"

start_precmd="mkdir -p /var/db/${name}"
start_cmd="${command} start"
stop_cmd="${command} stop"











run_rc_command "$1"

Changes to files/vpncmd.in. 

1
2
3
4
5
6

#!/bin/sh
#
# wrapper script for vpncmd, the configuration binary for
# SoftEther vpn
#
%%PREFIX%%/libexec/softether/vpncmd $@*






|

1
2
3
4
5
6

#!/bin/sh
#
# wrapper script for vpncmd, the configuration binary for
# SoftEther vpn
#
%%PREFIX%%/libexec/softether/vpncmd ${1+"$@"}