3 files changed, 12 insertions, 71 deletions

diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index 8a125060e2fd..89a89f7c89f7 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	retawq
-PORTVERSION=	0.1.1
+PORTVERSION=	0.1.2
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,12 +16,19 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-USE_GMAKE=	yes
-MAKE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" THREAD_LIBS="${PTHREAD_LIBS}"
-ALL_TARGET=	build_binary
+USE_REINPLACE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
+CONFIGURE_ARGS=	--path-archprefix=${PREFIX} --path-prefix=${PREFIX} \
+		--enable-i18n --enable-local-cgi --enable-ipv6
 
 MAN1=		retawq.1
 
+post-configure:
+	@${REINPLACE_CMD} -e 's|_IN_H 0|_IN_H 1|g ; \
+		 s|_SOCKET_H 0|_SOCKET_H 1|g' ${WRKSRC}/.config
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/retawq ${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/docu/retawq.1 ${MANPREFIX}/man/man1
diff --git a/www/retawq/distinfo b/www/retawq/distinfo
index 2580495f93fb..13e693867a6a 100644
--- a/www/retawq/distinfo
+++ b/www/retawq/distinfo
@@ -1 +1 @@
-MD5 (retawq-0.1.1.tar.gz) = d98ff734beab3314157268c2be00051e
+MD5 (retawq-0.1.2.tar.gz) = 813b2029c678f3b0519d1597472b7b1f
diff --git a/www/retawq/files/patch-Makefile b/www/retawq/files/patch-Makefile
deleted file mode 100644
index d44115d4f477..000000000000
--- a/www/retawq/files/patch-Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
---- Makefile.orig	Wed Aug 28 19:28:25 2002
-+++ Makefile	Wed Nov 13 09:33:04 2002
-@@ -16,24 +16,24 @@
- OPTION_CED = 1
- 
- # i18n (internationalization)
--OPTION_I18N = 0
--PATH_INSTALL_LOCALE = \"/usr/local/share/locale\"
-+OPTION_I18N = 1
-+PATH_INSTALL_LOCALE = \"${PREFIX}/share/locale\"
- 
- # path for "make install"; don't add a trailing "/"!
--PATH_INSTALL_BIN = /usr/local/bin
-+PATH_INSTALL_BIN = ${PREFIX}/bin
- 
- # put your favourite C compiler here; mine is "gcc"
--CC = gcc
-+CC ?= gcc
- 
- # compiler flags; "-O2" is the code-optimization level for gcc
- ifeq ($(CC), gcc)
--CFLAGS = -O2
-+CFLAGS ?= -O2
- else
- CFLAGS =
- endif
- 
- # libc library flags for multi-threading
--CFLAGS += -D_REENTRANT
-+CFLAGS += -D_REENTRANT ${THREAD_CFLAGS} -I${LOCALBASE}/include
- 
- 
- # Part B. Don't change any of the following!
-@@ -75,7 +75,7 @@
- 
- # add GTK flags
- ifeq ($(OPTION_GRAPHICS), 1)
--CFLAGS += $(shell gtk-config --cflags)
-+CFLAGS += $(shell ${GTKCONFIG} --cflags)
- endif
- 
- # object files
-@@ -89,20 +89,20 @@
- endif
- 
- ifeq ($(CONFIG_THREADING), 2)
--PTHREAD_LIBS = -lpthread
-+PTHREAD_LIBS = ${THREAD_LIBS}
- else
- PTHREAD_LIBS =
- endif
- 
- ifeq ($(OPTION_GRAPHICS), 1)
--LCLC = $(shell gtk-config --libs)
-+LCLC = $(shell ${GTKCONFIG} --libs)
- else
- ifeq ($(OPTION_NCURSES), 1)
- CLC = ncurses
- else
- CLC = curses
- endif
--LCLC = -l$(CLC)
-+LCLC = -l$(CLC) -lintl -L${LOCALBASE}/lib
- endif
- 
- ifeq ($(OPTION_GRAPHICS), 1)