From sgk@outpost.globcon.net  Tue Apr  1 02:52:09 2003
Return-Path: <sgk@outpost.globcon.net>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id E267237B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 Apr 2003 02:52:09 -0800 (PST)
Received: from outpost.lukarcos.com (outpost.globcon.net [62.141.88.161])
	by mx1.FreeBSD.org (Postfix) with SMTP id 8E52B43F75
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  1 Apr 2003 02:52:08 -0800 (PST)
	(envelope-from sgk@outpost.globcon.net)
Received: (qmail 11028 invoked by uid 911); 1 Apr 2003 10:52:08 -0000
Message-Id: <20030401105208.11027.qmail@outpost.globcon.net>
Date: 1 Apr 2003 10:52:08 -0000
From: Sergei Kolobov <sergei@kolobov.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [MAINTAINER] Update sysutils/socklog to 1.0.0
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         50518
>Category:       ports
>Synopsis:       [MAINTAINER] Update sysutils/socklog to 1.0.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Apr 01 03:00:20 PST 2003
>Closed-Date:    Tue Apr 01 22:25:32 PST 2003
>Last-Modified:  Tue Apr 01 22:25:32 PST 2003
>Originator:     Sergei Kolobov
>Release:        FreeBSD 4.7-STABLE i386
>Organization:
>Environment:
System: FreeBSD outpost.globcon.net 4.7-STABLE FreeBSD 4.7-STABLE #0: Thu Jan  2 03:13:48 MSK
>Description:
- Use socklog's native build mechanism
- Allow user to override CC and CFLAGS settings
- Install additional documentation (note: COPYING is not a copy of GPL,
  but a 3-clause BSD-type license)
- Bump PORTREVISION due to changed package 
>How-To-Repeat:
>Fix:
--- socklog-1.0.0.patch begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/sysutils/socklog/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- Makefile	2003/03/31 01:30:05	1.5
+++ Makefile	2003/04/01 10:48:53
@@ -7,27 +7,33 @@
 
 PORTNAME=	socklog
 PORTVERSION=	1.0.0
+PORTREVISION=	1
 CATEGORIES=	sysutils net
 MASTER_SITES=	http://smarden.org/socklog/
 
 MAINTAINER=	sergei@kolobov.com
 COMMENT=	Small and secure replacement for syslogd
 
-WRKSRC=		${WRKDIR}/admin/${DISTNAME}/src
+WRKSRC=		${WRKDIR}/admin/${DISTNAME}
 ALL_TARGET=	default
 
-PROGS=		socklog-conf socklog tryto uncat
 MAN1=		tryto.1 uncat.1
 MAN8=		socklog-conf.8 socklog.8
+DOCS=		package/CHANGES package/COPYING package/README doc/*.html
 
+do-configure:
+	${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/src/conf-cc
+
+do-build:
+	cd ${WRKSRC} && package/compile
+	
 do-install:
-	cd ${WRKSRC} && ${INSTALL_PROGRAM} ${PROGS} ${PREFIX}/bin
-	@${MKDIR} ${MANPREFIX}/man/man1 ${MANPREFIX}/man/man8
-	cd ${WRKSRC}/../man && ${INSTALL_MAN} ${MAN1} ${MANPREFIX}/man/man1
-	cd ${WRKSRC}/../man && ${INSTALL_MAN} ${MAN8} ${MANPREFIX}/man/man8
+	${INSTALL_PROGRAM} ${WRKSRC}/command/* ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/man/*.1 ${MANPREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/*.8 ${MANPREFIX}/man/man8
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/../doc/*.html ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/sysutils/socklog/pkg-plist,v
retrieving revision 1.2
diff -u -r1.2 pkg-plist
--- pkg-plist	2003/03/31 01:30:05	1.2
+++ pkg-plist	2003/04/01 10:48:53
@@ -2,6 +2,9 @@
 bin/socklog
 bin/tryto
 bin/uncat
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/benefits.html
 %%PORTDOCS%%%%DOCSDIR%%/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/examples.html
--- socklog-1.0.0.patch ends here ---

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: adamw 
State-Changed-When: Tue Apr 1 22:25:20 PST 2003 
State-Changed-Why:  
Committed, thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=50518 
>Unformatted:
