ports/117240: [MAINTAINER] net-mgmt/send: [Fixing compilation problems]

[Janos Mohacsi]

>Number:         117240
>Category:       ports
>Synopsis:       [MAINTAINER] net-mgmt/send: [Fixing compilation problems]
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Oct 16 11:50:01 UTC 2007
>Closed-Date:
>Last-Modified:
>Originator:     Janos Mohacsi
>Release:        FreeBSD 6.2-STABLE i386
>Organization:
NIIF/HUNGARNET
>Environment:
System: FreeBSD csoki.ki.iif.hu 6.2-STABLE FreeBSD 6.2-STABLE #2: Fri Oct  5 18:44:32 CEST
>Description:
The package cleanly compiles now on FreBSD 6.2 and FreeBSD 7.x.

Added file(s):
- files/extra-patch-include_pkixip__ext__asn.h

Removed file(s):
- files/patch-include_pkixip__ext__asn.h

Generated with FreeBSD Port Tools 0.77
>How-To-Repeat:
>Fix:

--- send-0.2_1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net-mgmt/send.orig/Makefile /usr/ports/net-mgmt/send/Makefile
--- /usr/ports/net-mgmt/send.orig/Makefile	2007-09-23 08:39:05.000000000 +0200
+++ /usr/ports/net-mgmt/send/Makefile	2007-10-16 11:05:08.000000000 +0200
@@ -6,6 +6,7 @@
 
 PORTNAME=	send
 PORTVERSION=	0.2
+PORTREVISION=	1
 CATEGORIES=	net-mgmt ipv6
 MASTER_SITES=	#http://www.docomolabs-usa.com/lab_osrc_guide.html
 DISTNAME=	${PORTNAME}_${PORTVERSION}
@@ -25,8 +26,12 @@
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 600000
-BROKEN=		doesn't compile in FreeBSD > 6.0
+.if ${OSVERSION} < 600000
+BROKEN=		doesn't compile in FreeBSD < 6.0
+.endif
+
+.if ${OSVERSION} > 700000
+EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_pkixip__ext__asn.h
 .endif
 
 .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX})
diff -ruN --exclude=CVS /usr/ports/net-mgmt/send.orig/files/extra-patch-include_pkixip__ext__asn.h /usr/ports/net-mgmt/send/files/extra-patch-include_pkixip__ext__asn.h
--- /usr/ports/net-mgmt/send.orig/files/extra-patch-include_pkixip__ext__asn.h	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net-mgmt/send/files/extra-patch-include_pkixip__ext__asn.h	2007-09-23 08:39:06.000000000 +0200
@@ -0,0 +1,45 @@
+
+$FreeBSD: ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h,v 1.1 2007/09/23 06:39:06 edwin Exp $
+
+--- include/pkixip_ext_asn.h.orig
++++ include/pkixip_ext_asn.h
+@@ -45,6 +45,7 @@
+ #define	IANA_SAFI_BOTH		3
+ #define	IANA_SAFI_MPLS		4
+ 
++/*
+ typedef struct IPAddressRange_st {
+ 	ASN1_BIT_STRING		*min;
+ 	ASN1_BIT_STRING		*max;
+@@ -52,9 +53,6 @@
+ 
+ typedef struct IPAddressOrRange_st {
+ 
+-#define	IP_AOR_PREFIX		0
+-#define	IP_AOR_RANGE		1
+-
+ 	int 			type;
+ 	union {
+ 		ASN1_BIT_STRING	*addressPrefix;
+@@ -64,8 +62,6 @@
+ 
+ typedef struct IPAddressChoice_st {
+ 
+-#define	IPA_CHOICE_INHERIT	0
+-#define	IPA_CHOICE_AOR		1
+ 
+ 	int 			type;
+ 	union {
+@@ -78,6 +74,12 @@
+ 	ASN1_OCTET_STRING	*addressFamily;
+ 	IPAddressChoice		*ipAddressChoice;
+ } IPAddressFamily;
++*/
++
++#define	IP_AOR_PREFIX		0
++#define	IP_AOR_RANGE		1
++#define	IPA_CHOICE_INHERIT	0
++#define	IPA_CHOICE_AOR		1
+ 
+ typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
+ 
diff -ruN --exclude=CVS /usr/ports/net-mgmt/send.orig/files/patch-include_pkixip__ext__asn.h /usr/ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h
--- /usr/ports/net-mgmt/send.orig/files/patch-include_pkixip__ext__asn.h	2007-09-23 08:39:06.000000000 +0200
+++ /usr/ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h	1970-01-01 01:00:00.000000000 +0100
@@ -1,45 +0,0 @@
-
-$FreeBSD: ports/net-mgmt/send/files/patch-include_pkixip__ext__asn.h,v 1.1 2007/09/23 06:39:06 edwin Exp $
-
---- include/pkixip_ext_asn.h.orig
-+++ include/pkixip_ext_asn.h
-@@ -45,6 +45,7 @@
- #define	IANA_SAFI_BOTH		3
- #define	IANA_SAFI_MPLS		4
- 
-+/*
- typedef struct IPAddressRange_st {
- 	ASN1_BIT_STRING		*min;
- 	ASN1_BIT_STRING		*max;
-@@ -52,9 +53,6 @@
- 
- typedef struct IPAddressOrRange_st {
- 
--#define	IP_AOR_PREFIX		0
--#define	IP_AOR_RANGE		1
--
- 	int 			type;
- 	union {
- 		ASN1_BIT_STRING	*addressPrefix;
-@@ -64,8 +62,6 @@
- 
- typedef struct IPAddressChoice_st {
- 
--#define	IPA_CHOICE_INHERIT	0
--#define	IPA_CHOICE_AOR		1
- 
- 	int 			type;
- 	union {
-@@ -78,6 +74,12 @@
- 	ASN1_OCTET_STRING	*addressFamily;
- 	IPAddressChoice		*ipAddressChoice;
- } IPAddressFamily;
-+*/
-+
-+#define	IP_AOR_PREFIX		0
-+#define	IP_AOR_RANGE		1
-+#define	IPA_CHOICE_INHERIT	0
-+#define	IPA_CHOICE_AOR		1
- 
- typedef STACK_OF(IPAddressFamily) IPAddrBlocks;
- 
--- send-0.2_1.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted: