kpriv/freebsd-ports
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update MASTER_SITES, fix build on -current, fix distfile extensions.

Browse source 
PR:		26444
Submitted by:	maintainer
This commit is contained in:
Peter Pentchev 2001-04-17 11:10:34 +00:00
parent 76fa7f79dd
commit 47fd0683ff
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=41536
3 changed files with 65 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
www/apache13-fp/Makefile
View file

@ -7,26 +7,27 @@
PORTNAME= apache_fp
PORTVERSION= 1.3.19
PORTREVISION= 1
CATEGORIES= www
MASTER_SITES= http://www.apache.org/dist/ \
MASTER_SITES= http://www.apache.org/dist/httpd/ \
ftp://ftp.microsoft.com/products/frontpage/ \
ftp://www.westbend.net/Mirrors/ftp.microsoft.com/Products/frontpage/ \
http://www.freebsd.org/gifs/ \
http://officeupdate.microsoft.com/frontpage/wpp/serk/ \
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/ \
ftp://ftp.rge.com/pub/infosystems/apache/dist/ \
ftp://apache.compuex.com/pub/apache/dist/ \
ftp://apache.arctic.org/pub/apache/dist/ \
ftp://ftp.epix.net/pub/apache/dist/ \
ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/ \
ftp://ftp.connectnet.com/pub/www/apache/ \
ftp://apache.technomancer.com/mirrors/apache/dist/ \
ftp://ftp.raver.net/pub/ftp.apache.org/ \
ftp://www3.service.digital.com/apache/dist/ \
ftp://galileo.galilei.com/pub/apache/ \
ftp://ftp.mtnranch.net/pub/apache/dist/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/ \
ftp://apache.nextpath.com/pub/apache/dist/
ftp://ftp.ccs.neu.edu/net/mirrors/ftp.apache.org/apache/dist/httpd/ \
ftp://ftp.rge.com/pub/infosystems/apache/dist/httpd/ \
ftp://apache.compuex.com/pub/apache/dist/httpd/ \
ftp://apache.arctic.org/pub/apache/dist/httpd/ \
ftp://ftp.epix.net/pub/apache/dist/httpd/ \
ftp://ftp.ameth.org/pub/mirrors/ftp.apache.org/apache/dist/httpd/ \
ftp://ftp.connectnet.com/pub/www/apache/httpd/ \
ftp://apache.technomancer.com/mirrors/apache/dist/httpd/ \
ftp://ftp.raver.net/pub/ftp.apache.org/httpd/ \
ftp://www3.service.digital.com/apache/dist/httpd/ \
ftp://galileo.galilei.com/pub/apache/httpd/ \
ftp://ftp.mtnranch.net/pub/apache/dist/httpd/ \
ftp://ftp.iodynamics.com/pub/mirror/apache/dist/httpd/ \
ftp://apache.nextpath.com/pub/apache/dist/httpd/
DISTNAME= apache_${PORTVERSION}
DISTFILES= ${APACHE} ${FRONTPAGE} powerlogo.gif fplogo.gif
@ -37,27 +38,26 @@ MAINTAINER= hetzels@westbend.net
APACHE= ${DISTNAME}${EXTRACT_SUFX}
.include <bsd.port.pre.mk>
.if !defined(ARCH)
ARCH!= /usr/bin/uname -m
.endif
ONLY_FOR_ARCHS= i386 alpha
.if ${ARCH} == i386
.ifdef WANT_FREEBSD_EXT
FRONTPAGE= fp40.freebsd.tar.z
FRONTPAGE= fp40.freebsd.tar.Z
.if ${OSVERSION} < 500016
PKGMESSAGE= pkg-message.freebsd
.endif
.else
FRONTPAGE= fp40.bsdi.tar.z
FRONTPAGE= fp40.bsdi.tar.Z
EXTRA_PATCHES= ${FILESDIR}/change_server.bsdi ${FILESDIR}/fp_install.bsdi
.if ${OSVERSION} < 50016
PKGMESSAGE= pkg-message.bsdi
.endif
.endif
.elif ${ARCH} == alpha
FRONTPAGE= fp40.alpha.tar.z
FRONTPAGE= fp40.alpha.tar.Z
EXTRA_PATCHES= ${FILESDIR}/change_server.alpha ${FILESDIR}/fp_install.alpha
.else
.BEGIN:
@${ECHO} "Unsupported system ${ARCH}"
@${FALSE}
.endif
EXTRACT_ONLY= ${APACHE}
@ -139,6 +139,7 @@ CONFIGURE_ARGS+= --enable-suexec \
MAN8+= suexec.8
.endif
.if ${OSVERSION} < 500016
pre-extract:
@if ! ${LDCONFIG} -r | ${GREP} -q -e "-ldescrypt"; then \
${ECHO} ; \
@ -161,6 +162,7 @@ pre-extract:
${FALSE} ; \
fi
.endif
.endif
post-extract:
@${ECHO} "===> Extracting FrontPage install scripts"
@ -211,8 +213,10 @@ post-install:
@${INSTALL_FILE} ${WRKSRC}/${CHANGESERVER} ${PREFIX}/${CHANGESERVER}-dist
@${INSTALL_FILE} ${WRKSRC}/${FPSETPERM} ${PREFIX}/${FPSETPERM}
@PKG_PREFIX=${PREFIX} BATCH=${BATCH} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
.if ${OSVERSION} < 500016
.if ${ARCH} == i386
@${CAT} ${PKGMESSAGE}
.endif
.endif
.include <bsd.port.mk>
.include <bsd.port.post.mk>

