Index: head/biology/lamarc/Makefile
===================================================================
--- head/biology/lamarc/Makefile	(revision 420391)
+++ head/biology/lamarc/Makefile	(revision 420392)
@@ -1,41 +1,36 @@
 # Created by: Johann Visagie <wjv@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	lamarc
 PORTVERSION=	2.1.8
 DISTVERSIONSUFFIX=	-src
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	biology
 MASTER_SITES=	http://evolution.genetics.washington.edu/lamarc/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Package of programs for computing population parameters
 
 LICENSE=	APACHE20
 
-OPTIONS_DEFINE=	WXGTK DOCS
-
 WRKSRC=		${WRKDIR}/${DISTNAME:S,${DISTVERSIONSUFFIX},,}
 
 GNU_CONFIGURE=	yes
 
 PORTDOCS=	*
 PLIST_FILES=	bin/${PORTNAME}
 
-.include <bsd.port.options.mk>
+OPTIONS_DEFINE=	WXGTK DOCS
 
-.if ${PORT_OPTIONS:MWXGTK}
-USE_WX=		2.8
-WX_CONF_ARGS=	absolute
-WX_UNICODE=	yes
-PLIST_FILES+=	bin/lam_conv
-.else
-CONFIGURE_ARGS+=	--disable-converter
-.endif
+WXGTK_USE=		WX=2.8
+WXGTK_VARS=		WX_CONF_ARGS=absolute
+WXGTK_PLIST_FILES=	bin/lam_conv
+WXGTK_CONFIGURE_OFF=	--disable-converter
+WXGTK_BROKEN=		does not build
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		's|/html/lamarc|/${DOCSDIR_REL}|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
Index: head/biology/lamarc/files/patch-src__control__defaults.h
===================================================================
--- head/biology/lamarc/files/patch-src__control__defaults.h	(revision 420391)
+++ head/biology/lamarc/files/patch-src__control__defaults.h	(nonexistent)
@@ -1,10 +0,0 @@
---- src/control/defaults.h.orig
-+++ src/control/defaults.h
-@@ -3,6 +3,7 @@
- #ifndef DEFAULTS_H
- #define DEFAULTS_H
- 
-+#include <ctime>
- #include <string>
- #include "constants.h"
- #include "local_build.h"

Property changes on: head/biology/lamarc/files/patch-src__control__defaults.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/biology/lamarc/files/patch-src-tools_stringx.h
===================================================================
--- head/biology/lamarc/files/patch-src-tools_stringx.h	(revision 420391)
+++ head/biology/lamarc/files/patch-src-tools_stringx.h	(nonexistent)
@@ -1,56 +0,0 @@
---- src/tools/stringx.h.orig	2012-12-03 12:01:34.000000000 +0100
-+++ src/tools/stringx.h	2012-12-03 12:02:30.000000000 +0100
-@@ -107,6 +107,26 @@
- 
- bool ciStringEqual(const std::string& s1, const std::string& s2);
- 
-+
-+// functions for making xmltags and lines of xml
-+std::string MakeTag(const std::string& str);
-+std::string MakeCloseTag(const std::string& str);
-+std::string MakeTagWithName(const std::string& tag, const std::string& name);
-+std::string MakeTagWithType(const std::string& tag, const std::string& type);
-+std::string MakeTagWithTypePlusPanel(const std::string& tag, const std::string& type);
-+std::string MakeTagWithConstraint(const std::string& tag, const std::string& constraint);
-+std::string MakeJustified(const std::string & str, long width=DEFLINELENGTH);
-+std::string MakeJustified(const char* str, long width=DEFLINELENGTH);
-+std::string MakeCentered(const std::string& str, long width=DEFLINELENGTH,
-+                         long indent=DEFINDENT, bool trunc=true);
-+std::string MakeCentered(const char* str, long width=DEFLINELENGTH,
-+                         long indent=DEFINDENT, bool trunc=true);
-+std::string MakeIndent(const std::string & str, unsigned long indent);
-+std::string MakeIndent(const char* str, unsigned long indent);
-+std::string Pretty(double number, int width=DEFWIDTH);
-+std::string Pretty(long number, int width=DEFWIDTH);
-+std::string Pretty(unsigned long number, int width=DEFWIDTH);
-+std::string Pretty(std::string str, int width=DEFWIDTH);
- //------------------------------------------------------------------------------------
- 
- template <class T>
-@@ -188,26 +208,6 @@
- 
- DoubleVec1d StringToDoubleVecOrBarf(const std::string& in);
- 
--// functions for making xmltags and lines of xml
--std::string MakeTag(const std::string& str);
--std::string MakeCloseTag(const std::string& str);
--std::string MakeTagWithName(const std::string& tag, const std::string& name);
--std::string MakeTagWithType(const std::string& tag, const std::string& type);
--std::string MakeTagWithTypePlusPanel(const std::string& tag, const std::string& type);
--std::string MakeTagWithConstraint(const std::string& tag, const std::string& constraint);
--std::string MakeJustified(const std::string & str, long width=DEFLINELENGTH);
--std::string MakeJustified(const char* str, long width=DEFLINELENGTH);
--std::string MakeCentered(const std::string& str, long width=DEFLINELENGTH,
--                         long indent=DEFINDENT, bool trunc=true);
--std::string MakeCentered(const char* str, long width=DEFLINELENGTH,
--                         long indent=DEFINDENT, bool trunc=true);
--std::string MakeIndent(const std::string & str, unsigned long indent);
--std::string MakeIndent(const char* str, unsigned long indent);
--std::string Pretty(double number, int width=DEFWIDTH);
--std::string Pretty(long number, int width=DEFWIDTH);
--std::string Pretty(unsigned long number, int width=DEFWIDTH);
--std::string Pretty(std::string str, int width=DEFWIDTH);
--
- bool   StringCompare(const std::string&, const char*, long, long);
- bool   StringCompare(const std::string&, const std::string&, long, long);
- 

