Date: Sun, 1 Apr 2001 00:19:20 +0200 (CEST) From: baskruit@bsltwr.dnsalias.org To: FreeBSD-gnats-submit@freebsd.org Subject: ports/26257: Port update: net/dhisd to version 4.0.3 Message-ID: <200103312219.f2VMJK287475@gate.bsltwr.dnsalias.org>
next in thread | raw e-mail | index | archive | help
>Number: 26257 >Category: ports >Synopsis: Port update: net/dhisd to version 4.0.3 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Mar 31 14:20:03 PST 2001 >Closed-Date: >Last-Modified: >Originator: >Release: FreeBSD 4.2-STABLE i386 >Organization: >Environment: System: FreeBSD gate.bsltwr.dnsalias.org 4.2-STABLE FreeBSD 4.2-STABLE #2: Tue Feb 27 22:14:51 CET 2001 root@gate.bsltwr.dnsalias.org:/usr/obj/usr/src/sys/gate i386 >Description: Upgrade to latest version, this version includes bind 8.2.3 support. Added an extra patch-file to modify inclusion of res_update.h in nsupdate.c >How-To-Repeat: >Fix: diff -ruN dhisd.orig/Makefile dhisd/Makefile --- dhisd.orig/Makefile Sun Apr 1 00:03:47 2001 +++ dhisd/Makefile Tue Mar 13 04:11:27 2001 @@ -2,12 +2,11 @@ # Date created: Sun Feb 25 21:13:59 CET 2001 # Whom: Bas Kruit <baskruit@bsltwr.dhis.org> # -# $FreeBSD: ports/net/dhisd/Makefile,v 1.2 2001/03/23 01:49:57 jeh Exp $ +# $FreeBSD: ports/net/dhisd/Makefile,v 1.1 2001/03/12 22:52:32 will Exp $ # PORTNAME= dhisd -PORTVERSION= 4.0 -PORTREVISION= 1 +PORTVERSION= 4.0.3 CATEGORIES= net MASTER_SITES= http://bsltwr.dhis.org/ftp/pub/dhis/ \ ftp://ftp.dhis.org/pub/dhis/ @@ -44,7 +43,7 @@ @${CHMOD} 600 ${PREFIX}/dhis/db/* .if !exists(${PREFIX}/etc/rc.d/dhisd.sh) ${ECHO} "===> Installing ${PREFIX}/etc/rc.d/dhid.sh startup file." - ${INSTALL_SCRIPT} -m 751 ${WRKSRC}/dhisd.sh ${PREFIX}/etc/rc.d/dhisd.sh + ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhisd.sh ${PREFIX}/etc/rc.d/dhisd.sh @${ECHO} "etc/rc.d/dhisd.sh" >> ${TMPPLIST} .endif .if !defined(NOPORTDOCS) diff -ruN dhisd.orig/distinfo dhisd/distinfo --- dhisd.orig/distinfo Sun Apr 1 00:03:47 2001 +++ dhisd/distinfo Mon Mar 19 16:02:57 2001 @@ -1 +1 @@ -MD5 (dhisd-4.0.tar.gz) = 9757deffda1b4a261f4313a4bd1b5ed1 +MD5 (dhisd-4.0.3.tar.gz) = 1882f5296856c439dd5115f1b9170bbc diff -ruN dhisd.orig/files/patch-Makefile dhisd/files/patch-Makefile --- dhisd.orig/files/patch-Makefile Sun Apr 1 00:03:46 2001 +++ dhisd/files/patch-Makefile Mon Mar 19 17:44:25 2001 @@ -1,15 +1,24 @@ ---- Makefile.orig Sat Feb 24 02:59:57 2001 -+++ Makefile Sat Feb 24 03:01:42 2001 -@@ -28,9 +28,11 @@ +--- Makefile.orig Wed Mar 7 11:53:58 2001 ++++ Makefile Mon Mar 19 17:43:57 2001 +@@ -26,16 +26,16 @@ + # DHIS(c) Dynamic Host Information System Release 4.0 + CC=gcc - CFLAGS=-I/usr/local/include - LFLAGS=-L/usr/local/lib --LIBS=-lbind -lgmp +-CFLAGS=-I/usr/local/include -I/usr/bind/include \ +- -I/usr/local/bind/include # -DBIND821 +-LFLAGS=-L/usr/local/lib -L/usr/bind/lib -L/usr/local/bind/lib +-LIBS=-lnsl -lsocket -lbind -lgmp ++CFLAGS=-I/usr/local/include -DHAVE_SYS_PARAM_H ++LFLAGS=-L/usr/local/lib +LIBS=-lgmp OBJS=log.o network.o misc.o db.o online.o nsupdate.o main.o RM=rm -f -+ -+all: dhisd ++all: dhisd ++ dhisd: $(OBJS) $(CC) $(LFLAGS) -o dhisd $(OBJS) $(LIBS) +- strip dhisd + + clean: + $(RM) *.core core dhisd *.o diff -ruN dhisd.orig/files/patch-nsupdate.c dhisd/files/patch-nsupdate.c --- dhisd.orig/files/patch-nsupdate.c Thu Jan 1 01:00:00 1970 +++ dhisd/files/patch-nsupdate.c Mon Mar 19 23:39:24 2001 @@ -0,0 +1,31 @@ +--- nsupdate.c.orig Mon Mar 19 22:23:40 2001 ++++ nsupdate.c Mon Mar 19 22:55:46 2001 +@@ -28,8 +28,17 @@ + + + #include"dhisd.h" +-#ifndef BIND821 +-#include <res_update.h> ++ ++#ifdef HAVE_SYS_PARAM_H ++#include <sys/param.h> ++#endif ++ ++#if (defined(BSD) && (BSD >= 199306)) ++# include <arpa/nameser.h> ++#else ++# if !defined BIND821 ++# include <res_update.h> ++# endif + #endif + + int dns_update(unsigned char *r_dname,int r_opcode,short int r_type, +@@ -53,7 +62,7 @@ + rrecp->r_size=r_size; + if(r_size>0) strcpy(rrecp->r_data,r_data); + +-#ifndef BIND821 ++#if !defined(BIND821) && !defined(BSD) + rrecp->r_link.prev=NULL; + rrecp->r_link.next=NULL; + #else >Release-Note: >Audit-Trail: >Unformatted: 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?200103312219.f2VMJK287475>