CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/03 02:51:01 Modified files: multimedia/gstreamer-0.10/plugins-base: Makefile multimedia/gstreamer-0.10/plugins-base/patches: patch-ext_cdparanoia_gstcdparanoiasrc_c multimedia/gstreamer1/plugins-base: Makefile Added files: multimedia/gstreamer-0.10/plugins-base/patches: patch-gst_audioresample_resample_c multimedia/gstreamer1/plugins-base/patches: patch-gst_audioresample_resample_c Removed files: multimedia/gstreamer-0.10/plugins-base/patches: patch-gst_audioresample_resample_sse_h patch-gst_audioresample_speex_resampler_double_c patch-gst_audioresample_speex_resampler_float_c multimedia/gstreamer1/plugins-base/patches: patch-gst_audioresample_resample_sse_h patch-gst_audioresample_speex_resampler_double_c patch-gst_audioresample_speex_resampler_float_c Log message: Simplify patching.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs
Module name:ports
Changes by: lan...@cvs.openbsd.org 2014/01/03 03:21:01
Modified files:
multimedia/livestreamer-curses: Makefile
Log message:
add ${_MODPY_BUILD_DEPENDS} to BDEP, NO_BUILD is set to Yes but MODPY_BIN
is used during do-install.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/03 03:22:12 Modified files: graphics/argyll: Makefile distinfo graphics/argyll/patches: patch-Jamtop patch-spectro_hidio_c graphics/argyll/pkg: PLIST Log message: Update to argyllcms-1.6.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: z...@cvs.openbsd.org2014/01/03 06:17:44 Modified files: x11/kde4/okular: Makefile x11/kde4/okular/pkg: PLIST Log message: correct @conflict marker.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/03 06:50:04 Modified files: print/poppler : Makefile distinfo Log message: Bugfix update to poppler-0.24.5. ok kili@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/03 07:26:47 Modified files: www/phpvirtualbox: Makefile distinfo www/phpvirtualbox/pkg: PLIST Log message: Update to phpvirtualbox-4.3.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2014/01/03 08:53:04 Modified files: graphics/png : Makefile distinfo Log message: SECURITY update to 1.6.8: Fix a null pointer dereference (CVE-2013-6954)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/03 09:01:53 Modified files: devel/glib2: Makefile Added files: devel/glib2/patches: patch-glib_gfileutils_c Log message: From upstream: g_get_current_dir(): consult PWD first
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/03 09:02:20 Modified files: x11/gnome/terminal: Makefile x11/gnome/terminal/patches: patch-src_client_c patch-src_terminal_c Log message: Sync patches with upstream now that g_get_current_dir() does the right thing.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2014/01/03 09:18:11 Modified files: lang/io: Makefile lang/io/pkg: PLIST Log message: Add dependency on graphics/freeglut, building the Font and OpenGL extensions. Hidden dependency noticed by naddy@. OK naddy@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2014/01/03 10:52:18 Log message: Import ruby 2.1.0 OK landry@ Status: Vendor Tag: jeremy Release Tags: jeremy_2014-Jan-03 N ports/lang/ruby/2.1/distinfo N ports/lang/ruby/2.1/Makefile N ports/lang/ruby/2.1/patches/patch-ext_socket_option_c N ports/lang/ruby/2.1/patches/patch-lib_rinda_ring_rb N ports/lang/ruby/2.1/patches/patch-lib_fileutils_rb N ports/lang/ruby/2.1/patches/patch-common_mk N ports/lang/ruby/2.1/patches/patch-configure N ports/lang/ruby/2.1/patches/patch-ext_extmk_rb N ports/lang/ruby/2.1/patches/patch-lib_rubygems_commands_install_command_rb N ports/lang/ruby/2.1/patches/patch-lib_rubygems_dependency_installer_rb N ports/lang/ruby/2.1/patches/patch-lib_rubygems_ext_ext_conf_builder_rb N ports/lang/ruby/2.1/patches/patch-ext_tk_extconf_rb N ports/lang/ruby/2.1/pkg/PLIST-gdbm N ports/lang/ruby/2.1/pkg/PLIST-main N ports/lang/ruby/2.1/pkg/DESCR-gdbm N ports/lang/ruby/2.1/pkg/DESCR-main N ports/lang/ruby/2.1/pkg/DESCR-ri_docs N ports/lang/ruby/2.1/pkg/DESCR-tk N ports/lang/ruby/2.1/pkg/MESSAGE-main N ports/lang/ruby/2.1/pkg/PLIST-ri_docs N ports/lang/ruby/2.1/pkg/PLIST-tk N ports/lang/ruby/2.1/pkg/UNMESSAGE-main No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2014/01/03 10:53:38 Modified files: lang/ruby : Makefile Log message: Hook ruby 2.1 up to the build
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2014/01/03 11:37:48 Modified files: www/sope : Makefile distinfo Log message: update SOPE to 2.1.1b OK giovanni@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2014/01/03 11:39:51 Modified files: www/sogo : Makefile distinfo www/sogo/patches: patch-SOPE_GDLContentStore_EOQualifier+GCS_m patch-SOPE_GDLContentStore_GCSFolder_m patch-UI_MailPartViewers_UIxMailPartViewer_m www/sogo/pkg : PLIST README Added files: www/sogo/patches: patch-UI_MailPartViewers_GNUmakefile Log message: update SOGo to 2.1.1b the default changed where the SOGo daemon listens on: now on 127.0.0.1:2 If needed, to get back the old behaviour listening on *:2 follow instructions in the pkg README. OK giovanni@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2014/01/03 11:44:44 Modified files: x11/gnustep/make: Makefile distinfo x11/gnustep/make/patches: patch-GNUmakefile_in x11/gnustep/make/pkg: PLIST Log message: minor update to 2.6.6
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2014/01/03 11:53:01 Modified files: x11/gnustep/base: Makefile distinfo x11/gnustep/base/pkg: PLIST Log message: update to 1.24.6 NSUUID implemented New OSX version macros TLS support improvements Various new methods for OSX compatibility Various other bugfixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2014/01/03 11:55:36 Modified files: x11/gnustep/gui: Makefile distinfo x11/gnustep/gui/pkg: PLIST Removed files: x11/gnustep/gui/patches: patch-Source_NSBitmapImageRep+GIF_m patch-Source_NSBitmapImageRep+PNG_m patch-Source_NSBitmapImageRep_m patch-Source_NSParagraphStyle_m patch-Tools_speech_GSSpeechSynthesizer_m Log message: update to 0.24.0 Require newer base release as its moved the -replaceObject:withObject: of NSKeyedUnarchiver there. Support for newer releases of the gif library. NSTabView is now flipped. Theme improvements and changes to image mapping. Many bugfixes.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: sebas...@cvs.openbsd.org2014/01/03 11:56:56 Modified files: x11/gnustep/back: Makefile distinfo Log message: update to 0.24.0 accompanying to the gnustep-gui update, Added experimental Opal backend. Allow for ARGB visual for OpenGL.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/01/03 12:53:02 Modified files: devel/libgit2/libgit2-glib: Makefile distinfo devel/libgit2/libgit2-glib/pkg: PLIST Log message: update to libgit2-glib-0.0.10
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2014/01/03 13:16:31 Modified files: graphics/netpbm: Makefile distinfo Added files: graphics/netpbm/patches: patch-editor_ppmquantall Log message: * convert ppmquantall script from bash to sh syntax; from FreeBSD * update to 10.35.91: minor bug fixes
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gsoa...@cvs.openbsd.org 2014/01/03 13:20:58 Modified files: security/stunnel/patches: patch-tools_stunnel_conf-sample_in Log message: missing RCS id.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: na...@cvs.openbsd.org 2014/01/03 13:47:01 Modified files: audio/mpg123 : Makefile distinfo audio/mpg123/patches: patch-configure patch-src_output_Makefile_in Log message: maintenance update to 1.17.0
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: gsoa...@cvs.openbsd.org 2014/01/03 14:47:33 Modified files: sysutils/ggrep : Makefile distinfo sysutils/ggrep/pkg: PLIST Log message: update to 2.16 tweaks and OK naddy@ (maintainer)
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: be...@cvs.openbsd.org 2014/01/03 15:15:24 Modified files: productivity/zim: Makefile distinfo productivity/zim/patches: patch-zim_config_py productivity/zim/pkg: DESCR PLIST Log message: update zim to version 0.60 OK juanfra@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2014/01/03 16:11:20 Modified files: x11/gigolo : Makefile Log message: make show=BUILD_DEPENDS - shows you that CONFIGURE_STYLE=gnu is not enough to get autoconf/automake...
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: es...@cvs.openbsd.org 2014/01/03 17:10:18 Modified files: infrastructure/bin: register-plist Log message: move to @signer
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: bcal...@cvs.openbsd.org 2014/01/04 00:51:53 Modified files: net/tintin++ : Makefile distinfo net/tintin++/pkg: PLIST Removed files: net/tintin++/patches: patch-Makefile_in patch-configure patch-echo_c patch-files_c patch-install_sh patch-main_c patch-misc_c patch-net_c patch-parse_c patch-utils_c Log message: Update tintin++ to 2.01.0, from Ted Roby troby AT freeshell DOT org (taking MAINTAINER) ok landry@
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: NEW: x11/kde-share
31.12.2013 0:47 пользователь Vadim Zhukov persg...@gmail.com написал: This is some sort of pseudo-package: it tries to combine some common stuff from kdebase-3.x and kde-runtime-4.x. I need this to finally make kde-runtime-4.x co-exist with KDE3. This could be a nice New Year gift for all KDE-on-OpenBSD users. :) Okay to import? ping
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: NEW: x11/kde-share
On Tue, Dec 31, 2013 at 12:47:37AM +0400, Vadim Zhukov wrote: This is some sort of pseudo-package: it tries to combine some common stuff from kdebase-3.x and kde-runtime-4.x. I need this to finally make kde-runtime-4.x co-exist with KDE3. This could be a nice New Year gift for all KDE-on-OpenBSD users. :) Okay to import? I think kde-share is not very appropriate... kde-shared-desktop-dirs ? kde-shared-data ? Oh and its MASTER_SITES0, not MASTER_SITES:0. Landry
Re: waf woes
On 2014/01/02 18:59, frantisek holop wrote: i would bother with it because more and more projects will go with it. it would be nice if all of them bundled it (as its author advises) but that is not the case. that is what my question was about. should it be downloaded at compile time? Add it as a SUPDISTFILE instead, so it is hash-checked, and so that the port can build for people using USE_SYSTRACE=Yes.
Re: NEW: x11/kde-share
2014/1/3 Landry Breuil lan...@rhaalovely.net: On Tue, Dec 31, 2013 at 12:47:37AM +0400, Vadim Zhukov wrote: This is some sort of pseudo-package: it tries to combine some common stuff from kdebase-3.x and kde-runtime-4.x. I need this to finally make kde-runtime-4.x co-exist with KDE3. This could be a nice New Year gift for all KDE-on-OpenBSD users. :) Okay to import? I think kde-share is not very appropriate... kde-shared-desktop-dirs ? kde-shared-data? kde-shared-desktop-dirs will be too specific: this package contains icons, too (and their number likely to be increased in the future). So let it be kde-shared-data then. Oh and its MASTER_SITES0, not MASTER_SITES:0. Oh, thanks! Fixed in the attached version, together with @conflict markers update. Okay? -- WBR, Vadim Zhukov kde-shared-data_port.tar.gz Description: GNU Zip compressed data
Re: waf woes
On Fri, Jan 03, 2014 at 05:41:39AM +0100, frantisek holop wrote: do you go around telling projects stop using insert your favourite build system to hate? i can imagine your answer if someone did the same for openbsd and/or ports. it is nobody elses business what a project uses. i am surprised you dont share this view. Actually, no, you probably can't imagine my answer. If the view had technical merits, I would do my best to fix things. The hard part with ports and packages is not the implementation, it's the correct design. The very great thing with what we currently have is that it's fluid enough that it can evolve. as far as a autohell replacement goes, there currently is nothing worth saving. The cmake + ninja combination is probably the best thing currently in existence for parallel builds of big projects. As for discovering OS properties, nothing is currently really good.
Re: UPDATE: graphics/opencv
2013/12/31 Vadim Zhukov persg...@gmail.com:
2013/12/31 Rafael Sadowski raf...@sizeofvoid.org:
On Tuesday 31 December 2013 01:22:13 Vadim Zhukov wrote:
2013/12/30 Rafael Sadowski raf...@sizeofvoid.org:
Hey @ports,
maintainer update. Okay?
Upstream decided to convert opencv_ts to a static library, really?
cheers Rafael
--
Vadim Zhukov
Yes, if I can trust my build and the ArchLinux OpenCV package contents. I
was also surprised.
cheers Rafael
I see the following commit upstream:
https://github.com/Itseez/opencv/commit/131458847bbf2fe971c6b5e40a8b59d0d48b0d0c
Make ts always static. This allows us to forget about the
GTEST_(CREATE|LINKED_AS)_SHARED_LIBRARY
macros and to get rid of the dependency on cvconfig.h.
As far as I can see, they bundled GTest into the opencv_ts module, and
now are having problems when GTest is installed on the system and is
picked up (how?! I don't see any mention of find_package(GTest) or
such in CMakeLists.txt files... Maybe it could get linked by
transition from some other external library, though?). Could you,
please, try to do builds both with and without devel/gtest installed,
and compare port-lib-depends-check output?
If there will be no fallout in both builds, I think we could easily
patch out the set(OPENCV_MODULE_TYPE STATIC) line and have opencv_ts
in a shared library, as it should be. If something will break - it
will mean that we have some serious problems already, with current
port, which should get investigated.
After some expirements I've got OpenCV successfully built on i386 with
ts module as a shared library. I see no problems here, and also I
don't see new regression tests starting to fail. The diff I've run
with is just:
--- modules/ts/CMakeLists.txt.orig Fri Jan 3 12:54:40 2014
+++ modules/ts/CMakeLists.txt Fri Jan 3 13:08:59 2014
@@ -4,8 +4,8 @@ if(IOS)
ocv_module_disable(ts)
endif()
-set(OPENCV_MODULE_TYPE STATIC)
-set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
+#set(OPENCV_MODULE_TYPE STATIC)
+#set(OPENCV_MODULE_IS_PART_OF_WORLD FALSE)
if(HAVE_CUDA)
ocv_include_directories(${CUDA_INCLUDE_DIRS})
Rafael, if this will be okay for you and tested on amd64 (I don't have
PIE yet), then I'll update the port after returning from Belarus
(January 8-9), unless someone would like to steal a commit. :)
--
WBR,
Vadim Zhukov
WIP: Ruby on Rails 4.0, help with thread safe needed
Hi ports@. Roman Kravchuk and me are working on Ruby on Rails 4.0 port (incl Active Record and such). Although we got it running and working (at first glance), there is one thing which bothers us (hence the kinda preliminary mail). Ruby thread safe library (which RoR 4.0 depends on) fails to pass test suite: most of the time it segfaults at 50 of 68 tests (as I said before, RoR 4.0 itself is working at first glance). Same test suite works under Ubuntu Linux: Finished tests in 475.533748s, 0.1430 tests/s, 5.0827 assertions/s. 68 tests, 2417 assertions, 0 failures, 0 errors, 0 skips ruby -v: ruby 2.0.0p353 (2013-11-22 revision 43784) [x86_64-linux-gnu] So at this point we'd love to receive some help from other people on (possible) threading issues. Attached are Ruby thread safe port and accompanying Ruby atomic. With Ruby thread safe tests, the following will give verbose output: cd `make show=WRKSRC` rake20 --trace test Tested here on -current amd64 (Ruby atomic tests also pass). Cheers, Alexey ruby-thread_safe.tgz Description: GNU Zip compressed data ruby-atomic.tgz Description: GNU Zip compressed data
Re: waf woes
On Tuesday, December 31, 2013 01:06:47 PM Stuart Henderson wrote: If people are looking for a non-autoconf build system, cmake seems about the best choice.. it's not perfect, but CMakefiles are fairly readable, and it's nicely cross-platform.. In my opinion plain Makefiles are the sanest build system. Look at how suckless.org people do their stuff. -- Dmitrij D. Czarkoff
lang/petite-chez (was: Re: i386 bulk build failures)
Juan Francisco Cantero Hurtado i...@juanfra.info wrote: lang/petite-chez: undefined reference to `__guard' ONLY_FOR_ARCHS =i386 Hmm, FreeBSD has a port of 8.4 that at least adds amd64. The license of Petite Chez is weird and the port is very outdated. We have better scheme interpreters/compilers like gambit, chicken or racket. So, ok juanfra@ if someone wants delete the port :) Let's ask the maintainer for input... cc'ed. -- Christian naddy Weisgerber na...@mips.inka.de
5.4: graphics/png security fix
This is the fix for the null pointer dereference (CVE-2013-6954)
for OPENBSD_5_4, backported from png 1.6.8.
I don't have a 5.4-stable system at hand to actually test this
there.
OK?
OPENBSD_5_3 has 1.5.10, which is not affected according to the libpng
homepage.
Index: Makefile
===
RCS file: /cvs/ports/graphics/png/Makefile,v
retrieving revision 1.94
diff -u -p -r1.94 Makefile
--- Makefile9 Jun 2013 15:13:03 - 1.94
+++ Makefile3 Jan 2014 15:53:18 -
@@ -5,7 +5,7 @@ COMMENT=library for manipulating PNG im
VERSION= 1.6.2
DISTNAME= libpng-${VERSION}
PKGNAME= png-${VERSION}
-REVISION= 0
+REVISION= 1
SHARED_LIBS= png16 17.0 \
png 17.0
CATEGORIES=graphics
Index: patches/patch-pngrtran_c
===
RCS file: patches/patch-pngrtran_c
diff -N patches/patch-pngrtran_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-pngrtran_c3 Jan 2014 15:53:18 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+CVE-2013-6954
+
+--- pngrtran.c.origThu Apr 25 14:24:44 2013
pngrtran.c Fri Jan 3 14:21:08 2014
+@@ -1933,6 +1933,9 @@ png_read_transform_info(png_structrp png_ptr, png_info
+
+ info_ptr-bit_depth = 8;
+ info_ptr-num_trans = 0;
++
++ if (png_ptr-palette == NULL)
++png_error (png_ptr, Palette is NULL in indexed image);
+ }
+ else
+ {
Index: patches/patch-pngset_c
===
RCS file: patches/patch-pngset_c
diff -N patches/patch-pngset_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-pngset_c 3 Jan 2014 15:53:18 -
@@ -0,0 +1,15 @@
+$OpenBSD$
+
+CVE-2013-6954
+
+--- pngset.c.orig Thu Apr 25 14:24:44 2013
pngset.c Fri Jan 3 14:21:08 2014
+@@ -536,7 +536,7 @@ png_set_PLTE(png_structrp png_ptr, png_inforp info_ptr
+ #endif
+ ))
+{
+- png_chunk_report(png_ptr, Invalid palette, PNG_CHUNK_ERROR);
++ png_error(png_ptr, Invalid palette);
+ return;
+}
+
--
Christian naddy Weisgerber na...@mips.inka.de
[update] waf
so here we go, my little uphill battle.
please find attached the diff to update the waf port.
all the current ports that needed waf have been changed
to drop that dependency, so i left out the historical
1.5.18 version. and as such, there are no ports atm to
test it against :] but the newly released mpv uses
it, and i will submit a port for that shortly. some
other projects (namely samba) include their own waf,
this port tries to cater to those that dont (but
samba could use this one in theory as well).
as you can see from the port, i have chosen the way of
least resistance to make waf behave. the port simply
downloads the waf scripts, patches them, and puts them
into ${LOCALBASE}/bin. waf is patched so that upon
first execution (e.g. configure) it will also unpack
its library under ${WORKDIST}. to use waf simply add:
MODULES += devel/waf
BUILD_DEPENDS = devel/waf
MODWAF_VERSION =1.7.13
remove CONFIGURE_STYLE
and specify CONFIGURE_ARGS
adding waf versions is as easy as adding them to
DISTFILES and making sure the patch works for them.
i am not happy that they went with this daemontools
mindset and not using site-packages but who am i
to judge. it supposedly runs on all python versions
(that matter) so at least that should not be an issue.
i think this might be a bit better and more elegant
solution than to have random ports download random
build dependencies from the internet... otherwise
probably what Stuart said (SUPDISTFILE)..
-f
--
saint: a dead sinner revised and edited.
Index: Makefile
===
RCS file: /cvs/ports/devel/waf/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- Makefile7 Aug 2013 21:31:49 - 1.12
+++ Makefile3 Jan 2014 15:43:10 -
@@ -1,40 +1,42 @@
# $OpenBSD: Makefile,v 1.12 2013/08/07 21:31:49 naddy Exp $
-COMMENT= Python-based build system
+COMMENT = Python-based build system
-DISTNAME= waf-1.5.18
-CATEGORIES=devel
-REVISION = 2
-EXTRACT_SUFX= .tar.bz2
+DISTNAME = waf-1.7.14
+CATEGORIES = devel
-HOMEPAGE= https://waf.googlecode.com/
-MASTER_SITES= ${HOMEPAGE}/files/
+HOMEPAGE = https://code.google.com/p/waf/
+MAINTAINER = frantisek holop min...@obiit.org
# BSD
-PERMIT_PACKAGE_CDROM= Yes
+PERMIT_PACKAGE_CDROM = Yes
-MODULES= lang/python
-
-NO_TEST= Yes
-
-SUBST_VARS=MODPY_SITEPKG
-
-pre-configure:
- ${SUBST_CMD} ${WRKSRC}/waf-light ${WRKSRC}/wscript
- touch ${WRKSRC}/waf
-
-do-configure:
- cd ${WRKSRC} PYTHON=${MODPY_BIN} ${MODPY_BIN} ./waf-light configure
-
-do-build:
- cd ${WRKSRC} ${MODPY_BIN} ./waf-light
+MASTER_SITES = https://waf.googlecode.com/files/
+DISTFILES =waf-1.7.13 \
+ waf-1.7.14
+EXTRACT_ONLY =
+
+MODULES = lang/python
+
+NO_BUILD = Yes
+NO_TEST = Yes
+
+MODPY_ADJ_FILES = ${DISTFILES}
+
+post-extract:
+ mkdir ${WRKDIST}
+.for f in ${DISTFILES}
+ cp ${FULLDISTDIR}/$f ${WRKDIST}/$f
+.endfor
+
+do-patch:
+.for f in ${DISTFILES}
+ perl -pi -e 's/base, /os.getcwd(), /' ${WRKDIST}/$f
+.endfor
do-install:
- cd ${WRKSRC} ${MODPY_BIN} ./waf-light install --yes
--prefix=${PREFIX}
-
-# clean root owned files and overwrite with our patched version
-post-install:
- rm -fr ${WRKSRC}/build
- ${INSTALL_SCRIPT} ${WRKSRC}/waf-light ${PREFIX}/bin/waf
+.for f in ${DISTFILES}
+ ${INSTALL_SCRIPT} ${WRKDIST}/$f ${PREFIX}/bin
+.endfor
.include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/devel/waf/distinfo,v
retrieving revision 1.4
diff -u -p -r1.4 distinfo
--- distinfo30 Sep 2010 12:13:07 - 1.4
+++ distinfo3 Jan 2014 15:43:10 -
@@ -1,5 +1,4 @@
-MD5 (waf-1.5.18.tar.bz2) = yxFTSRUl7W6mUjkQFcaQ6w==
-RMD160 (waf-1.5.18.tar.bz2) = SSYN3QMDfgqcRM+w0FjSU8PUR5g=
-SHA1 (waf-1.5.18.tar.bz2) = Ll5LZlvuIsERz4m2AmrPh9s8rwI=
-SHA256 (waf-1.5.18.tar.bz2) = LhQDlNNTcuzKA2fBAS1xnZPsyAZG4n1shAZLcFw14xs=
-SIZE (waf-1.5.18.tar.bz2) = 904130
+SHA256 (waf-1.7.13) = A8x1AEk1DuAc28WEtwkk4zP8wXukotBGSNqxU1U4qHM=
+SHA256 (waf-1.7.14) = k7J4PoqQJ9Wm9vEa7XhOUGdlcHvcvXw56ut/AAsXH+c=
+SIZE (waf-1.7.13) = 90702
+SIZE (waf-1.7.14) = 90755
Index: waf.port.mk
===
RCS file: /cvs/ports/devel/waf/waf.port.mk,v
retrieving revision 1.5
diff -u -p -r1.5 waf.port.mk
--- waf.port.mk 2 Jul 2013 08:36:16 - 1.5
+++ waf.port.mk 3 Jan 2014 15:43:10 -
@@ -3,11 +3,12 @@
MODULES += lang/python
MODPY_RUNDEP = no
BUILD_DEPENDS += devel/waf
-MODWAF_BIN = ${LOCALBASE}/bin/waf
+MODWAF_VERSION ?= 1.7.14
+MODWAF_BIN = ${LOCALBASE}/bin/waf-${MODWAF_VERSION}
MAKE_ENV +=PYTHON=${MODPY_BIN} PYTHON_VERSION=${MODPY_VERSION}
_MODWAF_CMD = cd ${WRKSRC} ${SETENV} ${MAKE_ENV} ${MODWAF_BIN}
RubyGems DoS fixes
This fixes CVE-2013-4287 and CVE-2013-4363, both for denial of service
algorithmic complexity vulnerabilities:
https://github.com/rubygems/rubygems/blob/master/CVE-2013-4287.txt
https://github.com/rubygems/rubygems/blob/master/CVE-2013-4363.txt
This is a patch for devel/rubygems (for ruby 1.8) and lang/ruby/1.9.
lang/ruby/2.0 doesn't need the patch as it was included in the last
upstream patch level release. The lang/ruby/1.9 patch has already
been applied upstream.
I plan on committing this tomorrow unless I hear objections.
Thanks,
Jeremy
Index: lang/ruby/1.9/Makefile
===
RCS file: /cvs/ports/lang/ruby/1.9/Makefile,v
retrieving revision 1.41
diff -u -p -r1.41 Makefile
--- lang/ruby/1.9/Makefile 25 Nov 2013 14:16:23 - 1.41
+++ lang/ruby/1.9/Makefile 1 Dec 2013 23:46:24 -
@@ -23,6 +23,8 @@ PKGNAME-ri_docs = ruby-ri_docs-${VERSION
PKG_ARCH-ri_docs = *
WANTLIB-ri_docs = # empty
+REVISION-main =0
+
PKGSPEC-main = ruby-=1.9,1.10
CONFIGURE_ARGS = --program-suffix=19 \
Index: lang/ruby/1.9/patches/patch-lib_rubygems_version_rb
===
RCS file: lang/ruby/1.9/patches/patch-lib_rubygems_version_rb
diff -N lang/ruby/1.9/patches/patch-lib_rubygems_version_rb
--- /dev/null 1 Jan 1970 00:00:00 -
+++ lang/ruby/1.9/patches/patch-lib_rubygems_version_rb 1 Dec 2013 23:42:43
-
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Backport fix for CVE-2013-4287 and CVE-2013-4363.
+
+--- lib/rubygems/version.rb.orig Sun Dec 1 15:40:49 2013
lib/rubygems/version.rbSun Dec 1 15:40:51 2013
+@@ -145,8 +145,8 @@ class Gem::Version
+
+ include Comparable
+
+- VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc:
+- ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
++ VERSION_PATTERN = '[0-9]+(?\.[0-9a-zA-Z]+)*' # :nodoc:
++ ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
+
+ ##
+ # A string representation of this Version.
Index: devel/ruby-gems/Makefile
===
RCS file: /cvs/ports/devel/ruby-gems/Makefile,v
retrieving revision 1.29
diff -u -p -r1.29 Makefile
--- devel/ruby-gems/Makefile20 Mar 2013 19:13:50 - 1.29
+++ devel/ruby-gems/Makefile1 Dec 2013 23:41:57 -
@@ -5,7 +5,7 @@ COMMENT=package management framework fo
V= 1.8.23
DISTNAME= rubygems-$V
PKGNAME= ruby-gems-$V
-REVISION= 0
+REVISION= 1
CATEGORIES=devel
HOMEPAGE= http://docs.rubygems.org/
Index: devel/ruby-gems/patches/patch-lib_rubygems_version_rb
===
RCS file: devel/ruby-gems/patches/patch-lib_rubygems_version_rb
diff -N devel/ruby-gems/patches/patch-lib_rubygems_version_rb
--- /dev/null 1 Jan 1970 00:00:00 -
+++ devel/ruby-gems/patches/patch-lib_rubygems_version_rb 1 Dec 2013
23:41:39 -
@@ -0,0 +1,17 @@
+$OpenBSD$
+
+Backport fix for CVE-2013-4287 and CVE-2013-4363.
+
+--- lib/rubygems/version.rb.orig Sun Dec 1 15:40:49 2013
lib/rubygems/version.rbSun Dec 1 15:40:51 2013
+@@ -145,8 +145,8 @@ class Gem::Version
+
+ include Comparable
+
+- VERSION_PATTERN = '[0-9]+(\.[0-9a-zA-Z]+)*' # :nodoc:
+- ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})*\s*\z/ # :nodoc:
++ VERSION_PATTERN = '[0-9]+(?\.[0-9a-zA-Z]+)*' # :nodoc:
++ ANCHORED_VERSION_PATTERN = /\A\s*(#{VERSION_PATTERN})?\s*\z/ # :nodoc:
+
+ ##
+ # A string representation of this Version.
Re: WIP: Ruby on Rails 4.0, help with thread safe needed
On 01/03 03:08, Alexey Suslikov wrote: Hi ports@. Roman Kravchuk and me are working on Ruby on Rails 4.0 port (incl Active Record and such). Offtopic, but: We did have a previous rails port, which was removed, partly because it was old and insecure, and partly because the benefit of the port does not outweigh the cost. Search the ports@ archives for details. If you are planning on submitting the port for inclusion in the ports system, you'll have to explain how the benefits outweight the costs. Although we got it running and working (at first glance), there is one thing which bothers us (hence the kinda preliminary mail). Ruby thread safe library (which RoR 4.0 depends on) fails to pass test suite: most of the time it segfaults at 50 of 68 tests (as I said before, RoR 4.0 itself is working at first glance). Same test suite works under Ubuntu Linux: Finished tests in 475.533748s, 0.1430 tests/s, 5.0827 assertions/s. 68 tests, 2417 assertions, 0 failures, 0 errors, 0 skips ruby -v: ruby 2.0.0p353 (2013-11-22 revision 43784) [x86_64-linux-gnu] So at this point we'd love to receive some help from other people on (possible) threading issues. Attached are Ruby thread safe port and accompanying Ruby atomic. With Ruby thread safe tests, the following will give verbose output: cd `make show=WRKSRC` rake20 --trace test Tested here on -current amd64 (Ruby atomic tests also pass). I tested on a not-so-current -current on amd64 and everything passes: Finished tests in 1466.086436s, 0.0464 tests/s, 1.6486 assertions/s. 68 tests, 2417 assertions, 0 failures, 0 errors, 0 skips ruby -v: ruby 2.0.0p353 (2013-11-22 revision 43784) [x86_64-openbsd] $ dmesg |head -n1 OpenBSD 5.4-current (GENERIC.MP) #195: Mon Dec 9 16:34:18 MST 2013 On i386, the first time I ran the tests, they didn't segfault, but the tests don't complete: ... TestCacheTorture#test_put_if_absent = 103.66 s = . TestHash#test_concurrency = /usr/obj/ports/thread_safe-0.1.3-ruby20/thread_safe-0.1.3/test/test_hash.rb:11:in `[]=': can't add a new key into hash during iteration (RuntimeError) from /usr/obj/ports/thread_safe-0.1.3-ruby20/thread_safe-0.1.3/test/test_hash.rb:11:in `block (4 levels) in test_concurrency' from /usr/obj/ports/thread_safe-0.1.3-ruby20/thread_safe-0.1.3/test/test_hash.rb:10:in `times' from /usr/obj/ports/thread_safe-0.1.3-ruby20/thread_safe-0.1.3/test/test_hash.rb:10:in `block (3 levels) in test_concurrency' rake aborted! I'm not sure why this wasn't just a failure and why it caused the test suite to abort. The second time, I did get a segfault, on a test that passed on the previous run: TestCacheTorture#test_add_remove_to_zero = /usr/obj/ports/thread_safe-0.1.3-ruby20/thread_safe-0.1.3/lib/thread_safe/non_concurrent_cache_backend.rb:10: [BUG] Segmentation fault GDB backtrace looks like: (gdb) bt #0 0x0e6cf68d in kill () at stdin:2 #1 0x0e73a416 in raise (s=6) at /usr/src/lib/libc/gen/raise.c:39 #2 0x0e73a33c in abort () at /usr/src/lib/libc/stdlib/abort.c:70 #3 0x0e2dc21d in rb_bug () from /usr/local/lib/libruby20.so.0.1 #4 0x0e39089a in sigsegv () from /usr/local/lib/libruby20.so.0.1 #5 signal handler called #6 0x0e398509 in find_entry () from /usr/local/lib/libruby20.so.0.1 #7 0x0e398626 in st_lookup () from /usr/local/lib/libruby20.so.0.1 #8 0x0e2f8b8a in rb_hash_aref () from /usr/local/lib/libruby20.so.0.1 #9 0x0e3f4adf in vm_exec_core () from /usr/local/lib/libruby20.so.0.1 #10 0x0e3f8866 in vm_exec () from /usr/local/lib/libruby20.so.0.1 Is this the same segfault that you were receiving? The i386 machine was running: ruby 2.0.0p353 (2013-11-22 revision 43784) [i386-openbsd] $ dmesg |head -n1 OpenBSD 5.4-current (GENERIC.MP) #152: Sat Nov 30 00:50:11 MST 2013 Not sure how much this information helps, though. Thanks, Jeremy
Re: UPDATE: fonts/dina-fonts
On Thu, Jan 02, 2014 at 06:27:23PM +0100, Rafael Sadowski wrote:
[...]
I've restored @fontdir in PLIST. Regarding the use of do-extract; espie@
wants to get rid of that, and only a few old ports are still allowed to
use it. What do you think of this simpler version?
Any porter wants to give their OK?
Index: Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Mar 2013 11:06:05 - 1.3
+++ Makefile3 Jan 2014 18:46:37 -
@@ -1,32 +1,42 @@
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
-COMMENT = monospace bitmap font, primarily aimed at programmers
+COMMENT = monospace bitmap font, primarily aimed at programmers
-V =2.89
-PKGNAME = dina-fonts-$V
-DISTNAME = dina-pcf-$V
-CATEGORIES = fonts
+DISTNAME = dina-fonts-2.92
+CATEGORIES = fonts
-HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
+HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
-MAINTAINER = Rafael Sadowski raf...@sizeofvoid.org
+MAINTAINER = Rafael Sadowski raf...@sizeofvoid.org
-# FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
-NO_BUILD = Yes
-NO_TEST = Yes
+NO_BUILD = Yes
+NO_TEST = Yes
USE_X11 = Yes
FONTDIR= ${PREFIX}/lib/X11/fonts/dina
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIR}/BDF
do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium6.pcf ${WRKSRC}/Dina_r400-6.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
${GZIP_CMD} ${WRKSRC}/*.pcf
${X11BASE}/bin/mkfontdir ${WRKSRC}
egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
@@ -34,5 +44,8 @@ do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
+ ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
+
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo7 Dec 2011 09:27:16 - 1.1.1.1
+++ distinfo3 Jan 2014 18:46:37 -
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (dina-fonts-2.92.zip) = 68023
Index: pkg/PLIST
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Dec 2011 09:27:16 - 1.1.1.1
+++ pkg/PLIST 3 Jan 2014 18:46:37 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:27:16 jasper Exp $
+@comment $OpenBSD$
lib/X11/fonts/
@fontdir lib/X11/fonts/dina/
lib/X11/fonts/dina/DinaBold10.pcf.gz
@@ -11,6 +11,9 @@ lib/X11/fonts/dina/DinaItalic10.pcf.gz
lib/X11/fonts/dina/DinaItalic8.pcf.gz
lib/X11/fonts/dina/DinaItalic9.pcf.gz
lib/X11/fonts/dina/DinaMedium10.pcf.gz
+lib/X11/fonts/dina/DinaMedium6.pcf.gz
lib/X11/fonts/dina/DinaMedium8.pcf.gz
lib/X11/fonts/dina/DinaMedium9.pcf.gz
lib/X11/fonts/dina/fonts.alias-dina
+share/doc/dina-fonts/
+share/doc/dina-fonts/LICENSE
UPDATE: sysutils/ggrep-2.16
hi,
here is an update for ggrep-2.16.
works fine for me @amd64
regress tests for grep is OK,
one of the gnulib tests fail, but that do not look critical.
$ grep ^FAIL /usr/ports/pobj/ggrep-2.16/grep-2.16/gnulib-tests/test-suite.log
FAIL: test-vc-list-files-cvs.sh
$
OK?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/ggrep/Makefile,v
retrieving revision 1.20
diff -u -p -u -p -r1.20 Makefile
--- Makefile9 Nov 2013 23:19:03 - 1.20
+++ Makefile3 Jan 2014 19:05:45 -
@@ -2,9 +2,8 @@
COMMENT= GNU versions of grep pattern matching utilities
-DISTNAME= grep-2.14
+DISTNAME= grep-2.16
PKGNAME= g${DISTNAME}
-REVISION= 0
CATEGORIES=sysutils
HOMEPAGE= https://www.gnu.org/software/grep/grep.html
Index: distinfo
===
RCS file: /cvs/ports/sysutils/ggrep/distinfo,v
retrieving revision 1.10
diff -u -p -u -p -r1.10 distinfo
--- distinfo23 Aug 2012 20:02:12 - 1.10
+++ distinfo3 Jan 2014 19:05:45 -
@@ -1,2 +1,2 @@
-SHA256 (grep-2.14.tar.xz) = 5w6AHU+7FudhZUpYrki/UCBiHJXI41vYZHQld2hYcuE=
-SIZE (grep-2.14.tar.xz) = 1195640
+SHA256 (grep-2.16.tar.xz) = Ft/rUBPYyfIfQMzsCTbywcagFMgo0wSI8NXG73tVEWI=
+SIZE (grep-2.16.tar.xz) = 1210192
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/ggrep/pkg/PLIST,v
retrieving revision 1.5
diff -u -p -u -p -r1.5 PLIST
--- pkg/PLIST 8 Jul 2012 14:44:12 - 1.5
+++ pkg/PLIST 3 Jan 2014 19:05:45 -
@@ -40,8 +40,6 @@ share/locale/lt/LC_MESSAGES/
share/locale/lt/LC_MESSAGES/grep.mo
share/locale/nb/LC_MESSAGES/grep.mo
share/locale/nl/LC_MESSAGES/grep.mo
-share/locale/pa/
-share/locale/pa/LC_MESSAGES/
share/locale/pa/LC_MESSAGES/grep.mo
share/locale/pl/LC_MESSAGES/grep.mo
share/locale/pt/LC_MESSAGES/grep.mo
Re: UPDATE: sysutils/ggrep-2.16
Gleydson Soares:
here is an update for ggrep-2.16.
works fine for me @amd64
Okay by me with these further changes:
(gperf isn't used by the build, as far as I can tell.
Remove a no longer relevant comment.)
--- Makefile.orig Fri Jan 3 21:50:49 2014
+++ MakefileFri Jan 3 22:08:10 2014
@@ -13,14 +13,11 @@
PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_GNU:=grep/}
-
-# no .tar.gz available, GNU grep itself requires gcc = 3
EXTRACT_SUFX= .tar.xz
WANTLIB= c pcre
MODULES= devel/gettext
LIB_DEPENDS= devel/pcre
-BUILD_DEPENDS= devel/gperf
CONFIGURE_STYLE=gnu
CONFIGURE_ARGS=--program-prefix=g
--
Christian naddy Weisgerber na...@mips.inka.de
Re: UPDATE: sysutils/ggrep-2.16
On Fri, Jan 3, 2014 at 6:17 PM, Christian Weisgerber na...@mips.inka.de wrote: Gleydson Soares: here is an update for ggrep-2.16. works fine for me @amd64 Okay by me with these further changes: (gperf isn't used by the build, as far as I can tell. Remove a no longer relevant comment.) good catch, committed with these changes. thanks.
Re: UPDATE: fonts/dina-fonts
Il giorno 03/gen/2014 20.04, Tobias Ulmer tobi...@tmux.org ha scritto:
On Thu, Jan 02, 2014 at 06:27:23PM +0100, Rafael Sadowski wrote:
[...]
I've restored @fontdir in PLIST. Regarding the use of do-extract; espie@
wants to get rid of that, and only a few old ports are still allowed to
use it. What do you think of this simpler version?
Any porter wants to give their OK?
This revision looks ok to me.
Ciao,
dcoppa
Index: Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile11 Mar 2013 11:06:05 - 1.3
+++ Makefile3 Jan 2014 18:46:37 -
@@ -1,32 +1,42 @@
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
-COMMENT = monospace bitmap font, primarily aimed at
programmers
+COMMENT = monospace bitmap font, primarily aimed at programmers
-V =2.89
-PKGNAME = dina-fonts-$V
-DISTNAME = dina-pcf-$V
-CATEGORIES = fonts
+DISTNAME = dina-fonts-2.92
+CATEGORIES = fonts
-HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
+HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
-MAINTAINER = Rafael Sadowski raf...@sizeofvoid.org
+MAINTAINER = Rafael Sadowski raf...@sizeofvoid.org
-# FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
-NO_BUILD = Yes
-NO_TEST = Yes
+NO_BUILD = Yes
+NO_TEST = Yes
USE_X11 = Yes
FONTDIR= ${PREFIX}/lib/X11/fonts/dina
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIR}/BDF
do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf
${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf
${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf
${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf
${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf
${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium6.pcf ${WRKSRC}/Dina_r400-6.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
${GZIP_CMD} ${WRKSRC}/*.pcf
${X11BASE}/bin/mkfontdir ${WRKSRC}
egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
@@ -34,5 +44,8 @@ do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
+ ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
+
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo7 Dec 2011 09:27:16 - 1.1.1.1
+++ distinfo3 Jan 2014 18:46:37 -
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) =
KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (dina-fonts-2.92.zip) =
H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (dina-fonts-2.92.zip) = 68023
Index: pkg/PLIST
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Dec 2011 09:27:16 - 1.1.1.1
+++ pkg/PLIST 3 Jan 2014 18:46:37 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:27:16 jasper Exp $
+@comment $OpenBSD$
lib/X11/fonts/
@fontdir lib/X11/fonts/dina/
lib/X11/fonts/dina/DinaBold10.pcf.gz
@@ -11,6 +11,9 @@ lib/X11/fonts/dina/DinaItalic10.pcf.gz
lib/X11/fonts/dina/DinaItalic8.pcf.gz
lib/X11/fonts/dina/DinaItalic9.pcf.gz
lib/X11/fonts/dina/DinaMedium10.pcf.gz
+lib/X11/fonts/dina/DinaMedium6.pcf.gz
Re: UPDATE: fonts/dina-fonts
On Fri, Jan 03, 2014 at 08:03:32PM +0100, Tobias Ulmer wrote:
On Thu, Jan 02, 2014 at 06:27:23PM +0100, Rafael Sadowski wrote:
[...]
I've restored @fontdir in PLIST. Regarding the use of do-extract; espie@
wants to get rid of that, and only a few old ports are still allowed to
use it. What do you think of this simpler version?
Any porter wants to give their OK?
Index: Makefile
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 11 Mar 2013 11:06:05 - 1.3
+++ Makefile 3 Jan 2014 18:46:37 -
@@ -1,32 +1,42 @@
# $OpenBSD: Makefile,v 1.3 2013/03/11 11:06:05 espie Exp $
-COMMENT =monospace bitmap font, primarily aimed at programmers
+COMMENT =monospace bitmap font, primarily aimed at programmers
-V = 2.89
-PKGNAME =dina-fonts-$V
-DISTNAME = dina-pcf-$V
-CATEGORIES = fonts
+DISTNAME = dina-fonts-2.92
+CATEGORIES = fonts
-HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
+HOMEPAGE = http://www.donationcoder.com/Software/Jibz/Dina/
-MAINTAINER = Rafael Sadowski raf...@sizeofvoid.org
+MAINTAINER = Rafael Sadowski raf...@sizeofvoid.org
-# FREE (c) Jorgen Ibsen (Though no license included in distribution)
-PERMIT_PACKAGE_CDROM = No
-PERMIT_PACKAGE_FTP = No
-PERMIT_DISTFILES_FTP = No
+# MIT
+PERMIT_PACKAGE_CDROM = Yes
-MASTER_SITES = http://ftp.fi.debian.org/gentoo/distfiles/
+EXTRACT_SUFX = .zip
+MASTER_SITES = http://sizeofvoid.org/pub/OpenBSD/distfiles/
-NO_BUILD = Yes
-NO_TEST =Yes
+NO_BUILD = Yes
+NO_TEST =Yes
USE_X11 =Yes
FONTDIR= ${PREFIX}/lib/X11/fonts/dina
-WRKSRC = ${WRKDIR}/Dina-PCF
+WRKSRC = ${WRKDIR}/BDF
do-install:
+ bdftopcf -t -o ${WRKSRC}/DinaItalic10.pcf ${WRKSRC}/Dina_i400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic8.pcf ${WRKSRC}/Dina_i400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaItalic9.pcf ${WRKSRC}/Dina_i400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic10.pcf ${WRKSRC}/Dina_i700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic8.pcf ${WRKSRC}/Dina_i700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBoldItalic9.pcf ${WRKSRC}/Dina_i700-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium10.pcf ${WRKSRC}/Dina_r400-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium8.pcf ${WRKSRC}/Dina_r400-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium9.pcf ${WRKSRC}/Dina_r400-9.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaMedium6.pcf ${WRKSRC}/Dina_r400-6.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold10.pcf ${WRKSRC}/Dina_r700-10.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold8.pcf ${WRKSRC}/Dina_r700-8.bdf
+ bdftopcf -t -o ${WRKSRC}/DinaBold9.pcf ${WRKSRC}/Dina_r700-9.bdf
${GZIP_CMD} ${WRKSRC}/*.pcf
${X11BASE}/bin/mkfontdir ${WRKSRC}
egrep '\.pcf\.gz' ${WRKSRC}/fonts.dir | \
@@ -34,5 +44,8 @@ do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
+ ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
+
Is that part really usefull?
.include bsd.port.mk
Index: distinfo
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 7 Dec 2011 09:27:16 - 1.1.1.1
+++ distinfo 3 Jan 2014 18:46:37 -
@@ -1,5 +1,2 @@
-MD5 (dina-pcf-2.89.tar.gz) = 1sQlwAeppXa0u4jIjPVwdg==
-RMD160 (dina-pcf-2.89.tar.gz) = bQLzN2RIzzKstI5LpGS3Pmc3Ek8=
-SHA1 (dina-pcf-2.89.tar.gz) = dw8YqDJJCiLMjKWfCS7EAe72uEA=
-SHA256 (dina-pcf-2.89.tar.gz) = KYnGi8Tm8xQ1/nwnMNluZO8xlLEiNl8p+vBsS6xwGaY=
-SIZE (dina-pcf-2.89.tar.gz) = 36442
+SHA256 (dina-fonts-2.92.zip) = H1G7pT91pk0ti9A36OD4S2+AZOUKcu6VQDO+3hc1CM8=
+SIZE (dina-fonts-2.92.zip) = 68023
Index: pkg/PLIST
===
RCS file: /home/vcs/cvs/openbsd/ports/fonts/dina-fonts/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- pkg/PLIST 7 Dec 2011 09:27:16 - 1.1.1.1
+++ pkg/PLIST 3 Jan 2014 18:46:37 -
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2011/12/07 09:27:16 jasper Exp $
+@comment $OpenBSD$
lib/X11/fonts/
@fontdir lib/X11/fonts/dina/
lib/X11/fonts/dina/DinaBold10.pcf.gz
@@ -11,6 +11,9 @@ lib/X11/fonts/dina/DinaItalic10.pcf.gz
lib/X11/fonts/dina/DinaItalic8.pcf.gz
lib/X11/fonts/dina/DinaItalic9.pcf.gz
lib/X11/fonts/dina/DinaMedium10.pcf.gz
+lib/X11/fonts/dina/DinaMedium6.pcf.gz
lib/X11/fonts/dina/DinaMedium8.pcf.gz
Re: UPDATE: fonts/dina-fonts
On Fri, Jan 03, 2014 at 11:52:42PM +0100, Antoine Jacoutot wrote:
@@ -34,5 +44,8 @@ do-install:
${INSTALL_DATA_DIR} ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/*.pcf.gz ${FONTDIR}
${INSTALL_DATA} ${WRKSRC}/fonts.alias ${FONTDIR}/fonts.alias-dina
+ ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dina-fonts
+ ${INSTALL_DATA} ${WRKDIR}/LICENSE ${PREFIX}/share/doc/dina-fonts
+
Is that part really usefull?
Maybe if you want to embed the font into something and need to check its
license. I guess we do this in a number of fonts mainly out of
compliance. It's usually requested that the license is kept with the
font files.
Should we drop this?
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
