simple update for net/tintin++
This is a simple version update for net/tintin++. Compiled and tested on amd64. Index: Makefile === RCS file: /cvs/ports/net/tintin++/Makefile,v retrieving revision 1.19 diff -u -p -u -r1.19 Makefile --- Makefile4 Jan 2014 07:51:53 - 1.19 +++ Makefile13 Mar 2017 07:20:49 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.19 2014/01/04 07:51:53 bcallah Exp $ COMMENT= client program for playing muds with advanced features -DISTNAME= tintin-2.01.0 +DISTNAME= tintin-2.01.2 CATEGORIES= net games HOMEPAGE= http://tintin.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/net/tintin++/distinfo,v retrieving revision 1.4 diff -u -p -u -r1.4 distinfo --- distinfo4 Jan 2014 07:51:53 - 1.4 +++ distinfo13 Mar 2017 07:20:49 - @@ -1,2 +1,2 @@ -SHA256 (tintin-2.01.0.tar.gz) = 4ONUY6l+5bM+8LKbLFf6gnbE52MoyxnJim6pLGA6nHY= -SIZE (tintin-2.01.0.tar.gz) = 293651 +SHA256 (tintin-2.01.2.tar.gz) = AeEePN7Uj/aGsuoW52es8fa16jJlUez/CRVS6J9KA44= +SIZE (tintin-2.01.2.tar.gz) = 274380
Update chirp to daily-20160517
Tested on amd64 with Baofeng uv-5r. Following are CHANGES from devs: A new daily build of CHIRP is available. This includes changes made directly to the tree yesterday, and may include additional features, bug fixes, and/or bugs. If you are interested in trying it, grab it from the following location: http://trac.chirp.danplanet.com/chirp_daily/daily-20160517 A list of the changes included in this build (since the last daily) follows: Changes for Build #402 [Pavel Milanes (CO7WT)] [PATCH][BTECH] Add a flag to know we have a BTECH gen3, fixes #3015 This 3 gen wave of BTECH radios has new settings items and we need a flag to know when we are dealing with one of these to show the settings properly. This is an advance to the real settings modification. 73 [Pavel Milanes (CO7WT) ] [PATCH][BTECHs] Add support for the new Gen3 wave of BTECHs, fixes #3015 This add support for the new generation (3gen) if the following BTECHs: * UV-2501 * UV-2501+220 * UV-5001 73 [Pavel Milanes (CO7WT) ] [PATCH][KT8900] Comment about old versions of KT8900 in the UI, fixes #3539 All points that the QYT KT8900 is the main OEM model, and there are two variants of it, from the prespective of the communication dance: * One is with just the ID and right to the down/up process (clone of WACCOM Mini8900) * The other (is the default now) with a second id read & a extra step on the upload process. As both uses different communications steps we can't put them both under the same case, fortunately the "older" model has a clone in the WACCOM Mini8900. We put here a notice on the failure to read a KT8900 to warn the users to try the WACCOM Mini8900 instead. Ports diff follows: Index: Makefile === RCS file: /cvs/ports/comms/chirp/Makefile,v retrieving revision 1.7 diff -u -p -u -r1.7 Makefile --- Makefile7 May 2016 14:02:53 - 1.7 +++ Makefile26 May 2016 19:36:28 - @@ -2,7 +2,7 @@ COMMENT= tool to programme a wide range of amateur radios -MODPY_EGG_VERSION= 20160507 +MODPY_EGG_VERSION= 20160517 DISTNAME= chirp-daily-${MODPY_EGG_VERSION} PKGNAME= chirp-${MODPY_EGG_VERSION} Index: distinfo === RCS file: /cvs/ports/comms/chirp/distinfo,v retrieving revision 1.4 diff -u -p -u -r1.4 distinfo --- distinfo7 May 2016 14:02:53 - 1.4 +++ distinfo26 May 2016 19:36:28 - @@ -1,2 +1,2 @@ -SHA256 (chirp-daily-20160507.tar.gz) = SWjtOuNE+/QUdepbMRLt9/i+6HQcK5aDKxPhVPloJp8= -SIZE (chirp-daily-20160507.tar.gz) = 578136 +SHA256 (chirp-daily-20160517.tar.gz) = sOTGFvxXViIMzRRYpmyHLS0bpjXrsO1MG1rWgEGhXVk= +SIZE (chirp-daily-20160517.tar.gz) = 578310
Update comms/chirp to chirp-daily-20160507
This is an update to comms/chirp. Stable builds are now distributed as chirp-daily. Some drivers are experimental, but the application notifies the user of this fact when selecting them. OpenBSD terminal interface devices have been added upstream. Update to chirp-daily-20160507. Index: Makefile === RCS file: /cvs/ports/comms/chirp/Makefile,v retrieving revision 1.6 diff -u -p -u -r1.6 Makefile --- Makefile18 Jul 2015 15:31:16 - 1.6 +++ Makefile7 May 2016 08:04:11 - @@ -2,8 +2,8 @@ COMMENT= tool to programme a wide range of amateur radios -MODPY_EGG_VERSION= 0.4.1 -DISTNAME= chirp-${MODPY_EGG_VERSION} +MODPY_EGG_VERSION= 20160507 +DISTNAME= chirp-daily-${MODPY_EGG_VERSION} CATEGORIES=comms hamradio @@ -12,7 +12,7 @@ HOMEPAGE= http://chirp.danplanet.com/ # GPLv3+ PERMIT_PACKAGE_CDROM= Yes -MASTER_SITES= http://chirp.danplanet.com/download/${MODPY_EGG_VERSION}/ +MASTER_SITES= http://trac.chirp.danplanet.com/chirp_daily/daily-${MODPY_EGG_VERSION}/ MODULES= lang/python COMMON_DEPS= devel/py-serial \ @@ -26,6 +26,6 @@ NO_TEST= Yes post-extract: sed -i 's,/usr/share,${PREFIX}/share,' \ - ${WRKSRC}/chirpui/mainapp.py + ${WRKSRC}/chirp/ui/mainapp.py .include Index: distinfo === RCS file: /cvs/ports/comms/chirp/distinfo,v retrieving revision 1.3 diff -u -p -u -r1.3 distinfo --- distinfo11 Nov 2014 14:24:39 - 1.3 +++ distinfo7 May 2016 08:04:11 - @@ -1,2 +1,2 @@ -SHA256 (chirp-0.4.1.tar.gz) = jJ1lLcidurnioadcB6pxec5APeB4pNAoFDZfieGDMZ4= -SIZE (chirp-0.4.1.tar.gz) = 416851 +SHA256 (chirp-daily-20160507.tar.gz) = SWjtOuNE+/QUdepbMRLt9/i+6HQcK5aDKxPhVPloJp8= +SIZE (chirp-daily-20160507.tar.gz) = 578136 Index: patches/patch-chirp_platform_py === RCS file: patches/patch-chirp_platform_py diff -N patches/patch-chirp_platform_py --- patches/patch-chirp_platform_py 12 Jun 2014 21:54:30 - 1.2 +++ /dev/null 1 Jan 1970 00:00:00 - @@ -1,14 +0,0 @@ -$OpenBSD: patch-chirp_platform_py,v 1.2 2014/06/12 21:54:30 abieber Exp $ chirp/platform.py.orig Tue Apr 9 01:01:35 2013 -+++ chirp/platform.py Thu Jun 12 14:14:18 2014 -@@ -283,7 +283,9 @@ class UnixPlatform(Platform): - os.system("firefox '%s'" % path) - - def list_serial_ports(self): --ports = ["/dev/ttyS*", -+ports = ["/dev/cuaU*", -+ "/dev/cua0*", -+ "/dev/ttyS*", - "/dev/ttyUSB*", - "/dev/ttyAMA*", - "/dev/cu.*", Index: pkg/PLIST === RCS file: /cvs/ports/comms/chirp/pkg/PLIST,v retrieving revision 1.2 diff -u -p -u -r1.2 PLIST --- pkg/PLIST 12 Jun 2014 21:54:30 - 1.2 +++ pkg/PLIST 7 May 2016 08:04:11 - @@ -1,13 +1,9 @@ @comment $OpenBSD: PLIST,v 1.2 2014/06/12 21:54:30 abieber Exp $ bin/chirpw lib/python${MODPY_VERSION}/site-packages/chirp/ -lib/python${MODPY_VERSION}/site-packages/chirp-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info +lib/python${MODPY_VERSION}/site-packages/chirp-daily_${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info lib/python${MODPY_VERSION}/site-packages/chirp/__init__.py lib/python${MODPY_VERSION}/site-packages/chirp/__init__.pyc -lib/python${MODPY_VERSION}/site-packages/chirp/alinco.py -lib/python${MODPY_VERSION}/site-packages/chirp/alinco.pyc -lib/python${MODPY_VERSION}/site-packages/chirp/anytone.py -lib/python${MODPY_VERSION}/site-packages/chirp/anytone.pyc lib/python${MODPY_VERSION}/site-packages/chirp/bandplan.py lib/python${MODPY_VERSION}/site-packages/chirp/bandplan.pyc lib/python${MODPY_VERSION}/site-packages/chirp/bandplan_au.py @@ -20,207 +16,256 @@ lib/python${MODPY_VERSION}/site-packages lib/python${MODPY_VERSION}/site-packages/chirp/bandplan_iaru_r3.pyc lib/python${MODPY_VERSION}/site-packages/chirp/bandplan_na.py lib/python${MODPY_VERSION}/site-packages/chirp/bandplan_na.pyc -lib/python${MODPY_VERSION}/site-packages/chirp/baofeng_uv3r.py -lib/python${MODPY_VERSION}/site-packages/chirp/baofeng_uv3r.pyc lib/python${MODPY_VERSION}/site-packages/chirp/bitwise.py lib/python${MODPY_VERSION}/site-packages/chirp/bitwise.pyc lib/python${MODPY_VERSION}/site-packages/chirp/bitwise_grammar.py lib/python${MODPY_VERSION}/site-packages/chirp/bitwise_grammar.pyc -lib/python${MODPY_VERSION}/site-packages/chirp/bjuv55.py -lib/python${MODPY_VERSION}/site-packages/chirp/bjuv55.pyc lib/python${MODPY_VERSION}/site-packages/chirp/chirp_common.py lib/python${MODPY_VERSION}/site-packages/chirp/chirp_common.pyc lib/python${MODPY_VERSION}/site-packages/chirp/detect.py lib/python${MODPY_VERSION}/site-packages/chirp/detect.pyc lib/python${MODPY_VERSION}/site-packages/chirp/directory.py
Update net/tintin++ to 2.01.1
This is an update for net/tintin++, built and tested on amd64 current. Index: Makefile === RCS file: /cvs/ports/net/tintin++/Makefile,v retrieving revision 1.19 diff -u -r1.19 Makefile --- Makefile4 Jan 2014 07:51:53 - 1.19 +++ Makefile5 Mar 2015 05:54:56 - @@ -1,7 +1,7 @@ # $OpenBSD: Makefile,v 1.19 2014/01/04 07:51:53 bcallah Exp $ COMMENT= client program for playing muds with advanced features -DISTNAME= tintin-2.01.0 +DISTNAME= tintin-2.01.1 CATEGORIES= net games HOMEPAGE= http://tintin.sourceforge.net/ Index: distinfo === RCS file: /cvs/ports/net/tintin++/distinfo,v retrieving revision 1.4 diff -u -r1.4 distinfo --- distinfo4 Jan 2014 07:51:53 - 1.4 +++ distinfo5 Mar 2015 05:54:56 - @@ -1,2 +1,2 @@ -SHA256 (tintin-2.01.0.tar.gz) = 4ONUY6l+5bM+8LKbLFf6gnbE52MoyxnJim6pLGA6nHY= -SIZE (tintin-2.01.0.tar.gz) = 293651 +SHA256 (tintin-2.01.1.tar.gz) = 9m7GJU/s/73ZyDzdMKPWt6fMovUe/5tpmkjcs3S5+Zs= +SIZE (tintin-2.01.1.tar.gz) = 272470
security/sshguard and mktemp
There are several defines in src/fwalls/command_ipfilter.h which utilize system mktemp using backticks. They erroneously supply 5 Xs instead of the minimum 6 required for the template. affected defines: COMMAND_BLOCK COMMAND_RELEASE COMMAND_FLUSH The following patch addresses these defines, but not the associated comments which supply examples of their output. I have only tested that the package will still build. I have not performed any runtime tests. Is there anyone who uses this port and would like to test? Index: patches/patch-src_fwalls_command_ipfilter_h === RCS file: patches/patch-src_fwalls_command_ipfilter_h diff -N patches/patch-src_fwalls_command_ipfilter_h --- /dev/null 1 Jan 1970 00:00:00 - +++ patches/patch-src_fwalls_command_ipfilter_h 13 Jun 2014 21:50:27 - @@ -0,0 +1,23 @@ +$OpenBSD$ +--- src/fwalls/command_ipfilter.h.orig Fri Jun 13 14:32:26 2014 src/fwalls/command_ipfilter.h Fri Jun 13 14:36:31 2014 +@@ -37,16 +37,16 @@ + /* expanded, it runs something like + * if test $SSHG_ADDRKIND != 4; then exit 1 ; fi ; TMP=`mktemp /tmp/ipfconf.X` awk '1 ; /^##sshguard-begin##$/ { print \block in quick proto tcp from '\$SSHG_ADDR\' to any\ }' /etc/ipfilter.conf $TMP mv $TMP /etc/ipfilter.conf /sbin/ipf -Fa /sbin/ipf -f /etc/ipfilter.conf + */ +-#define COMMAND_BLOCK if test $SSHG_ADDRKIND != 4; then exit 1 ; fi ; TMP=`mktemp /tmp/ipfconf.X` QUOTEME(AWK) '1 ; /^##sshguard-begin##$/ { print \block in quick proto tcp from '\$SSHG_ADDR\' to any\ }' IPFILTER_CONFFILE $TMP mv $TMP IPFILTER_CONFFILEIPFPATH /ipf -Fa IPFPATH /ipf -f IPFILTER_CONFFILE ++#define COMMAND_BLOCK if test $SSHG_ADDRKIND != 4; then exit 1 ; fi ; TMP=`mktemp /tmp/ipfconf.XX` QUOTEME(AWK) '1 ; /^##sshguard-begin##$/ { print \block in quick proto tcp from '\$SSHG_ADDR\' to any\ }' IPFILTER_CONFFILE $TMP mv $TMP IPFILTER_CONFFILE IPFPATH /ipf -Fa IPFPATH /ipf -f IPFILTER_CONFFILE + + /* expanded, it runs something like + * if test $SSHG_ADDRKIND != 4; then exit 1 ; fi ; TMP=`mktemp /tmp/ipfconf.X` awk 'BEGIN { copy = 1 } copy ; /^##sshguard-begin##$/ { copy = 0 ; next } !copy { if ($0 !~ /'\$SSHG_ADDR\'.* /) print $0 } /^##sshguard-end##$/ { copy = 1 }' /etc/ipfilter.conf $TMP mv $TMP /etc/ipfilter.conf /sbin/ipf -Fa /sbin/ipf -f /etc/ipfilter.conf + */ +-#define COMMAND_RELEASEif test $SSHG_ADDRKIND != 4; then exit 1 ; fi ; TMP=`mktemp /tmp/ipfconf.X` QUOTEME(AWK) 'BEGIN { copy = 1 } copy ; /^##sshguard-begin##$/{ copy = 0 ; next } !copy { if ($0 !~ /'\$SSHG_ADDR\'.*/) print $0 } /^##sshguard-end##$/ { copy = 1 }' IPFILTER_CONFFILE $TMP mv $TMP IPFILTER_CONFFILEIPFPATH /ipf -Fa IPFPATH /ipf -f IPFILTER_CONFFILE ++#define COMMAND_RELEASEif test $SSHG_ADDRKIND != 4; then exit 1 ; fi ; TMP=`mktemp /tmp/ipfconf.XX` QUOTEME(AWK) 'BEGIN { copy = 1 } copy ; /^##sshguard-begin##$/{ copy = 0 ; next } !copy { if ($0 !~ /'\$SSHG_ADDR\'.*/) print $0 } /^##sshguard-end##$/ { copy = 1 }' IPFILTER_CONFFILE $TMP mv $TMP IPFILTER_CONFFILEIPFPATH /ipf -Fa IPFPATH /ipf -f IPFILTER_CONFFILE + + /* expanded, it runs something like + * TMP=`mktemp /tmp/ipfconf.X` awk 'BEGIN { copy = 1 } /^##sshguard-begin##$/ { print $0 ; copy = 0 } /^##sshguard-end##$/ { copy = 1 } copy' /etc/ipfilter.conf $TMP ; mv $TMP /etc/ipfilter.conf ; /sbin/ipf -Fa /sbin/ipf -f /etc/ipfilter.conf + */ +-#define COMMAND_FLUSH TMP=`mktemp /tmp/ipfconf.X` QUOTEME(AWK) 'BEGIN { copy = 1 } /^##sshguard-begin##$/ { print $0 ; copy = 0 } /^##sshguard-end##$/ { copy = 1 } copy' IPFILTER_CONFFILE $TMP ; mv $TMP IPFILTER_CONFFILE ; IPFPATH /ipf -Fa IPFPATH /ipf -f IPFILTER_CONFFILE ++#define COMMAND_FLUSH TMP=`mktemp /tmp/ipfconf.XX` QUOTEME(AWK) 'BEGIN { copy = 1 } /^##sshguard-begin##$/ { print $0 ; copy = 0 } /^##sshguard-end##$/ { copy = 1 } copy' IPFILTER_CONFFILE $TMP ; mv $TMP IPFILTER_CONFFILE ; IPFPATH /ipf -Fa IPFPATH /ipf -f IPFILTER_CONFFILE + + #endif
Re: security/sshguard and mktemp
On Sat, Jun 14, 2014 at 01:17:24AM +0100, Stuart Henderson wrote: On 2014/06/13 22:01, Ted Roby wrote: There are several defines in src/fwalls/command_ipfilter.h which utilize system mktemp using backticks. They erroneously supply 5 Xs instead of the minimum 6 required for the template. Thanks for digging, but this one isn't actually relevant to OpenBSD, since we don't use ipfilter. It probably would make sense to feed upstream though, iirc this is/will be a posix requirement.. Relevant patch sent upstream.
security/stegdetect mkstemp
When using the -t F flag with stegdetect an error is thrown because mkstemp in f5.c provides an invalid template. This patch provides a valid template of 6 X's instead of 4. $OpenBSD$ --- f5.c.orig Sun Aug 29 16:11:00 2004 +++ f5.cWed Jun 11 23:37:56 2014 @@ -77,7 +77,7 @@ f5_compress(struct image *image, struct jeasy *je, int struct jpeg_compress_struct cinfo; struct jpeg_decompress_struct *jinfo; static struct jpeg_error_mgr jerr, jsrcerr; - char template[] = /tmp/stegdetect.; + char template[] = /tmp/stegdetect.XX; JSAMPROW row_pointer[1];/* pointer to JSAMPLE row[s] */ FILE *fout, *fin; int row_stride; /* physical row width in image buffer */
extract and patch without dependencies
I want to inspect the contents of multiple distfiles. Is there a way to use the ports system to extract and perhaps patch a distfile without first installing its dependencies? I've attempted to pass BUILD_DEPENDS='' LIB_DEPENDS='' WANTLIB='' but that hasn't worked. Before I write my own scripting to parse distfile information from the Makefile and then extract I wanted to know if this mechanism already existed within the ports system. Thanks for any feedback.
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 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++ to 2.00.9
On Jan 1, 2014 9:32 PM, Brian Callahan bcal...@devio.us wrote: On 1/1/2014 11:35 PM, Ted Roby wrote: This diff was run against -current. It updates net/tintin++ to 2.00.9. Any reason not to have updated to 2.01.0? I missed this very recent update. Pedantic nit: the license is actually GPLv2+ Thanks!
Update net/tintin++ to 2.00.9
This diff was run against -current. It updates net/tintin++ to 2.00.9. MASTER_SITES now grabs from MASTER_SITE_SOURCEFORGE. Licensing has been changed to GPLv2. WANTLIB has been updated to reflect pcre dependency. Source files are modified as follows: Makefile.in: include ${LOCALBASE}/include parse.c: initialize ptoo (this patch submitted upstream) 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 +++ Makefile2 Jan 2014 04:17:26 - @@ -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.00.9 +PKGNAME= tintin-2.00.9 +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 +++ distinfo2 Jan 2014 04:17:26 - @@ -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.00.9.tar.gz) = yv7um2DeOdlX3vV4L7T4yymgWvadyW0+WAfC0/tUEnU= +SIZE (tintin-2.00.9.tar.gz) = 276024 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 2 Jan 2014 04:17:26 - @@ -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@ +--- Makefile.in.orig Wed Jan 1 19:17:57 2014 Makefile.inWed Jan 1 19:18:44 2014 +@@ -35,7 +35,7 @@ - # BINDIR is the directory you wish tt++ to be placed if you wish to use - # make install. --BINDIR = .. -+BINDIR = /usr/local/bin + LDFLAGS = @LDFLAGS@ - # DEFAULT_FILE_DIR is the path to tintin files. --DEFAULT_FILE_DIR = @HOME@ -+DEFAULT_FILE_DIR = /usr/local/lib/tintin +-INCS = @MYINCLUDE@ ++INCS += -I${LOCALBASE}/include @MYINCLUDE@ - # - # 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) + LIBS = @MYLIB@ @LIBS@ --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 - - # 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
core dump when using --regex in etterlog net/ettercap
This problem exists in port net/ettercap. When I attempt to use the -e (--regex) flag to search for data within a packet I always receive a core dump. For example: sudo ettercap -f /192.168.1.69/ -e thisstring myfile.ecp will always result in a core dump. Here is some gdb info: ~$ gdb etterlog etterlog.core GNU gdb 6.3 Copyright 2004 Free Software Foundation, Inc. GDB is free software, covered by the GNU General Public License, and you are welcome to change it and/or distribute copies of it under certain conditions. Type show copying to see the conditions. There is absolutely no warranty for GDB. Type show warranty for details. This GDB was configured as i386-unknown-openbsd5.1...(no debugging symbols found) Core was generated by `etterlog'. Program terminated with signal 11, Segmentation fault. Reading symbols from /usr/lib/libpthread.so.13.1...done. Loaded symbols for /usr/lib/libpthread.so.13.1 Reading symbols from /usr/lib/libz.so.4.1...done. Loaded symbols for /usr/lib/libz.so.4.1 Symbols already loaded for /usr/lib/libpthread.so.13.1 Reading symbols from /usr/lib/libc.so.61.0...done. Loaded symbols for /usr/lib/libc.so.61.0 Reading symbols from /usr/libexec/ld.so...done. Loaded symbols for /usr/libexec/ld.so #0 0x08ae6e21 in strlen () from /usr/lib/libc.so.61.0 (gdb) bt #0 0x08ae6e21 in strlen () from /usr/lib/libc.so.61.0 #1 0x08a8aad7 in regexec (preg=0x8315ecc0, string=0x7f08ba60 Address 0x7f08ba60 out of bounds, nmatch=0, pmatch=0x0, eflags=Variable eflags is not available. ) at engine.c:149 #2 0x1c002ff0 in ?? () #3 0x8315ecc0 in ?? () #4 0x7f08ba60 in ?? () #5 0x in ?? () (gdb) i r eax0x0 0 ecx0x -1 edx0x7fd6d000 2144784384 ebx0x28a4cc98 681888920 esp0xcfbc1cc8 0xcfbc1cc8 ebp0xcfbc1dc8 0xcfbc1dc8 esi0x7f08ba60 2131278432 edi0x7f08ba60 2131278432 eip0x8ae6e210x8ae6e21 eflags 0x10246 66118 cs 0x2b 43 ss 0x33 51 ds 0x33 51 es 0x33 51 fs 0x5b 91 gs 0x63 99 (gdb) where #0 0x08ae6e21 in strlen () from /usr/lib/libc.so.61.0 #1 0x08a8aad7 in regexec (preg=0x8315ecc0, string=0x7f08ba60 Address 0x7f08ba60 out of bounds, nmatch=0, pmatch=0x0, eflags=Variable eflags is not available. ) at engine.c:149 #2 0x1c002ff0 in ?? () #3 0x8315ecc0 in ?? () #4 0x7f08ba60 in ?? () #5 0x in ?? () Here's a dmesg for this system: OpenBSD 5.1-beta (bsd.build) #0: Sun Jan 22 20:24:52 PST 2012 voya...@machine.my.domain:/tmp/bsd.build cpu0: Genuine Intel(R) CPU 1500 @ 2.00GHz (GenuineIntel 686-class) 2 GHz cpu0: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,NXE,SSE3,MWA IT,VMX,EST,TM2,xTPR,PDCM real mem = 2131062784 (2032MB) avail mem = 2086080512 (1989MB) mainbus0 at root bios0 at mainbus0: AT/286+ BIOS, date 07/29/05, SMBIOS rev. 2.4 @ 0xe73d0 (40 entries) bios0: vendor Apple Computer, Inc. version MBP11.88Z.0055.B08.0610121325 date 10/12/06 bios0: Apple Computer, Inc. MacBookPro1,1 acpi0 at bios0: rev 2 acpi0: sleep states S0 S3 S4 S5 acpi0: tables DSDT FACP HPET APIC MCFG ASF! SBST ECDT SSDT SSDT SSDT acpi0: wakeup devices ADP1(S3) LID0(S3) PXS1(S4) PXS2(S4) USB1(S3) USB2(S3) USB3(S3) USB4(S3) USB7(S3) EC__(S3) acpitimer0 at acpi0: 3579545 Hz, 24 bits acpihpet0 at acpi0: 14318179 Hz acpimadt0 at acpi0 addr 0xfee0: PC-AT compat cpu0 at mainbus0: apid 0 (boot processor) cpu0: apic clock running at 166MHz cpu1 at mainbus0: apid 1 (application processor) cpu1: Genuine Intel(R) CPU 1500 @ 2.00GHz (GenuineIntel 686-class) 2 GHz cpu1: FPU,V86,DE,PSE,TSC,MSR,PAE,MCE,CX8,APIC,SEP,MTRR,PGE,MCA,CMOV,CFLUSH,DS,ACPI,MMX,FXSR,SSE,SSE2,SS,HTT,TM,SBF,NXE,SSE3,MWA IT,VMX,EST,TM2,xTPR,PDCM ioapic0 at mainbus0: apid 1 pa 0xfec0, version 20, 24 pins ioapic0: misconfigured as apic 0, remapped to apid 1 acpimcfg0 at acpi0 addr 0xe000, bus 0-255 acpiec0 at acpi0 acpiprt0 at acpi0: bus 0 (PCI0) [81/1949] acpiprt1 at acpi0: bus 1 (PEGP) acpiprt2 at acpi0: bus 2 (RP01) acpiprt3 at acpi0: bus 3 (RP02) acpiprt4 at acpi0: bus 4 (RP03) acpiprt5 at acpi0: bus 12 (PCIB) acpicpu0 at acpi0: C3, C2, C1, PSS acpicpu1 at acpi0: C3, C2, C1, PSS acpiac0 at acpi0: AC unit online acpibtn0 at acpi0: LID0 acpibtn1 at acpi0: PWRB acpibtn2 at acpi0: SLPB acpibat0 at acpi0: BAT0 model 14127832176087873 type 14127832377542988 oem 14127833101004627 acpivideo0 at acpi0: GFX0 bios0: ROM list: 0xc/0xfa00 cpu0: Enhanced SpeedStep 1998 MHz: speeds: 2000, 1833, 1667, 1500, 1333, 1000 MHz memory map conflict 0xe00f8000/0x1000 memory map conflict 0xfed1c000/0x4000 memory map conflict 0xfffb/0x3 pci0 at mainbus0 bus 0: configuration mode 1 (bios) pchb0 at pci0 dev 0 function 0 Intel 82945GM Host rev 0x03 ppb0 at pci0
net/tintin++ update
This patch updates net/tintin++ to 2.00.7. It is gzipped to protect it against corruption. This patch does the following: * Update from 1.5.6 currently in tree to 2.00.7 * move MASTER_SITES to sourceforge (home of tintin project) * change license notice from Public Domain to GPL v2 * changes WANTLIB requirements and adds LIB_DEPENDS requirement for devel/pcre * makes use of CONFIGURE_ENV * modifies WRKDIST * gives new distfile checksums * zeroes out old patchfiles and creates new patchfiles * updates pkg/PLIST After applying, please remove .orig files and empty patchfiles in patches. This has been tested on amd64. tintin++_2.00.7p0_update.patch.gz Description: GNU Zip compressed data
Re: update tintin++ 2.00.7
Let's try this again with an attachment. This patch was just too much for gmail to handle. On Thu, Sep 8, 2011 at 5:31 PM, Ted Roby ted.r...@gmail.com wrote: Here's the second version of my diff. tintin++_2.00.7p0_update.patch Description: Binary data
update tintin++ 2.00.7
This is my first attempt at a ports update. This has been tested on amd64. Please download here: http://devio.us/~roby/tintin++_2.00.7p0_port.tar.gz I have made some minor fixes to the code, but I have not replaced the vsprintf, strcpy and sprintf functions as of yet. Please review and advise. I will also replace the above functions. I guess net/tintin++ is open for maintainership? I am willing to take this on if my work has been successful.
Re: update tintin++ 2.00.7
On Thu, Sep 8, 2011 at 1:54 AM, Stuart Henderson s...@spacehopper.org wrote: On 2011-09-08, Ted Roby ted.r...@gmail.com wrote: This is my first attempt at a ports update. This has been tested on amd64. Please download here: http://devio.us/~roby/tintin++_2.00.7p0_port.tar.gz Diff is better - use cvs add / cvs rm (this is OK against anoncvs) then cvs diff -uNp. I'm looking for advice on the following: Should I set BINDIR to /usr/local/bin, leave as .. or set to ${LOCALBASE}/bin ? Should I remove or modify these headers: # $OpenBSD: Makefile,v 1.16 2010/07/12 22:07:42 sthen Exp $ Also, I am getting weird escape sequences in the patchfile that break scrolling in xfce4-terminal and show artifacts in firefox. I used xxxterm to copy and paste here. The patch otherwise applies cleanly. Here's the diff: Index: tintin++/Makefile === RCS file: /cvs/ports/net/tintin++/Makefile,v retrieving revision 1.16 diff -u -p -r1.16 Makefile --- tintin++/Makefile 12 Jul 2010 22:07:42 - 1.16 +++ tintin++/Makefile 8 Sep 2011 13:21:35 - @@ -1,14 +1,12 @@ -# $OpenBSD: Makefile,v 1.16 2010/07/12 22:07:42 sthen Exp $ COMMENT= client program to help playing muds -DISTNAME= tintin++v1.5pl6 -PKGNAME= tintin-1.5.6 +DISTNAME= tintin-2.00.7 +PKGNAME= tintin-2.00.7 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 PERMIT_PACKAGE_CDROM= Yes @@ -16,17 +14,21 @@ PERMIT_PACKAGE_FTP= Yes PERMIT_DISTFILES_CDROM=Yes PERMIT_DISTFILES_FTP= Yes -WANTLIB += c -CONFIGURE_STYLE= gnu old +CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \ +LDFLAGS=-L${LOCALBASE}/lib -WRKDIST= ${WRKDIR}/tintin++/src +LIB_DEPENDS += devel/pcre +WANTLIB += c pcre + +CONFIGURE_STYLE= gnu + +WRKDIST= ${WRKDIR}/tt/src NO_REGRESS=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: tintin++/distinfo === RCS file: /cvs/ports/net/tintin++/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- tintin++/distinfo 5 Apr 2007 16:20:16 - 1.3 +++ tintin++/distinfo 8 Sep 2011 13:21:35 - @@ -1,5 +1,5 @@ -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 +MD5 (tintin-2.00.7.tar.gz) = 9nkXg6cHcFikmiFvXK+Akw== +RMD160 (tintin-2.00.7.tar.gz) = +Imlqu4TACUY8PChEQZSm/x79Qw= +SHA1 (tintin-2.00.7.tar.gz) = fkmQWk/jjriI/T7KytrwZQ6H6tA= +SHA256 (tintin-2.00.7.tar.gz) = M/LaLPNzkWuLQb7TaWEiR38G0/1GgJ13Bs8w0JCaLBw= +SIZE (tintin-2.00.7.tar.gz) = 255502 Index: tintin++/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 --- tintin++/patches/patch-Makefile_in 26 Oct 2007 22:10:06 - 1.1 +++ tintin++/patches/patch-Makefile_in 8 Sep 2011 13:21:35 - @@ -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@ +--- Makefile.inThu Feb 24 19:05:51 2011 Makefile.inWed Sep 7 23:07:33 2011 +@@ -35,7 +35,7 @@ - # BINDIR is the directory you wish tt++ to be placed if you wish to use - # make install. --BINDIR = .. -+BINDIR = /usr/local/bin + LDFLAGS = @LDFLAGS@ - # DEFAULT_FILE_DIR is the path to tintin files. --DEFAULT_FILE_DIR = @HOME@ -+DEFAULT_FILE_DIR = /usr/local/lib/tintin +-INCS = @MYINCLUDE@ ++INCS += -I${LOCALBASE}/include @MYINCLUDE@ - # - # 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) + LIBS = @MYLIB@ @LIBS@ --all: tintin++ install -+all: tintin++ - - tintin++: $(OFILES) tintin.h - @echo Linking... - $(CC) $(CFLAGS) $(FFLAGS