Bug 31928

Summary: Maintainer updates port sysutils/ipa 1.1.6 -> 1.2
Product: Ports & Packages Reporter: simon <simon>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
file.diff none

Description simon 2001-11-12 12:40:01 UTC 
	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.

Fix: 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>


#
- # 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"--iI6Qpbe3wqRqnS4LfCZvwGMyYp03CMDE9bWtKWP0ZBCddSZc
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

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 @@
 #
Comment 1 dwcjr 2001-11-23 05:11:59 UTC 
patch-aa fails to apply on my sytstem.
Comment 2 simon 2001-11-26 10:02:37 UTC 
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"
Comment 3 Steve Price freebsd_committer freebsd_triage 2001-12-03 03:09:07 UTC 
State Changed
From-To: open->closed

Update committed, thanks!