Property changes on: head/biology/lamarc/files/patch-src-tools_stringx.h
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/biology/lamarc/files/patch-src_control_defaults.h
===================================================================
--- head/biology/lamarc/files/patch-src_control_defaults.h	(nonexistent)
+++ head/biology/lamarc/files/patch-src_control_defaults.h	(revision 420392)
@@ -0,0 +1,10 @@
+--- src/control/defaults.h.orig	2012-05-01 21:38:26 UTC
++++ src/control/defaults.h
+@@ -3,6 +3,7 @@
+ #ifndef DEFAULTS_H
+ #define DEFAULTS_H
+ 
++#include <ctime>
+ #include <string>
+ #include "constants.h"
+ #include "local_build.h"

Property changes on: head/biology/lamarc/files/patch-src_control_defaults.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
Index: head/biology/lamarc/files/patch-src_tools_stringx.h
===================================================================
--- head/biology/lamarc/files/patch-src_tools_stringx.h	(nonexistent)
+++ head/biology/lamarc/files/patch-src_tools_stringx.h	(revision 420392)
@@ -0,0 +1,56 @@
+--- src/tools/stringx.h.orig	2011-04-23 02:02:49 UTC
++++ src/tools/stringx.h
+@@ -107,6 +107,26 @@ struct CIStringCompare : public std::bin
+ 
+ bool ciStringEqual(const std::string& s1, const std::string& s2);
+ 
++
++// functions for making xmltags and lines of xml
++std::string MakeTag(const std::string& str);
++std::string MakeCloseTag(const std::string& str);
++std::string MakeTagWithName(const std::string& tag, const std::string& name);
++std::string MakeTagWithType(const std::string& tag, const std::string& type);
++std::string MakeTagWithTypePlusPanel(const std::string& tag, const std::string& type);
++std::string MakeTagWithConstraint(const std::string& tag, const std::string& constraint);
++std::string MakeJustified(const std::string & str, long width=DEFLINELENGTH);
++std::string MakeJustified(const char* str, long width=DEFLINELENGTH);
++std::string MakeCentered(const std::string& str, long width=DEFLINELENGTH,
++                         long indent=DEFINDENT, bool trunc=true);
++std::string MakeCentered(const char* str, long width=DEFLINELENGTH,
++                         long indent=DEFINDENT, bool trunc=true);
++std::string MakeIndent(const std::string & str, unsigned long indent);
++std::string MakeIndent(const char* str, unsigned long indent);
++std::string Pretty(double number, int width=DEFWIDTH);
++std::string Pretty(long number, int width=DEFWIDTH);
++std::string Pretty(unsigned long number, int width=DEFWIDTH);
++std::string Pretty(std::string str, int width=DEFWIDTH);
+ //------------------------------------------------------------------------------------
+ 
+ template <class T>
+@@ -188,26 +208,6 @@ bool FromString(const std::string & in, 
+ 
+ DoubleVec1d StringToDoubleVecOrBarf(const std::string& in);
+ 
+-// functions for making xmltags and lines of xml
+-std::string MakeTag(const std::string& str);
+-std::string MakeCloseTag(const std::string& str);
+-std::string MakeTagWithName(const std::string& tag, const std::string& name);
+-std::string MakeTagWithType(const std::string& tag, const std::string& type);
+-std::string MakeTagWithTypePlusPanel(const std::string& tag, const std::string& type);
+-std::string MakeTagWithConstraint(const std::string& tag, const std::string& constraint);
+-std::string MakeJustified(const std::string & str, long width=DEFLINELENGTH);
+-std::string MakeJustified(const char* str, long width=DEFLINELENGTH);
+-std::string MakeCentered(const std::string& str, long width=DEFLINELENGTH,
+-                         long indent=DEFINDENT, bool trunc=true);
+-std::string MakeCentered(const char* str, long width=DEFLINELENGTH,
+-                         long indent=DEFINDENT, bool trunc=true);
+-std::string MakeIndent(const std::string & str, unsigned long indent);
+-std::string MakeIndent(const char* str, unsigned long indent);
+-std::string Pretty(double number, int width=DEFWIDTH);
+-std::string Pretty(long number, int width=DEFWIDTH);
+-std::string Pretty(unsigned long number, int width=DEFWIDTH);
+-std::string Pretty(std::string str, int width=DEFWIDTH);
+-
+ bool   StringCompare(const std::string&, const char*, long, long);
+ bool   StringCompare(const std::string&, const std::string&, long, long);
+ 

Property changes on: head/biology/lamarc/files/patch-src_tools_stringx.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