From sa@simon.org.ua  Mon Nov 12 04:36:54 2001
Return-Path: <sa@simon.org.ua>
Received: from lion.com.ua (lion.com.ua [213.133.161.130])
	by hub.freebsd.org (Postfix) with ESMTP id 190C837B419
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Nov 2001 04:36:40 -0800 (PST)
Received: from localhost (localhost [127.0.0.1])
	by lion.com.ua (8.11.6/8.11.6) with ESMTP id fACCaRx04060
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 12 Nov 2001 14:36:34 +0200 (EET)
	(envelope-from sa@simon.org.ua)
Message-Id: <20011112130346.H3261-100000@lion.com.ua>
Date: Mon, 12 Nov 2001 14:36:27 +0200 (EET)
From: Andrey Simonenko <simon@simon.org.ua>
To: FreeBSD-gnats-submit@freebsd.org
Subject: Maintainer updates port sysutils/ipa 1.1.6 -> 1.2

>Number:         31928
>Category:       ports
>Synopsis:       Maintainer updates port sysutils/ipa 1.1.6 -> 1.2
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 12 04:40:01 PST 2001
>Closed-Date:    Sun Dec 2 19:09:07 PST 2001
>Last-Modified:  Sun Dec 02 19:09:39 PST 2001
>Originator:     Andrey Simonenko
>Release:        FreeBSD 4.4-STABLE i386
>Organization:
>Environment:
	Current FreeBSD ports collection

>Description:

	Update port sysutils/ipa from version 1.1.6 to 1.2

	I use some ${INSTALL_*} variables in my Makefile, so please
	check if it is correct for the port of IPA. I didn't find any
	problems, nevertheless let ports commiters check this.

>How-To-Repeat:
>Fix:

diff -ruN ipa.orig/Makefile ipa/Makefile
--- ipa.orig/Makefile	Fri Oct  5 22:29:35 2001
+++ ipa/Makefile	Sun Nov 11 22:44:26 2001
@@ -6,7 +6,7 @@
 #

 PORTNAME=	ipa
-PORTVERSION=	1.1.6
+PORTVERSION=	1.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.simon.org.ua/ipa/

@@ -21,12 +21,5 @@
 MAN5=		ipa.5 ipa.conf.5
 MAN8=		ipa.8 ipastat.8
 MANLANG=	"" ru_RU.KOI8-R
-
-post-patch:
-	@${PERL} -pi -ne "s|/usr/local/|${PREFIX}/|" \
-		${WRKSRC}/Makefile
-
-post-install:
-	${CHMOD} 0400 ${PREFIX}/etc/ipa.conf.default

 .include <bsd.port.mk>
diff -ruN ipa.orig/distinfo ipa/distinfo
--- ipa.orig/distinfo	Fri Oct  5 22:29:35 2001
+++ ipa/distinfo	Sun Nov 11 22:38:42 2001
@@ -1 +1 @@
-MD5 (ipa-1.1.6.tar.gz) = b495ae5db65bd9d7d653b4770a7ed45d
+MD5 (ipa-1.2.tar.gz) = e48422034e60272653712a4df5419a51
diff -ruN ipa.orig/files/patch-aa ipa/files/patch-aa
--- ipa.orig/files/patch-aa	Fri Oct  5 22:29:35 2001
+++ ipa/files/patch-aa	Sun Nov 11 23:19:12 2001
@@ -1,71 +1,37 @@
---- Makefile.orig	Wed Oct  3 14:27:19 2001
-+++ Makefile	Thu Oct  4 20:46:16 2001
+--- Makefile.orig	Fri Nov  9 22:06:30 2001
++++ Makefile	Sun Nov 11 23:19:10 2001
 @@ -38,7 +38,7 @@
- #	-Ox   - optimize (it seems that -O3 also help to find out some errors);
+ #	-Ox   - optimize;
  #	-g    - produce debugging information.
  #
--CFLAGS=		-Wall -O -g
-+#CFLAGS=		-Wall -O -g
+-CFLAGS=		-Wall -O1 -g
++#CFLAGS=		-Wall -O1 -g

  #
- # DSTBINDIR - where to install binaries
-@@ -63,7 +63,7 @@
+ # PREFIX - prefix for all below listed paths
+@@ -97,10 +97,10 @@
  #
- # DSTSHAREDIR - where to install examples, etc.
+ # Some INSTALL_* variables
  #
