View | Details | Raw Unified | Return to bug 181493 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-19 / +20 lines)
Lines 1-12 Link Here
1
# New ports collection makefile for:	nostromo
1
# Created by: Adrian Steinmann <ast@marabu.ch>
2
# Date created:		20 Mar 2011
3
# Whom:			Adrian Steinmann <ast@marabu.ch>
4
#
5
# $FreeBSD$
2
# $FreeBSD$
6
#
7
3
8
PORTNAME=	nostromo
4
PORTNAME=	nostromo
9
PORTVERSION=	1.9.5
5
PORTVERSION=	1.9.5
6
PORTREVISION=	1
10
CATEGORIES=	www ipv6
7
CATEGORIES=	www ipv6
11
MASTER_SITES=	http://www.nazgul.ch/dev/
8
MASTER_SITES=	http://www.nazgul.ch/dev/
12
9
Lines 15-21 Link Here
15
12
16
LICENSE=	BSD
13
LICENSE=	BSD
17
14
18
NOSTROMO_DIR?=		${PREFIX}/nostromo
15
NOSTROMO_DIR?=		nostromo
19
NOSTROMO_LOGDIR?=	${NOSTROMO_DIR}/logs
16
NOSTROMO_LOGDIR?=	${NOSTROMO_DIR}/logs
20
NOSTROMO_LOGDIR_PERMS?=	0775
17
NOSTROMO_LOGDIR_PERMS?=	0775
21
18
Lines 24-29 Link Here
24
MAN8=		nhttpd.8
21
MAN8=		nhttpd.8
25
22
26
MAKE_ENV?=	MAKEOBJDIR=. PREFIX=${PREFIX} NOSTROMO_DIR=${NOSTROMO_DIR}
23
MAKE_ENV?=	MAKEOBJDIR=. PREFIX=${PREFIX} NOSTROMO_DIR=${NOSTROMO_DIR}
24
PLIST_SUB+=	NOSTROMODIR="${NOSTROMO_DIR}" NOSTROMOLOGDIR="${NOSTROMO_LOGDIR}"
27
25
28
post-extract:
26
post-extract:
29
	@${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \
27
	@${REINPLACE_CMD} -e "s@/var/nostromo@${NOSTROMO_DIR}@g" \
Lines 37-55 Link Here
37
	@${INSTALL_SCRIPT} ${WRKSRC}/src/nhttpd/nhttpd ${PREFIX}/sbin
35
	@${INSTALL_SCRIPT} ${WRKSRC}/src/nhttpd/nhttpd ${PREFIX}/sbin
38
	@${INSTALL_SCRIPT} ${WRKSRC}/src/tools/crypt ${PREFIX}/sbin
36
	@${INSTALL_SCRIPT} ${WRKSRC}/src/tools/crypt ${PREFIX}/sbin
39
	@${INSTALL_MAN} ${WRKSRC}/src/nhttpd/nhttpd.8 ${PREFIX}/man/man8
37
	@${INSTALL_MAN} ${WRKSRC}/src/nhttpd/nhttpd.8 ${PREFIX}/man/man8
40
	@${MKDIR} ${NOSTROMO_DIR}
38
	@${MKDIR} ${PREFIX}/${NOSTROMO_DIR}
41
	@${MKDIR} ${NOSTROMO_DIR}/conf
39
	@${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/conf
42
	@${MKDIR} -m ${NOSTROMO_LOGDIR_PERMS} -p ${NOSTROMO_LOGDIR}
40
	@${MKDIR} -m ${NOSTROMO_LOGDIR_PERMS} -p ${PREFIX}/${NOSTROMO_LOGDIR}
43
	@${INSTALL_DATA} ${WRKSRC}/conf/mimes ${NOSTROMO_DIR}/conf
41
	@${INSTALL_DATA} ${WRKSRC}/conf/mimes ${PREFIX}/${NOSTROMO_DIR}/conf
44
	@${INSTALL_DATA} ${WRKSRC}/conf/nhttpd.conf-dist ${NOSTROMO_DIR}/conf
42
	@${INSTALL_DATA} ${WRKSRC}/conf/nhttpd.conf-dist ${PREFIX}/${NOSTROMO_DIR}/conf
45
	@${MKDIR} ${NOSTROMO_DIR}/htdocs
43
	if [ ! -f ${PREFIX}/${NOSTROMO_DIR}/conf/nhttpd.conf ]; then \
46
	@${INSTALL_DATA} ${WRKSRC}/htdocs/index.html ${NOSTROMO_DIR}/htdocs
44
		${CP} -p ${PREFIX}/${NOSTROMO_DIR}/conf/nhttpd.conf-dist ${PREFIX}/${NOSTROMO_DIR}/conf/nhttpd.conf ; \
47
	@${INSTALL_DATA} ${WRKSRC}/htdocs/nostromo.gif ${NOSTROMO_DIR}/htdocs
45
	fi
48
	@${MKDIR} ${NOSTROMO_DIR}/htdocs/cgi-bin
46
	@${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/htdocs
47
	@${INSTALL_DATA} ${WRKSRC}/htdocs/index.html ${PREFIX}/${NOSTROMO_DIR}/htdocs
48
	@${INSTALL_DATA} ${WRKSRC}/htdocs/nostromo.gif ${PREFIX}/${NOSTROMO_DIR}/htdocs
49
	@${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/htdocs/cgi-bin
49
	@${INSTALL_SCRIPT} ${WRKSRC}/htdocs/cgi-bin/printenv \
50
	@${INSTALL_SCRIPT} ${WRKSRC}/htdocs/cgi-bin/printenv \
50
		${NOSTROMO_DIR}/htdocs/cgi-bin
51
		${PREFIX}/${NOSTROMO_DIR}/htdocs/cgi-bin
51
	@${MKDIR} ${NOSTROMO_DIR}/icons
52
	@${MKDIR} ${PREFIX}/${NOSTROMO_DIR}/icons
52
	@${INSTALL_DATA} ${WRKSRC}/icons/dir.gif ${NOSTROMO_DIR}/icons
53
	@${INSTALL_DATA} ${WRKSRC}/icons/dir.gif ${PREFIX}/${NOSTROMO_DIR}/icons
53
	@${INSTALL_DATA} ${WRKSRC}/icons/file.gif ${NOSTROMO_DIR}/icons
54
	@${INSTALL_DATA} ${WRKSRC}/icons/file.gif ${PREFIX}/${NOSTROMO_DIR}/icons
54
55
55
.include <bsd.port.mk>
56
.include <bsd.port.mk>
(-)files/patch-src-libmy-strb64d.c (+11 lines)
Line 0 Link Here
1
--- src/libmy/strb64d.c.orig	2005-06-04 10:30:04.000000000 +0200
2
+++ src/libmy/strb64d.c	2013-08-23 19:17:25.700331962 +0200
3
@@ -54,7 +54,7 @@
4
 	dst[0] = '\0';
5
 
6
 	while (1) {
7
-		for (i = 0, j = j; i < 4; i++, j++) {
8
+		for (i = 0; i < 4; i++, j++) {
9
 			if (src[j] == '\0')
10
 				goto quit;
11
 			ch = src[j];

Return to bug 181493