Index: head/net/gnu-dico/Makefile
===================================================================
--- head/net/gnu-dico/Makefile	(revision 547349)
+++ head/net/gnu-dico/Makefile	(revision 547350)
@@ -1,66 +1,68 @@
 # Created by: Goran Tal
 # $FreeBSD$
 
 PORTNAME=	dico
 PORTVERSION=	2.7
 PORTREVISION=	3
 CATEGORIES=	net textproc
 MASTER_SITES=	GNU
 PKGNAMEPREFIX=	gnu-
 
 MAINTAINER=	goran.tal@gmail.com
 COMMENT=	Flexible modular implementation of DICT server
 
 LIB_DEPENDS=	libltdl.so:devel/libltdl
 
 USE_LDCONFIG=	yes
 USES=		tar:xz gmake libtool localbase pkgconfig
 
 GNU_CONFIGURE=	yes
 
 INFO=		dico
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	dicod
 
 OPTIONS_DEFINE=	PYTHON GUILE PCRE GSASL PAM LDAP NLS
 OPTIONS_DEFAULT=	PYTHON PCRE
 OPTIONS_SUB=	yes
 GSASL_DESC=	GSASL support
 
 PYTHON_USES=		python
 PYTHON_CONFIGURE_ENV=	PYTHON_CONFIG=${PYTHON_CMD}-config
 PYTHON_CONFIGURE_OFF=	--without-python
 
 GUILE_LIB_DEPENDS=	libguile-2.2.so:lang/guile2
 GUILE_CONFIGURE_OFF=	--without-guile
 
 PCRE_LIB_DEPENDS=	libpcre.so:devel/pcre
 PCRE_CONFIGURE_OFF=	--without-pcre
 
 GSASL_LIB_DEPENDS=	libgsasl.so:security/libgsasl
 GSASL_CONFIGURE_WITH=	gsasl
 
 PAM_CONFIGURE_ENABLE=	pam
 
 LDAP_USE=		OPENLDAP=yes
 LDAP_CONFIGURE_OFF=	--without-ldap
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 post-patch:
 	@${REINPLACE_CMD} 's/@bindir@/@sbindir@/' ${WRKSRC}/dicod/Makefile.in
 	@${REINPLACE_CMD} 's/(bindir)..dir/&\/gdico/' ${WRKSRC}/dico/Makefile.in
 	@${REINPLACE_CMD} '/INSTALL.*charset/d' ${WRKSRC}/gnu/Makefile.in
 	@${REINPLACE_CMD} \
 		-e 's/mu_check_lib_save_LIBS/LIBS/' \
 		-e 's/python-config/$${PYTHON_CONFIG}/' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} 's/mergesort/xmergesort/' ${WRKSRC}/lib/mergesort.c
+	@${REINPLACE_CMD} -E '/(dico_markup_list|text_udb_def);/s,^,extern ,' \
+		${WRKSRC}/include/dico/markup.h ${WRKSRC}/dicod/dicod.h
 
 post-install:
 	${INSTALL_DATA} ${FILESDIR}/dicod.conf ${STAGEDIR}${PREFIX}/etc/dicod.conf.sample
 
 .include <bsd.port.mk>
Index: head/net/hping/Makefile
===================================================================
--- head/net/hping/Makefile	(revision 547349)
+++ head/net/hping/Makefile	(revision 547350)
@@ -1,43 +1,49 @@
 # Created by: Roman Shterenzon <roman@xpert.com>
 # $FreeBSD$
 
 PORTNAME=	hping
 PORTVERSION=	2.0.0r3
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	net security
 MASTER_SITES=	http://www.hping.org/ \
 		http://200ok.org/distfiles/hping/
 DISTNAME=	hping2.0.0-rc3
 
 MAINTAINER=	ecu@200ok.org
 COMMENT=	Network auditing tool
 
 CONFLICTS=	hping-devel-[0-9]*
 
 WRKSRC=		${WRKDIR}/hping2-rc3
 
 BROKEN_aarch64=	fails to build: cannot find the byte order for this architecture, fix bytesex.h
 
 USES=		gmake
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--force-libpcap
 
 PLIST_FILES=	sbin/hping man/man8/hping.8.gz
 PORTDOCS=	AS-BACKDOOR HPING2-HOWTO.txt HPING2-IS-OPEN \
 		MORE-FUN-WITH-IPID SPOOFED_SCAN.txt APD.txt
 
 OPTIONS_DEFINE=	DOCS
 
 EXTRA_PATCHES=	${FILESDIR}/extra-patch-sendip.c
 
+post-patch:
+	@${REINPLACE_CMD} -e '/^struct ars_layer_info ars_linfo/d' \
+		${WRKSRC}/ars.h
+	@${REINPLACE_CMD} -e '/^volatile struct delaytable_element/d' \
+		${WRKSRC}/hping2.h
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/hping2 ${STAGEDIR}${PREFIX}/sbin/hping
 	${INSTALL_MAN} ${WRKSRC}/docs/hping2.8 \
 		${STAGEDIR}${MANPREFIX}/man/man8/hping.8
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/docs/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
Index: head/security/gnomint/files/patch-src_ca__file.h
===================================================================
--- head/security/gnomint/files/patch-src_ca__file.h	(nonexistent)
+++ head/security/gnomint/files/patch-src_ca__file.h	(revision 547350)
@@ -0,0 +1,31 @@
+--- src/ca_file.h.orig	2010-05-31 21:01:37 UTC
++++ src/ca_file.h
+@@ -75,8 +75,7 @@ enum {CA_FILE_CA_COLUMN_ID=0,
+       CA_FILE_CA_COLUMN_DN=3,
+       CA_FILE_CA_COLUMN_PARENT_DN=4,
+       CA_FILE_CA_COLUMN_PEM=5,
+-      CA_FILE_CA_COLUMN_NUMBER=6}
+-        CaFileCAColumns;
++      CA_FILE_CA_COLUMN_NUMBER=6};
+ 
+ enum {CA_FILE_CERT_COLUMN_ID=0,
+       CA_FILE_CERT_COLUMN_IS_CA=1,
+@@ -90,16 +89,14 @@ enum {CA_FILE_CERT_COLUMN_ID=0,
+       CA_FILE_CERT_COLUMN_DN=9,
+       CA_FILE_CERT_COLUMN_PARENT_DN=10,
+       CA_FILE_CERT_COLUMN_PARENT_ROUTE=11,
+-      CA_FILE_CERT_COLUMN_NUMBER=12}
+-        CaFileCertColumns;
++      CA_FILE_CERT_COLUMN_NUMBER=12};
+ 
+ enum {CA_FILE_CSR_COLUMN_ID=0,
+       CA_FILE_CSR_COLUMN_SUBJECT=1,
+       CA_FILE_CSR_COLUMN_PRIVATE_KEY_IN_DB=2,
+       CA_FILE_CSR_COLUMN_PEM=3,
+       CA_FILE_CSR_COLUMN_PARENT_ID=4,
+-      CA_FILE_CSR_COLUMN_NUMBER=5}
+-        CaFileCSRColumns;
++      CA_FILE_CSR_COLUMN_NUMBER=5};
+ 
+ 
+ gboolean ca_file_foreach_ca (CaFileCallbackFunc func, gpointer userdata);

Property changes on: head/security/gnomint/files/patch-src_ca__file.h
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property