--DSTSHAREDIR=	/usr/local/share/ipa
-+DSTSHAREDIR=	/usr/local/share/examples/ipa
+-INSTALL_MAN=		${INSTALL} -c -g wheel -o root -m 0444
+-INSTALL_DATA=		${INSTALL} -c -g wheel -o root -m 0444
+-INSTALL_PROGRAM=	${INSTALL} -c -g wheel -o root -m 0555
+-INSTALL_SCRIPT=		${INSTALL} -c -g wheel -o root -m 0500
++INSTALL_MAN=		${BSD_INSTALL_MAN}
++INSTALL_DATA=		${BSD_INSTALL_DATA}
++INSTALL_PROGRAM=	${BSD_INSTALL_PROGRAM}
++INSTALL_SCRIPT=		${BSD_INSTALL_SCRIPT}
+ INSTALL_MAN_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
+ INSTALL_DATA_DIR=	${INSTALL} -d -m 0555 -g wheel -o root

- #
- # IP6FW (FreeBSD only)
-@@ -204,10 +204,10 @@
- 	@${ECHO}
- .else
- 	@${ECHO} ">> Installing binaries, manual pages and miscellaneous files"
--	${INSTALL} -c -g wheel -o root -m 0555 ipa ipastat ${DSTBINDIR}
-+	${BSD_INSTALL_PROGRAM} ipa ipastat ${DSTBINDIR}
- 	${CHMOD} u+s ${DSTBINDIR}/ipastat
--	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
--	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
-+	${BSD_INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
-+	${BSD_INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
- .if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man5)
- 	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_SU.KOI8-R/man5
- .endif
-@@ -216,13 +216,22 @@
+@@ -235,8 +235,10 @@
  .endif
- .if !exists(${DSTMANDIR}/ru_RU.KOI8-R)
- 	${LN} -s ${DSTMANDIR}/ru_SU.KOI8-R ${DSTMANDIR}/ru_RU.KOI8-R
-+.else
-+.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man5)
-+	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_RU.KOI8-R/man5
-+.endif
-+.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man8)
-+	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_RU.KOI8-R/man8
-+.endif
-+.endif
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
-+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
+ 	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_SU.KOI8-R/man5
+ 	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_SU.KOI8-R/man8
 +.if !defined(NOPORTDOCS)