6
www/apache13-fp/distinfo
View file

@ -1,6 +1,6 @@
MD5 (apache_1.3.19.tar.gz) = e9b12b6fbf9a566110f09ac1f3791855
MD5 (fp40.bsdi.tar.z) = f469ea85b69d69f80f32c58fb0d273c4
MD5 (fp40.freebsd.tar.z) = 8893bec896e36d3f4a0e20b52ad9f5d7
MD5 (fp40.alpha.tar.z) = 6e6832c9dbe0975420020c06da9ae44e
MD5 (fp40.bsdi.tar.Z) = f469ea85b69d69f80f32c58fb0d273c4
MD5 (fp40.freebsd.tar.Z) = 8893bec896e36d3f4a0e20b52ad9f5d7
MD5 (fp40.alpha.tar.Z) = 6e6832c9dbe0975420020c06da9ae44e
MD5 (powerlogo.gif) = 0f106073b3c7844cf22d4df126b27c62
MD5 (fplogo.gif) = db0fd186b50fde14ff2ec638382a85e6

35
www/apache13-fp/files/patch-fj
View file

@ -9,7 +9,28 @@
pos = x;
break;
}
@@ -2040,7 +2040,6 @@
@@ -2013,12 +2013,14 @@
int x;
if (!strchr(p->h_name, '.')) {
- for (x = 0; p->h_aliases[x]; ++x) {
- if (strchr(p->h_aliases[x], '.') &&
- (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
- return ap_pstrdup(a, p->h_aliases[x]);
- }
- return NULL;
+ if (p->h_aliases) {
+ for (x = 0; p->h_aliases[x]; ++x) {
+ if (p->h_aliases[x] && strchr(p->h_aliases[x], '.') &&
+ (!strncasecmp(p->h_aliases[x], p->h_name, strlen(p->h_name))))
+ return ap_pstrdup(a, p->h_aliases[x]);
+ }
+ }
+ return NULL;
}
return ap_pstrdup(a, (void *) p->h_name);
}
@@ -2040,7 +2042,6 @@
ap_log_error(APLOG_MARK, APLOG_WARNING, NULL,
"%s: gethostname() failed to determine ServerName\n",
ap_server_argv0);
@ -17,12 +38,20 @@
}
else
{
@@ -2048,7 +2047,7 @@
@@ -2048,14 +2049,14 @@
if ((!(p = gethostbyname(str)))
|| (!(server_hostname = find_fqdn(a, p)))) {
/* Recovery - return the default servername by IP: */
- if (p->h_addr_list[0]) {
+ if (p && p->h_addr_list[0]) {
+ if (p && p->h_addr_list && p->h_addr_list[0]) {
ap_snprintf(str, sizeof(str), "%pA", p->h_addr_list[0]);
server_hostname = ap_pstrdup(a, str);
/* We will drop through to report the IP-named server */
}
}
else
- /* Since we found a fdqn, return it with no logged message. */
+ /* Since we found a fqdn, return it with no logged message. */
return server_hostname;
}