4 files changed, 84 insertions, 33 deletions

diff --git a/www/retawq/Makefile b/www/retawq/Makefile
index be739c69271e..8a125060e2fd 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	retawq
-PORTVERSION=	0.0.6
-PORTREVISION=	1
+PORTVERSION=	0.1.1
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,23 +16,22 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
-CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib -lintl
-USE_REINPLACE=	yes
 USE_GMAKE=	yes
-MAKE_ENV=	LDFLAGS="${LDFLAGS}"
-ALL_TARGET=	# empty
+MAKE_ENV=	THREAD_CFLAGS="${PTHREAD_CFLAGS}" THREAD_LIBS="${PTHREAD_LIBS}"
+ALL_TARGET=	build_binary
 
-post-patch:
-	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g ; \
-		s,%%LOCALBASE%%,${LOCALBASE},g ; \
-		s,%%PREFIX%%,${PREFIX},g ; \
-		s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
+MAN1=		retawq.1
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/retawq ${PREFIX}/bin
+	${INSTALL_MAN} ${WRKSRC}/docu/retawq.1 ${MANPREFIX}/man/man1
 .for lang in de es fr
-	${INSTALL_DATA} ${WRKSRC}/i18n/${lang}.mo ${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
+	${INSTALL_DATA} ${WRKSRC}/i18n/${lang}.mo \
+		${PREFIX}/share/locale/${lang}/LC_MESSAGES/${PORTNAME}.mo
 .endfor
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/docu/*.html ${DOCSDIR}
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/retawq/distinfo b/www/retawq/distinfo
index ea54a051da8b..2580495f93fb 100644
--- a/www/retawq/distinfo
+++ b/www/retawq/distinfo
@@ -1 +1 @@
-MD5 (retawq-0.0.6.tar.gz) = 4afd00649d434870f2bfdf6e4033f08b
+MD5 (retawq-0.1.1.tar.gz) = d98ff734beab3314157268c2be00051e
diff --git a/www/retawq/files/patch-Makefile b/www/retawq/files/patch-Makefile
index 97bb4c444282..d44115d4f477 100644
--- a/www/retawq/files/patch-Makefile
+++ b/www/retawq/files/patch-Makefile
@@ -1,26 +1,66 @@
---- Makefile.orig	Sat Jan 26 18:10:22 2002
-+++ Makefile	Sat Jan 26 18:11:38 2002
-@@ -16,11 +16,11 @@
- CONFIG_CED = 1
+--- 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)
--CONFIG_I18N = 0
--CONFIG_I18N_PATH = \"/usr/share/locale\"
-+CONFIG_I18N = 1
-+CONFIG_I18N_PATH = \"%%LOCALBASE%%/share/locale\"
+-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 forget the trailing "/"!
--INSTALL_BINPREFIX = /usr/bin/
-+INSTALL_BINPREFIX = %%PREFIX%%/bin/
+ # 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
-@@ -145,7 +145,7 @@
- 	@echo "#define HAVE_MMAP 1" >> .config
+-CC = gcc
++CC ?= gcc
  
- retawq: $(OBJS)
--	$(CC) $(OBJS) $(LCLT) $(LCLC) $(LCLM) -o retawq
-+	$(CC) $(OBJS) $(LCLT) $(LCLC) $(LCLM) -o retawq ${LDFLAGS}
+ # compiler flags; "-O2" is the code-optimization level for gcc
+ ifeq ($(CC), gcc)
+-CFLAGS = -O2
++CFLAGS ?= -O2
+ else
+ CFLAGS =
+ endif
  
- stripsyms:
- 	-strip --strip-unneeded retawq
+ # 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)
diff --git a/www/retawq/pkg-plist b/www/retawq/pkg-plist
index 213444fdba60..10c462e989d2 100644
--- a/www/retawq/pkg-plist
+++ b/www/retawq/pkg-plist
@@ -2,3 +2,16 @@ bin/retawq
 share/locale/de/LC_MESSAGES/retawq.mo
 share/locale/es/LC_MESSAGES/retawq.mo
 share/locale/fr/LC_MESSAGES/retawq.mo
+%%PORTDOCS%%share/doc/retawq/arg.html
+%%PORTDOCS%%share/doc/retawq/changes.html
+%%PORTDOCS%%share/doc/retawq/coding_style.html
+%%PORTDOCS%%share/doc/retawq/credits.html
+%%PORTDOCS%%share/doc/retawq/ctconfig.html
+%%PORTDOCS%%share/doc/retawq/feature.html
+%%PORTDOCS%%share/doc/retawq/index.html
+%%PORTDOCS%%share/doc/retawq/key.html
+%%PORTDOCS%%share/doc/retawq/patent.html
+%%PORTDOCS%%share/doc/retawq/raq.html
+%%PORTDOCS%%share/doc/retawq/rfc.html
+%%PORTDOCS%%share/doc/retawq/rtconfig.html
+%%PORTDOCS%%@dirrm share/doc/retawq