Date: Wed, 1 Dec 1999 16:10:01 -0800 (PST) From: "Chris D. Faulhaber" <jedgar@fxp.org> To: freebsd-ports@FreeBSD.org Subject: Re: ports/15191: Update port: net/elsa Message-ID: <199912020010.QAA65912@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR ports/15191; it has been noted by GNATS.
From: "Chris D. Faulhaber" <jedgar@fxp.org>
To: freebsd-gnats-submit@freebsd.org
Cc:
Subject: Re: ports/15191: Update port: net/elsa
Date: Wed, 1 Dec 1999 19:04:15 -0500 (EST)
The following patch updates elsa and, instead of marking broken for
-current, stops and notifies what compat libs are required.
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/net/elsa/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- Makefile 1999/11/10 23:53:56 1.1.1.1
+++ Makefile 1999/12/02 00:01:52
@@ -1,5 +1,5 @@
# New ports collection makefile for: elsa
-# Version required: 1.0
+# Version required: 1.0b-017
# Date created: 06 October 1999
# Whom: Chris D. Faulhaber <jedgar@fxp.org>
#
@@ -7,7 +7,7 @@
#
DISTNAME= elsa-freebsd_x86
-PKGNAME= elsa-1.0b
+PKGNAME= elsa-1.0b-017
CATEGORIES= net
MASTER_SITES= ""
@@ -16,8 +16,9 @@
ONLY_FOR_ARCHS= i386
RESTRICTED= "LIC: redistribution not allowed"
-WRKSRC= ${WRKDIR}/ELSA-1_0b-016-freebsd_x86
+WRKSRC= ${WRKDIR}/ELSA-1_0b-017-freebsd_x86
NO_BUILD= yes
+LOG_DIR?= /var/log/elsa
.include <bsd.port.pre.mk>
@@ -25,14 +26,27 @@
IGNORE='The source to this port may not be automatically fetched due to licensing restrictions. You MUST fetch the source manually after registering at: http://streaming.entera.com/orderform.shtml Once ${DISTFILES} has been downloaded, move it to ${DISTDIR} and then restart this build.'
.endif
+pre-fetch:
+ @for library in libc_r.so.3 libstdc++.so.2 libg++.so.4; do \
+ if [ -z "`ldconfig -r -elf | ${GREP} $$library`" ]; then \
+ ${ECHO}; \
+ ${ECHO} "This port requires the following FreeBSD 3.x compatibility"; \
+ ${ECHO} "libraries: libc_r.so.3, libstdc++.so.2, and libg++.so.4."; \
+ ${ECHO} "Please ensure they are installed and properly registered"; \
+ ${ECHO} "with the system (see ldconfig(8)). These libraries may be"; \
+ ${ECHO} "obtained from compat3x and/or a recent FreeBSD 3.x system."; \
+ ${ECHO}; \
+ exit 1; \
+ fi \
+ done
+
do-configure:
- @${MV} ${WRKSRC}/elsa.cfg ${WRKSRC}/elsa.cfg.orig
- @${SED} -e 's|CHANGE_ME|${PREFIX}/share/elsa|' \
- < ${WRKSRC}/elsa.cfg.orig > ${WRKSRC}/elsa.cfg
+ @${PERL} -pi.orig -e 's|__PREFIX__|${PREFIX}|' ${WRKSRC}/elsa.cfg
+ @${PERL} -pi.orig -e 's|__LOG_DIR__|${LOG_DIR}|' ${WRKSRC}/elsa.cfg
do-install:
${MKDIR} ${PREFIX}/share/elsa/content
- ${MKDIR} /var/log/elsa
+ ${MKDIR} ${LOG_DIR}
${INSTALL_SCRIPT} ${WRKSRC}/elsa ${PREFIX}/sbin
${INSTALL_DATA} ${WRKSRC}/elsa.cfg ${PREFIX}/etc
${INSTALL_DATA} ${WRKSRC}/LICENSE ${PREFIX}/share/elsa
Index: files/md5
===================================================================
RCS file: /home/ncvs/ports/net/elsa/files/md5,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 md5
--- md5 1999/11/10 23:53:56 1.1.1.1
+++ md5 1999/12/02 00:01:52
@@ -1 +1 @@
-MD5 (elsa-freebsd_x86.tar.gz) = cc53ab9100d23d81bfcfd27090524912
+MD5 (elsa-freebsd_x86.tar.gz) = 68bca29c7fc60cea46bde698933f12fa
Index: patches/patch-aa
===================================================================
RCS file: /home/ncvs/ports/net/elsa/patches/patch-aa,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 patch-aa
--- patch-aa 1999/11/10 23:53:56 1.1.1.1
+++ patch-aa 1999/12/02 00:01:52
@@ -1,10 +1,11 @@
---- elsa.cfg.orig Thu Sep 30 17:27:22 1999
-+++ elsa.cfg Wed Oct 6 21:48:19 1999
-@@ -1,5 +1,5 @@
+--- elsa.cfg.orig Mon Nov 29 21:42:06 1999
++++ elsa.cfg Tue Nov 30 12:42:55 1999
+@@ -1,5 +1,6 @@
[config]
-CONTENT_DIR=content
-LOGGING_DIR=.
-+CONTENT_DIR=CHANGE_ME/content
-+LOGGING_DIR=/var/log/elsa
++CONTENT_DIR=__PREFIX__/share/elsa/content
++LOGGING_DIR=__LOG_DIR__
LOGGING=yes
LOGGING_DEBUG=yes
++PID_FILE=/var/run/elsa.pid
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?199912020010.QAA65912>