-+	${INSTALL} -d -m 0555 ${DSTSHAREDIR}
-+	${BSD_INSTALL_DATA} examples/* ${DSTSHAREDIR}
- .endif
--	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
--	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
--	${INSTALL} -d -m 0555 ${DSTSHAREDIR}/examples
--	${INSTALL} -c -g wheel -o root -m 0444 examples/* ${DSTSHAREDIR}/examples
+ 	${INSTALL_DATA_DIR} ${DSTEXAMPLEDIR}
+ 	${INSTALL_DATA} examples/* ${DSTEXAMPLEDIR}
++.endif
  .if exists(${DSTRCDIR})
--	${INSTALL} -c -g wheel -o root -m 0500 etc/ipa.sh.sample ${DSTRCDIR}
-+	${BSD_INSTALL_DATA} etc/ipa.sh.sample ${DSTRCDIR}
- .else
- 	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
-@@ -230,7 +239,7 @@
- 	@${ECHO}
- .endif
- .if exists(${DSTETCDIR})
--	${INSTALL} -c -g wheel -o root -m 0400 etc/ipa.conf.default ${DSTETCDIR}
-+	${BSD_INSTALL_DATA} etc/ipa.conf.default ${DSTETCDIR}
+ 	${INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}
  .else
- 	@${ECHO}
- 	@${ECHO} ">> Can't find directory ${DSTETCDIR}, skip installing of ipa.conf.default"

>Release-Note:
>Audit-Trail:

From: "David W. Chapman Jr." <dwcjr@inethouston.net>
To: freebsd-gnats-submit@FreeBSD.org, simon@simon.org.ua
Cc:  
Subject: Re: ports/31928: Maintainer updates port sysutils/ipa 1.1.6 -> 1.2
Date: Thu, 22 Nov 2001 23:11:59 -0600

 patch-aa fails to apply on my sytstem.
 

From: Andrey Simonenko <simon@simon.org.ua>
To: "David W. Chapman Jr." <dwcjr@inethouston.net>
Cc: freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/31928: Maintainer updates port sysutils/ipa 1.1.6 -> 1.2
Date: Mon, 26 Nov 2001 12:02:37 +0200 (EET)

 On Thu, 22 Nov 2001, David W. Chapman Jr. wrote:
 
 > patch-aa fails to apply on my sytstem.
 >
 >
 
 It fails on my system too, probably I broked it when included to
 the letter.
 IPA-1.2.1 is ready, so I send patch for upgrading sysutils/ipa to 1.2.1
 version:
 
 diff -ruN ipa.orig/Makefile ipa/Makefile
 --- ipa.orig/Makefile	Fri Oct  5 22:29:35 2001
 +++ ipa/Makefile	Sat Nov 24 22:57:07 2001
 @@ -6,7 +6,7 @@
  #
 
  PORTNAME=	ipa
 -PORTVERSION=	1.1.6
 +PORTVERSION=	1.2.1
  CATEGORIES=	sysutils
  MASTER_SITES=	http://www.simon.org.ua/ipa/
 
 @@ -21,12 +21,5 @@
  MAN5=		ipa.5 ipa.conf.5
  MAN8=		ipa.8 ipastat.8
  MANLANG=	"" ru_RU.KOI8-R
 -
 -post-patch:
 -	@${PERL} -pi -ne "s|/usr/local/|${PREFIX}/|" \
 -		${WRKSRC}/Makefile
 -
 -post-install:
 -	${CHMOD} 0400 ${PREFIX}/etc/ipa.conf.default
 
  .include <bsd.port.mk>
 diff -ruN ipa.orig/distinfo ipa/distinfo
 --- ipa.orig/distinfo	Fri Oct  5 22:29:35 2001
 +++ ipa/distinfo	Sat Nov 24 22:57:16 2001
 @@ -1 +1 @@
 -MD5 (ipa-1.1.6.tar.gz) = b495ae5db65bd9d7d653b4770a7ed45d
 +MD5 (ipa-1.2.1.tar.gz) = e9f33b34b1a90e1f520aa7c2732aa06e
 diff -ruN ipa.orig/files/patch-aa ipa/files/patch-aa
 --- ipa.orig/files/patch-aa	Fri Oct  5 22:29:35 2001
 +++ ipa/files/patch-aa	Sun Nov 11 23:19:12 2001
 @@ -1,71 +1,37 @@
 ---- Makefile.orig	Wed Oct  3 14:27:19 2001
 -+++ Makefile	Thu Oct  4 20:46:16 2001
 +--- Makefile.orig	Fri Nov  9 22:06:30 2001
 ++++ Makefile	Sun Nov 11 23:19:10 2001
  @@ -38,7 +38,7 @@
 - #	-Ox   - optimize (it seems that -O3 also help to find out some errors);
 + #	-Ox   - optimize;
   #	-g    - produce debugging information.
   #
 --CFLAGS=		-Wall -O -g
 -+#CFLAGS=		-Wall -O -g
 +-CFLAGS=		-Wall -O1 -g
 ++#CFLAGS=		-Wall -O1 -g
 
   #
 - # DSTBINDIR - where to install binaries
 -@@ -63,7 +63,7 @@
 + # PREFIX - prefix for all below listed paths
 +@@ -97,10 +97,10 @@
   #
 - # DSTSHAREDIR - where to install examples, etc.
 + # Some INSTALL_* variables
   #
 --DSTSHAREDIR=	/usr/local/share/ipa
 -+DSTSHAREDIR=	/usr/local/share/examples/ipa
 +-INSTALL_MAN=		${INSTALL} -c -g wheel -o root -m 0444
 +-INSTALL_DATA=		${INSTALL} -c -g wheel -o root -m 0444
 +-INSTALL_PROGRAM=	${INSTALL} -c -g wheel -o root -m 0555
 +-INSTALL_SCRIPT=		${INSTALL} -c -g wheel -o root -m 0500
 ++INSTALL_MAN=		${BSD_INSTALL_MAN}
 ++INSTALL_DATA=		${BSD_INSTALL_DATA}
 ++INSTALL_PROGRAM=	${BSD_INSTALL_PROGRAM}
 ++INSTALL_SCRIPT=		${BSD_INSTALL_SCRIPT}
 + INSTALL_MAN_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
 + INSTALL_DATA_DIR=	${INSTALL} -d -m 0555 -g wheel -o root
 
 - #
 - # IP6FW (FreeBSD only)
 -@@ -204,10 +204,10 @@
 - 	@${ECHO}
 - .else
 - 	@${ECHO} ">> Installing binaries, manual pages and miscellaneous files"
 --	${INSTALL} -c -g wheel -o root -m 0555 ipa ipastat ${DSTBINDIR}
 -+	${BSD_INSTALL_PROGRAM} ipa ipastat ${DSTBINDIR}
 - 	${CHMOD} u+s ${DSTBINDIR}/ipastat
 --	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
 --	${INSTALL} -c -g wheel -o root -m 0444 man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
 -+	${BSD_INSTALL_MAN} man/ipa.5 man/ipa.conf.5 ${DSTMANDIR}/man5
 -+	${BSD_INSTALL_MAN} man/ipa.8 man/ipastat.8 ${DSTMANDIR}/man8
 - .if !exists(${DSTMANDIR}/ru_SU.KOI8-R/man5)
 - 	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_SU.KOI8-R/man5
 - .endif
 -@@ -216,13 +216,22 @@
 +@@ -235,8 +235,10 @@
   .endif
 - .if !exists(${DSTMANDIR}/ru_RU.KOI8-R)
 - 	${LN} -s ${DSTMANDIR}/ru_SU.KOI8-R ${DSTMANDIR}/ru_RU.KOI8-R
 -+.else
 -+.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man5)
 -+	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_RU.KOI8-R/man5
 -+.endif
 -+.if !exists(${DSTMANDIR}/ru_RU.KOI8-R/man8)
 -+	${INSTALL} -d -m 0555 ${DSTMANDIR}/ru_RU.KOI8-R/man8
 -+.endif
 -+.endif
 -+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
 -+	${BSD_INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
 + 	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_SU.KOI8-R/man5
 + 	${INSTALL_MAN} man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_SU.KOI8-R/man8
  +.if !defined(NOPORTDOCS)
 -+	${INSTALL} -d -m 0555 ${DSTSHAREDIR}
 -+	${BSD_INSTALL_DATA} examples/* ${DSTSHAREDIR}
 - .endif
 --	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.5 man/ru_RU.KOI8-R/ipa.conf.5 ${DSTMANDIR}/ru_RU.KOI8-R/man5
 --	${INSTALL} -c -g wheel -o root -m 0444 man/ru_RU.KOI8-R/ipa.8 man/ru_RU.KOI8-R/ipastat.8 ${DSTMANDIR}/ru_RU.KOI8-R/man8
 --	${INSTALL} -d -m 0555 ${DSTSHAREDIR}/examples
 --	${INSTALL} -c -g wheel -o root -m 0444 examples/* ${DSTSHAREDIR}/examples
 + 	${INSTALL_DATA_DIR} ${DSTEXAMPLEDIR}
 + 	${INSTALL_DATA} examples/* ${DSTEXAMPLEDIR}
 ++.endif
   .if exists(${DSTRCDIR})
 --	${INSTALL} -c -g wheel -o root -m 0500 etc/ipa.sh.sample ${DSTRCDIR}
 -+	${BSD_INSTALL_DATA} etc/ipa.sh.sample ${DSTRCDIR}
 - .else
 - 	@${ECHO}
 - 	@${ECHO} ">> Can't find directory ${DSTRCDIR}, skip installing of ipa.sh.sample"
 -@@ -230,7 +239,7 @@
 - 	@${ECHO}
 - .endif
 - .if exists(${DSTETCDIR})
 --	${INSTALL} -c -g wheel -o root -m 0400 etc/ipa.conf.default ${DSTETCDIR}
 -+	${BSD_INSTALL_DATA} etc/ipa.conf.default ${DSTETCDIR}
 + 	${INSTALL_SCRIPT} etc/ipa.sh.sample ${DSTRCDIR}
   .else
 - 	@${ECHO}
 - 	@${ECHO} ">> Can't find directory ${DSTETCDIR}, skip installing of ipa.conf.default"
 
State-Changed-From-To: open->closed 
State-Changed-By: steve 
State-Changed-When: Sun Dec 2 19:09:07 PST 2001 
State-Changed-Why:  
Update committed, thanks! 

http://www.FreeBSD.org/cgi/query-pr.cgi?pr=31928 
>Unformatted:
