Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 19 Nov 2002 06:18:16 +0900
From:      KATO Tsuguru <tkato@prontomail.com>
To:        FreeBSD-gnats-submit@FreeBSD.org
Subject:   ports/45455: Update port: www/retawq to 0.1.1
Message-ID:  <20021119061816.2ff9bb7d.tkato@prontomail.com>

next in thread | raw e-mail | index | archive | help

>Number:         45455
>Category:       ports
>Synopsis:       Update port: www/retawq to 0.1.1
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 18 13:30:15 PST 2002
>Closed-Date:
>Last-Modified:
>Originator:     KATO Tsuguru
>Release:        4.7-RELEASE-p2 i386
>Organization:
>Environment:
>Description:
- Update to version 0.1.1

>How-To-Repeat:
>Fix:

diff -urN /usr/ports/www/retawq/Makefile www/retawq/Makefile
--- /usr/ports/www/retawq/Makefile	Mon Nov 11 19:01:30 2002
+++ www/retawq/Makefile	Tue Nov 19 01:15:57 2002
@@ -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 @@
 
 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 -urN /usr/ports/www/retawq/distinfo www/retawq/distinfo
--- /usr/ports/www/retawq/distinfo	Sat Jan 26 19:12:55 2002
+++ www/retawq/distinfo	Wed Nov 13 07:07:22 2002
@@ -1 +1 @@
-MD5 (retawq-0.0.6.tar.gz) = 4afd00649d434870f2bfdf6e4033f08b
+MD5 (retawq-0.1.1.tar.gz) = d98ff734beab3314157268c2be00051e
diff -urN /usr/ports/www/retawq/files/patch-Makefile www/retawq/files/patch-Makefile
--- /usr/ports/www/retawq/files/patch-Makefile	Sat Jan 26 19:12:56 2002
+++ www/retawq/files/patch-Makefile	Tue Nov 19 01:16:33 2002
@@ -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\"
- 
- # path for "make install"; don't forget the trailing "/"!
--INSTALL_BINPREFIX = /usr/bin/
-+INSTALL_BINPREFIX = %%PREFIX%%/bin/
+-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
-@@ -145,7 +145,7 @@
- 	@echo "#define HAVE_MMAP 1" >> .config
- 
- retawq: $(OBJS)
--	$(CC) $(OBJS) $(LCLT) $(LCLC) $(LCLM) -o retawq
-+	$(CC) $(OBJS) $(LCLT) $(LCLC) $(LCLM) -o retawq ${LDFLAGS}
+-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
  
- stripsyms:
- 	-strip --strip-unneeded retawq
+ ifeq ($(OPTION_GRAPHICS), 1)
diff -urN /usr/ports/www/retawq/pkg-plist www/retawq/pkg-plist
--- /usr/ports/www/retawq/pkg-plist	Sat Jan 26 19:12:55 2002
+++ www/retawq/pkg-plist	Wed Nov 13 09:41:05 2002
@@ -2,3 +2,16 @@
 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
>Release-Note:
>Audit-Trail:
>Unformatted:

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20021119061816.2ff9bb7d.tkato>