update net/tintin++ 2.01.0
This updates net/tintin++ to 2.01.0.
Lots of new features added since the currently
outdated version. Software is now GPLv2+.
WANTLIB includes pcre.
patch-Makefile_in adds ${LOCALBASE}/include to INCS
Index: Makefile
===
RCS file: /cvs/ports/net/tintin++/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile10 Dec 2013 23:42:29 - 1.18
+++ Makefile3 Jan 2014 07:17:16 -
@@ -2,28 +2,29 @@
COMMENT= client program to help playing muds
-DISTNAME= tintin++v1.5pl6
-PKGNAME= tintin-1.5.6
-REVISION= 1
+DISTNAME= tintin-2.01.0
+PKGNAME= tintin-2.01.0
+REVISION= 0
CATEGORIES= net games
-MASTER_SITES= http://ftp.kiae.su/pub/unix/games/
-EXTRACT_SUFX= .tar.Z
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tintin/}
-# Public Domain
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c
+CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_STYLE= gnu old
+LIB_DEPENDS= devel/pcre
-WRKDIST= ${WRKDIR}/tintin++/src
+WANTLIB += pcre
+CONFIGURE_STYLE=gnu
+
+WRKDIST= ${WRKDIR}/tt/src
NO_TEST= Yes
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/tintin
${INSTALL_PROGRAM} ${WRKSRC}/tt++ ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/support/.tt_help.txt.Z ${PREFIX}/lib/tintin
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/tintin++/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Apr 2007 16:20:16 - 1.3
+++ distinfo3 Jan 2014 07:17:16 -
@@ -1,5 +1,2 @@
-MD5 (tintin++v1.5pl6.tar.Z) = NeU9ZhYG0DXD6SoknkQWDw==
-RMD160 (tintin++v1.5pl6.tar.Z) = iyDVrnwyTOt4Gj5eXeWKvld/Cks=
-SHA1 (tintin++v1.5pl6.tar.Z) = aybfgVFdRTk6aMoOW9FxKHu3ezQ=
-SHA256 (tintin++v1.5pl6.tar.Z) = mpU9NhEUm+g0/IEmXjwTJNhdy9r8ZsbvuEDa+o8zSi8=
-SIZE (tintin++v1.5pl6.tar.Z) = 176477
+SHA256 (tintin-2.01.0.tar.gz) = 4ONUY6l+5bM+8LKbLFf6gnbE52MoyxnJim6pLGA6nHY=
+SIZE (tintin-2.01.0.tar.gz) = 293651
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/net/tintin++/patches/patch-Makefile_in,v
retrieving revision 1.1
diff -u -p -r1.1 patch-Makefile_in
--- patches/patch-Makefile_in 26 Oct 2007 22:10:06 - 1.1
+++ patches/patch-Makefile_in 3 Jan 2014 07:17:17 -
@@ -1,45 +1,11 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
Makefile.in.orig Fri Sep 9 17:35:20 1994
-+++ Makefile.inSat Oct 27 00:05:07 2007
-@@ -10,8 +10,7 @@
- # try uncommenting the 'gcc' line and commenting the 'cc' one.
- # Tintin++ doesn't *need* an ANSI compiler anymore, but gcc
- # is still better than cc on many platforms...
--CC = @CC@ -O
--CFLAGS = @DEFS@
-+CFLAGS += @DEFS@
- LIBS = @LIBS@
- PIPE = @PIPE@
- # If you plan on doing debugging (with gdb), it is very helpful to turn all
-@@ -22,10 +21,10 @@ PIPE = @PIPE@
-
- # BINDIR is the directory you wish tt++ to be placed if you wish to use
- # make install.
--BINDIR = ..
-+BINDIR = /usr/local/bin
-
- # DEFAULT_FILE_DIR is the path to tintin files.
--DEFAULT_FILE_DIR = @HOME@
-+DEFAULT_FILE_DIR = /usr/local/lib/tintin
+--- Makefile.in.orig Thu Jan 2 09:23:05 2014
Makefile.inThu Jan 2 09:23:45 2014
+@@ -35,7 +35,7 @@
- #
- # You shouldn't need to change anything #
-@@ -41,14 +40,15 @@ CFILES = main.c parse.c action.c alias.c substitute.c
- variables.c highlight.c antisub.c ivars.c help.c text.c glob.c
- OFILES = $(CFILES:.c=.o)
+ LDFLAGS = @LDFLAGS@
--all: tintin++ install
-+all: tintin++
+-INCS = @MYINCLUDE@
++INCS = -I${LOCALBASE}/include @MYINCLUDE@
- tintin++: $(OFILES) tintin.h
- @echo Linking...
- $(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS)
-
--install: all
-- @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) $(COMPRESSED_HELP)
-+install:
-+ @mkdir -p $(DEFAULT_FILE_DIR)
-+ @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) Ok
+ LIBS = @LIBS@
- # Autocompile all .c files into .o files using this rule:
- .c.o:
Index: patches/patch-configure
===
RCS file: patches/patch-configure
diff -N patches/patch-configure
--- patches/patch-configure 7 Dec 2013 22:37:14 - 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,69 +0,0 @@
-$OpenBSD: patch-configure,v 1.2 2013/12/07 22:37:14 jca Exp $
configure.orig Sun Aug 28 12:06:38 1994
-+++ configure Fri Dec 6 15:14:46 2013
-@@ -474,17 +474,20 @@ fi
- OLD_CFLAGS=$CFLAGS
- CFLAGS=$CFLAGS -pipe
-
--echo Do you want the helpfile to be compressed (yes/no)?
--read YESNO
--if test $YESNO; then
-- if echo $YESNO|grep -i no /dev/null; then
--DEFS=$DEFS -DCOMPRESSED_HELP=0
-- else
--
Re: update net/tintin++ 2.01.0
On 1/3/2014 2:42 AM, Ted Roby wrote:
This updates net/tintin++ to 2.01.0.
Lots of new features added since the currently
outdated version. Software is now GPLv2+.
WANTLIB includes pcre.
patch-Makefile_in adds ${LOCALBASE}/include to INCS
Why not use MAKE_FLAGS=INCS=-I${LOCALBASE}/include? Then all the patches
go away.
More stuff below.
Index: Makefile
===
RCS file: /cvs/ports/net/tintin++/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile10 Dec 2013 23:42:29 - 1.18
+++ Makefile3 Jan 2014 07:17:16 -
@@ -2,28 +2,29 @@
COMMENT= client program to help playing muds
-DISTNAME= tintin++v1.5pl6
-PKGNAME= tintin-1.5.6
-REVISION= 1
+DISTNAME= tintin-2.01.0
+PKGNAME= tintin-2.01.0
If DISTNAME = PKGNAME, don't need PKGNAME.
+REVISION= 0
REVISION goes away when version number is bumped.
CATEGORIES= net games
No HOMEPAGE?
No MAINTAINER? Do you want to be MAINTAINER?
-MASTER_SITES= http://ftp.kiae.su/pub/unix/games/
-EXTRACT_SUFX= .tar.Z
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tintin/}
-# Public Domain
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c
+CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+LDFLAGS=-L${LOCALBASE}/lib
-CONFIGURE_STYLE= gnu old
+LIB_DEPENDS= devel/pcre
-WRKDIST= ${WRKDIR}/tintin++/src
+WANTLIB += pcre
You need to run 'make port-lib-depends-check' - you're missing WANTLIB
entries.
+CONFIGURE_STYLE=gnu
+
+WRKDIST= ${WRKDIR}/tt/src
NO_TEST= Yes
do-install:
Should some of the documentation in ${WRKSRC}/../docs/ be included?
tintin19.txt looks like it could be useful.
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/tintin
${INSTALL_PROGRAM} ${WRKSRC}/tt++ ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/support/.tt_help.txt.Z ${PREFIX}/lib/tintin
.include bsd.port.mk
Could you please look through Makefile.template and rearrange variables
accordingly?
~Brian
PS - Vadim: 'portcheck -CU' throws a bogus trailing whitespace in
Makefile - I can send you the Makefile that threw it (which is a
modified version of the diff being discussed here).
Re: update net/tintin++ 2.01.0
On Fri, Jan 03, 2014 at 04:12:25AM -0500, Brian Callahan wrote:
On 1/3/2014 2:42 AM, Ted Roby wrote:
This updates net/tintin++ to 2.01.0.
Lots of new features added since the currently
outdated version. Software is now GPLv2+.
WANTLIB includes pcre.
patch-Makefile_in adds ${LOCALBASE}/include to INCS
Why not use MAKE_FLAGS=INCS=-I${LOCALBASE}/include? Then all the
patches go away.
More stuff below.
Thank you for all the feedback. I reviewed the Makefile.template and
perused the Porter's Handbook again. I also contacted the developer
and let him know of my efforts. I am interested in maintaining this
port, and included my address in this version just in case.
This time around it feels like less hack and more progress.
Index: Makefile
===
RCS file: /cvs/ports/net/tintin++/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile10 Dec 2013 23:42:29 - 1.18
+++ Makefile4 Jan 2014 04:49:40 -
@@ -1,29 +1,39 @@
# $OpenBSD: Makefile,v 1.18 2013/12/10 23:42:29 jca Exp $
-COMMENT= client program to help playing muds
+COMMENT= client program for playing muds with advanced features
+
+DISTNAME= tintin-2.01.0
-DISTNAME= tintin++v1.5pl6
-PKGNAME= tintin-1.5.6
-REVISION= 1
CATEGORIES= net games
-MASTER_SITES= http://ftp.kiae.su/pub/unix/games/
-EXTRACT_SUFX= .tar.Z
+HOMEPAGE= http://tintin.sourceforge.net/
+
+MAINTAINER=Ted Roby tr...@freeshell.org
-# Public Domain
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_FTP=Yes
+
+WANTLIB += c pthread util z pcre
+
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=tintin/}
+
+LIB_DEPENDS=devel/pcre
-WANTLIB += c
+MAKE_FLAGS= INCS=-I${LOCALBASE}/include
-CONFIGURE_STYLE= gnu old
+CONFIGURE_STYLE=gnu
+CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
+ LDFLAGS=-L${LOCALBASE}/lib
-WRKDIST= ${WRKDIR}/tintin++/src
+WRKDIST= ${WRKDIR}/tt/src
NO_TEST= Yes
do-install:
- ${INSTALL_DATA_DIR} ${PREFIX}/lib/tintin
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tintin++
+ ${INSTALL_DATA} ${WRKDIR}/tt/docs/chat_protocol.txt
${PREFIX}/share/doc/tintin++
+ ${INSTALL_DATA} ${WRKDIR}/tt/docs/tintin19.txt
${PREFIX}/share/doc/tintin++
${INSTALL_PROGRAM} ${WRKSRC}/tt++ ${PREFIX}/bin
- ${INSTALL_DATA} ${WRKSRC}/support/.tt_help.txt.Z ${PREFIX}/lib/tintin
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/net/tintin++/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo5 Apr 2007 16:20:16 - 1.3
+++ distinfo4 Jan 2014 04:49:40 -
@@ -1,5 +1,2 @@
-MD5 (tintin++v1.5pl6.tar.Z) = NeU9ZhYG0DXD6SoknkQWDw==
-RMD160 (tintin++v1.5pl6.tar.Z) = iyDVrnwyTOt4Gj5eXeWKvld/Cks=
-SHA1 (tintin++v1.5pl6.tar.Z) = aybfgVFdRTk6aMoOW9FxKHu3ezQ=
-SHA256 (tintin++v1.5pl6.tar.Z) = mpU9NhEUm+g0/IEmXjwTJNhdy9r8ZsbvuEDa+o8zSi8=
-SIZE (tintin++v1.5pl6.tar.Z) = 176477
+SHA256 (tintin-2.01.0.tar.gz) = 4ONUY6l+5bM+8LKbLFf6gnbE52MoyxnJim6pLGA6nHY=
+SIZE (tintin-2.01.0.tar.gz) = 293651
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- patches/patch-Makefile_in 26 Oct 2007 22:10:06 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,45 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.1 2007/10/26 22:10:06 ajacoutot Exp $
Makefile.in.orig Fri Sep 9 17:35:20 1994
-+++ Makefile.inSat Oct 27 00:05:07 2007
-@@ -10,8 +10,7 @@
- # try uncommenting the 'gcc' line and commenting the 'cc' one.
- # Tintin++ doesn't *need* an ANSI compiler anymore, but gcc
- # is still better than cc on many platforms...
--CC = @CC@ -O
--CFLAGS = @DEFS@
-+CFLAGS += @DEFS@
- LIBS = @LIBS@
- PIPE = @PIPE@
- # If you plan on doing debugging (with gdb), it is very helpful to turn all
-@@ -22,10 +21,10 @@ PIPE = @PIPE@
-
- # BINDIR is the directory you wish tt++ to be placed if you wish to use
- # make install.
--BINDIR = ..
-+BINDIR = /usr/local/bin
-
- # DEFAULT_FILE_DIR is the path to tintin files.
--DEFAULT_FILE_DIR = @HOME@
-+DEFAULT_FILE_DIR = /usr/local/lib/tintin
-
- #
- # You shouldn't need to change anything #
-@@ -41,14 +40,15 @@ CFILES = main.c parse.c action.c alias.c substitute.c
- variables.c highlight.c antisub.c ivars.c help.c text.c glob.c
- OFILES = $(CFILES:.c=.o)
-
--all: tintin++ install
-+all: tintin++
-
- tintin++: $(OFILES) tintin.h
- @echo Linking...
- $(CC) $(CFLAGS) $(FFLAGS) $(LFLAGS) -o tt++ $(OFILES) $(LIBS)
-
--install: all
-- @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) $(COMPRESSED_HELP)
-+install:
-+ @mkdir -p $(DEFAULT_FILE_DIR)
-+ @./install.sh $(BINDIR) $(DEFAULT_FILE_DIR) Ok
-
- #
Re: update net/tintin++ 2.01.0
On 1/4/2014 12:17 AM, Ted Roby wrote:
On Fri, Jan 03, 2014 at 04:12:25AM -0500, Brian Callahan wrote:
On 1/3/2014 2:42 AM, Ted Roby wrote:
This updates net/tintin++ to 2.01.0.
Lots of new features added since the currently
outdated version. Software is now GPLv2+.
WANTLIB includes pcre.
patch-Makefile_in adds ${LOCALBASE}/include to INCS
Why not use MAKE_FLAGS=3DINCS=3D-I${LOCALBASE}/include? Then all the
patches go away.
More stuff below.
Thank you for all the feedback. I reviewed the Makefile.template and
perused the Porter's Handbook again. I also contacted the developer
and let him know of my efforts. I am interested in maintaining this
port, and included my address in this version just in case.
This time around it feels like less hack and more progress.
Two minor nits, neither of which I think require you to resubmit this.
I'm ok with this, if someone wants to give me an ok to commit.
Index: Makefile
===
RCS file: /cvs/ports/net/tintin++/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile10 Dec 2013 23:42:29 - 1.18
+++ Makefile4 Jan 2014 04:49:40 -
@@ -1,29 +1,39 @@
# $OpenBSD: Makefile,v 1.18 2013/12/10 23:42:29 jca Exp $
-COMMENT= client program to help playing muds
+COMMENT= client program for playing muds with advanced features
+
+DISTNAME= tintin-2.01.0
-DISTNAME= tintin++v1.5pl6
-PKGNAME= tintin-1.5.6
-REVISION= 1
CATEGORIES= net games
-MASTER_SITES= http://ftp.kiae.su/pub/unix/games/
-EXTRACT_SUFX= .tar.Z
+HOMEPAGE= http://tintin.sourceforge.net/
+
+MAINTAINER=Ted Roby tr...@freeshell.org
Thank you for maintaining!
Lotsofwhitespace. But I'll tighten that up on commit.
-# Public Domain
+# GPLv2+
PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_FTP=Yes
If PERMIT_PACKAGE_CDROM=Yes then you don't need anything else.
~Brian
