CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/08 02:42:14 Modified files: x11/gnome/gdm : Makefile x11/gnome/gdm/pkg: PLIST Added files: x11/gnome/gdm/files: locale.conf Removed files: x11/gnome/gdm/files: i18n Log message: i18n - locale.conf to match upstream.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/08 03:09:29 Modified files: meta/gnome : Makefile meta/gnome/pkg : README-main Log message: Make it clear running GNOME without GDM is not recommended. Add a small note about how to change the greeter default language.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/08 03:08:53 Modified files: x11/gnome/gdm : Makefile x11/gnome/gdm/files: locale.conf Log message: setlocale(3) does not handle LANG so use LC_MESSAGES.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 03:23:13 Modified files: editors/vim: Makefile distinfo editors/vim/patches: patch-runtime_filetype_vim patch-src_option_c Removed files: editors/vim/patches: patch-src_auto_configure Log message: update to vim 7.4.135, and remove a patch to configure which is no longer needed. ok aja@ rpe@ also tested by brett@. gsoares had a problem with no_x11 but I can't see why and can't reproduce it, let me know if anyone else sees this.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/08 03:37:25 Modified files: x11/gnome/gdm : Makefile x11/gnome/gdm/files: locale.conf meta/gnome/pkg : README-main Log message: Tweaks.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 04:54:12 Modified files: lang/gprolog : Makefile distinfo Added files: lang/gprolog/patches: patch-EnginePl_machine_h Log message: Fix segfault during build with PIE-by-default on i386 by not using %ebx there. Not quite sure why this is needed as it looks to be built without PIE anyway, so XXX comment added to patch, but this makes things work. N.B. regression tests fail, error: objects are initialised from 1st to last (should be from last to 1st) - undefine constant OBJ_CHAIN_REVERSE_ORDER in obj_chain.h but this is not new and they also fail on amd64. Regen distinfo while there.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 07:01:10 Modified files: games/eduke32 : Makefile Log message: disable PIE on i386 for this port, it leaves insufficient registers for the asm
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/08 07:07:48 Modified files: x11/gnome/gdm : Makefile x11/gnome/gdm/files: locale.conf x11/gnome/gdm/patches: patch-data_Xsession_in Log message: LC_CTYPE is needed by the time/date applet. Do not start an ssh-agent(1) if we are running gnome-session since gnome keyring already provides SSH agent functionnality.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 07:56:49 Modified files: emulators/mupen64plus/core: Makefile Log message: build mupen64plus-core with ports gcc on i386; code taken when PIE is used doesn't work with the old gcc 4.2 in base. (N.B. may also have a problem when ports gcc switches, but we can cross that bridge later).
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 08:41:49 ports/emulators/xnp2/patches Update of /cvs/ports/emulators/xnp2/patches In directory cvs.openbsd.org:/tmp/cvs-serv22306/patches Log Message: Directory /cvs/ports/emulators/xnp2/patches added to the repository
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 08:43:41 Modified files: emulators/xnp2 : Makefile Added files: emulators/xnp2/patches: patch-x11_soundmng_c Log message: disable some asm on i386, which clobbers registers used by PIE
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/08 11:13:56 Modified files: print/cups : Makefile distinfo print/cups/patches: patch-backend_ipp_c patch-scheduler_ipp_c patch-test_run-stp-tests_sh Removed files: print/cups/patches: patch-scheduler_log_c Log message: Update to cups-1.7.1.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ajacou...@cvs.openbsd.org 2014/01/08 11:12:38 Modified files: x11/gnome/seahorse: Makefile distinfo Log message: Update to seahorse-3.10.2.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: giova...@cvs.openbsd.org2014/01/08 11:26:01 Modified files: graphics/gimp/stable: Makefile Added files: graphics/gimp/stable/patches: patch-app_widgets_gimptextstyleeditor_c Log message: Backport fix for bug 694417, gimp segfaults after changing color of text blocks https://bugzilla.gnome.org/show_bug.cgi?id=694417 spotted by william.os4y
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jer...@cvs.openbsd.org 2014/01/08 11:31:03 Modified files: lang/ruby : Makefile.inc lang/ruby/2.1 : Makefile Log message: Update MASTER_SITES for ruby, as the previous locations no longer work.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/01/08 12:53:21 Removed files: www/sogo/patches: patch-SoObjects_SOGo_GNUmakefile_preamble Log message: Remove a patch which has no relevance for OpenBSD. ok sebastia@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/01/08 13:02:22 Removed files: www/sogo/patches: patch-SOPE_GDLContentStore_EOQualifier+GCS_m patch-SOPE_GDLContentStore_GCSFolder_m patch-UI_MailPartViewers_UIxMailPartViewer_m Log message: Remove some 0 byte patches that should have been removed with the last update.
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: b...@cvs.openbsd.org2014/01/08 13:28:54 Modified files: www/sogo : Makefile Added files: www/sogo/patches: gcc-patch-SoObjects_Appointments_GNUmakefile Removed files: www/sogo/patches: patch-SoObjects_Appointments_GNUmakefile Log message: Move this patch so it will only be applied on PowerPC since the command line parameter being added in the patch has no relevance for LLVM. ok sebastia@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: ki...@cvs.openbsd.org 2014/01/08 13:46:18 Modified files: sysutils/apcupsd: Makefile distinfo sysutils/apcupsd/pkg: PLIST-cgi PLIST-main Added files: sysutils/apcupsd/pkg: README-cgi README-main Removed files: sysutils/apcupsd/pkg: MESSAGE-cgi MESSAGE-main Log message: - split -main and -cgi packages (move apropriate configs to -cgi package) - switch from MESSAGEs to READMEs - update my e-mail - regen distinfo while here with the input from espie@ and sthen@ OK sthen@
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 15:01:36 Modified files: security/sslsplit: Makefile security/sslsplit/pkg: PLIST Log message: missing @newgroup
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: st...@cvs.openbsd.org 2014/01/08 17:37:45 Modified files: cad/openscad : Makefile distinfo cad/openscad/pkg: PLIST Log message: update to OpenSCAD 2013.06, mostly from Fred Crowson, plus regen PLIST as there are new files
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2014/01/08 19:22:09 Log message: OK jca@ sthen@ Comment: creates DjVu files from PDF files Description: pdf2djvu creates DjVu files from PDF files. It's able to extract: - graphics, - text layer, - hyperlinks, - document outline (bookmarks), - metadata (including XMP metadata). WWW: http://jwilk.net/software/pdf2djvu Status: Vendor Tag: juanfra Release Tags: juanfra_2014-01-09 N ports/graphics/pdf2djvu/Makefile N ports/graphics/pdf2djvu/distinfo N ports/graphics/pdf2djvu/patches/patch-tools_xml2c N ports/graphics/pdf2djvu/pkg/DESCR N ports/graphics/pdf2djvu/pkg/PLIST No conflicts created by this import
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: juan...@cvs.openbsd.org 2014/01/08 19:26:03 Modified files: graphics : Makefile Log message: + pdf2djvu
CVS: cvs.openbsd.org: ports
CVSROOT:/cvs Module name:ports Changes by: jas...@cvs.openbsd.org 2014/01/09 00:45:48 Modified files: sysutils/ruby-facter/patches: patch-lib_facter_ssh_rb Log message: pushed upstream
Re: [UPDATE/NEW] textproc/p5-Mojolicious-Plugin-TtRenderer
On 2014/01/08 00:28, Remi Locherer wrote: This is the successor to p5-MojoX-Renderer-TT (which is not on cpan anymore). Code written for p5-MojoX-Renderer-TT might not work correct with p5-Mojolicious-Plugin-TtRenderer. But p5-MojoX-Renderer-TT will not work with an updated p5-Mojolicious. To make the transission from p5-MojoX-Renderer-TT to p5-Mojolicious-Plugin-TtRenderer a quirks entry is necessary. I tried it with the following diff applied to devel/quirks but it looks like I'm doing something wrong. I'm running this with the snapshot from Jan 2. remi@mistral:..md64/all% sudo PKG_PATH=/usr/ports/packages/amd64/all pkg_add -vu p5-MojoX-Renderer-TT Update candidates: quirks-1.106 - quirks-1.106 (ok) Skipping p5-Mojolicious-Plugin-TtRenderer-1.50 (update candidate for p5-MojoX-Renderer-TT-1.13) p5-MojoX-Renderer-TT-1.13 pkgpaths: textproc/p5-MojoX-Renderer-TT p5-Mojolicious-Plugin-TtRenderer-1.50 pkgpaths: textproc/p5-Mojolicious-Plugin-TtRenderer remi@mistral:..md64/all% This one's easy: you need to add an @pkgpath annotation in p5-Mojolicious-Plugin-TtRenderer/pkg/PLIST.
Re: UPDATE: MPlayer 20140106
Hi Brad,
I have installed your update and will be testing it over the next few
days. In the meantime some comments.
On Mon, Jan 06, 2014 at 07:52:23PM -0500, Brad Smith wrote:
Here is an update to MPlayer 20140106.
Any and all testing welcome.
@@ -76,14 +75,17 @@ CONFDIR = ${SYSCONFDIR}/mplayer
.if ${MACHINE_ARCH:Marm}
# uses ARM EABI
-MPLAYER_ARCH=generic
+MPLAYER_ARCH = generic
.else
-MPLAYER_ARCH=${MACHINE_ARCH}
+MPLAYER_ARCH = ${MACHINE_ARCH}
.endif
This is a small nit, but it helps if formatting changes come as separate
diffs. This allows me to see easier what is a functional change and what
is a formatting tweak.
@@ -96,7 +98,7 @@ CONFIGURE_ARGS += --target=${MPLAYER_AR
--confdir=${CONFDIR} \
--mandir=${LOCALBASE}/man \
--extra-cflags=-I${LOCALBASE}/include \
- --extra-ldflags=-L${LOCALBASE}/lib \
+ --extra-ldflags=-L${LOCALBASE}/lib -ffast-math \
--extra-libs-mplayer=-lrtunes -lcrypto
That seems fishy. -ffast-math is not a linker flag. It just defines
__FAST_MATH__. Perhaps it is not needed?
# CONFIGURE_ARGS that disable internal stuff
@@ -146,7 +148,8 @@ CONFIGURE_ARGS += --disable-smb \
--disable-faac-lavc \
--disable-faad \
--disable-theora \
- --disable-pulse
+ --disable-pulse \
+ --disable-relocatable
Do we do this because PIE is default on OpenBSD?
-@@ -523,6 +523,7 @@ Audio output:
- --disable-nas disable NAS audio output [autodetect]
- --disable-sgiaudio disable SGI audio output [autodetect]
- --disable-sunaudio disable Sun audio output [autodetect]
-+ --disable-sndiodisable OpenBSD sndio audio output [autodetect]
- --disable-kai disable KAI audio output [autodetect]
- --disable-dart disable DART audio output [autodetect]
- --disable-win32waveout disable Windows waveout audio output [autodetect]
Nice that the sndio backend is finally upstream.
--
Best Regards
Edd Barrett
http://www.theunixzoo.co.uk
any GRUB users about?
GRUB is currently broken by the change to PIE by default on i386.
(it is currently only built on i386; in theory building on amd64
should also be possible but it's more complicated than, say,
memtest86+).
Is there anyone using it from OpenBSD ports/packages who can test
this diff on i386 -current?
Index: Makefile
===
RCS file: /cvs/ports/sysutils/grub/Makefile,v
retrieving revision 1.10
diff -u -p -r1.10 Makefile
--- Makefile9 Nov 2013 23:19:03 - 1.10
+++ Makefile7 Jan 2014 14:35:58 -
@@ -12,6 +12,7 @@ HOMEPAGE= https://www.gnu.org/software/g
# GPL
PERMIT_PACKAGE_CDROM= Yes
+
WANTLIB= c ncurses util
MASTER_SITES= ftp://alpha.gnu.org/gnu/grub/ \
@@ -21,7 +22,7 @@ MASTER_SITES= ftp://alpha.gnu.org/gnu/gr
CONFIGURE_STYLE=gnu
USE_GROFF =Yes
-CFLAGS=-ftrampolines -fno-stack-protector
+CFLAGS=-ftrampolines -fno-stack-protector -fno-pie -nopie
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/grub
Index: distinfo
===
RCS file: /cvs/ports/sysutils/grub/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo13 Apr 2007 08:29:17 - 1.1.1.1
+++ distinfo7 Jan 2014 14:36:01 -
@@ -1,5 +1,2 @@
-MD5 (grub-0.97.tar.gz) = zT8+tURGvmADFWFY1R9IhA==
-RMD160 (grub-0.97.tar.gz) = f7VnTt8MlQvTjpT4X/HikJqnQfA=
-SHA1 (grub-0.97.tar.gz) = JYBibEV5vZkzbTr0SCw0bJXaxPs=
SHA256 (grub-0.97.tar.gz) = Th0V0S29PpIIER1rgGrVqYV8qIUMR4d9NldbkEVZJgs=
SIZE (grub-0.97.tar.gz) = 971783
[UPDATE] security/libssh (and new port devel/cmocka)
Hi,
this is the diff to update libssh to latest release 0.6.0.
It needs the new port devel/cmocka also attached, for regress tests.
Are you ok?
Cheers,
Remi.
cmocka-0.3.2.tar.gz
Description: GNU Zip compressed data
Index: Makefile
===
RCS file: /cvs/ports/security/libssh/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 9 Aug 2013 19:26:56 - 1.9
+++ Makefile 8 Jan 2014 13:01:39 -
@@ -2,15 +2,17 @@
COMMENT = C library implementing server and client side
# XXX if updating, check the number in the MASTER_SITES path
-DISTNAME = libssh-0.5.5
+DISTNAME = libssh-0.6.0
-SHARED_LIBS += ssh 0.0 # 4.2
-SHARED_LIBS += ssh_threads 0.0 # 4.2
+EXTRACT_SUFX = .tar.xz
+
+SHARED_LIBS += ssh 1.0 # 4.3
+SHARED_LIBS += ssh_threads 1.0 # 4.3
CATEGORIES = security devel
HOMEPAGE = http://www.libssh.org/
-MASTER_SITES = https://red.libssh.org/attachments/download/51/
+MASTER_SITES = https://red.libssh.org/attachments/download/71/
MAINTAINER = Remi Pointel rpoin...@openbsd.org
@@ -23,7 +25,8 @@ MODULES = devel/cmake
WRKBUILD = ${WRKDIST}/build/
-BUILD_DEPENDS = devel/cmockery
+BUILD_DEPENDS = devel/cmocka \
+ devel/argp-standalone
CONFIGURE_ARGS += -DWITH_TESTING=ON
Index: distinfo
===
RCS file: /cvs/ports/security/libssh/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- distinfo 9 Aug 2013 19:14:50 - 1.6
+++ distinfo 8 Jan 2014 13:01:39 -
@@ -1,2 +1,2 @@
-SHA256 (libssh-0.5.5.tar.gz) = wN8PBfyBLb4m/UEYvsB3aqnoksBxlZDzlxEwSJxrjp0=
-SIZE (libssh-0.5.5.tar.gz) = 321583
+SHA256 (libssh-0.6.0.tar.xz) = TG3nyqI9675GOfg/ov9BGSRkPmU1bWrwSNqjHkoaL3E=
+SIZE (libssh-0.6.0.tar.xz) = 275664
Index: patches/patch-cmake_Modules_DefineCompilerFlags_cmake
===
RCS file: /cvs/ports/security/libssh/patches/patch-cmake_Modules_DefineCompilerFlags_cmake,v
retrieving revision 1.2
diff -u -p -r1.2 patch-cmake_Modules_DefineCompilerFlags_cmake
--- patches/patch-cmake_Modules_DefineCompilerFlags_cmake 2 Nov 2013 10:43:04 - 1.2
+++ patches/patch-cmake_Modules_DefineCompilerFlags_cmake 8 Jan 2014 13:01:39 -
@@ -2,10 +2,10 @@ $OpenBSD: patch-cmake_Modules_DefineComp
Check for compiler flags not available with gcc 4.
cmake/Modules/DefineCompilerFlags.cmake.orig Fri Jul 26 08:39:39 2013
-+++ cmake/Modules/DefineCompilerFlags.cmake Sat Nov 2 11:37:07 2013
-@@ -10,9 +10,14 @@ if (UNIX AND NOT WIN32)
- if (${CMAKE_C_COMPILER_ID} MATCHES GNU)
+--- cmake/Modules/DefineCompilerFlags.cmake.orig Sat Dec 21 18:37:12 2013
cmake/Modules/DefineCompilerFlags.cmake Wed Jan 8 14:00:39 2014
+@@ -11,9 +11,14 @@ if (UNIX AND NOT WIN32)
+
# add -Wconversion ?
set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -std=gnu99 -pedantic -pedantic-errors)
-set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wall -Wextra -Wshadow -Wmissing-prototypes -Wdeclaration-after-statement)
Index: patches/patch-src_channels_c
===
RCS file: patches/patch-src_channels_c
diff -N patches/patch-src_channels_c
--- patches/patch-src_channels_c 2 Nov 2013 10:43:04 - 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,30 +0,0 @@
-$OpenBSD: patch-src_channels_c,v 1.4 2013/11/02 10:43:04 ajacoutot Exp $
src/channels.c.orig Fri Jul 26 08:42:26 2013
-+++ src/channels.c Sat Nov 2 11:36:51 2013
-@@ -683,21 +683,21 @@ SSH_PACKET_CALLBACK(channel_rcv_request) {
- }
-
- if (strcmp(request,signal) == 0) {
-- ssh_string signal;
-+ ssh_string libssh_signal;
- char *sig;
-
- SAFE_FREE(request);
- ssh_log(session, SSH_LOG_PACKET, received signal);
-
-- signal = buffer_get_ssh_string(packet);
-- if (signal == NULL) {
-+ libssh_signal = buffer_get_ssh_string(packet);
-+ if (libssh_signal == NULL) {
- ssh_log(session, SSH_LOG_PACKET, Invalid MSG_CHANNEL_REQUEST);
- leave_function();
- return SSH_PACKET_USED;
- }
-
-- sig = ssh_string_to_char(signal);
-- ssh_string_free(signal);
-+ sig = ssh_string_to_char(libssh_signal);
-+ ssh_string_free(libssh_signal);
- if (sig == NULL) {
- leave_function();
- return SSH_PACKET_USED;
Index: pkg/PLIST
===
RCS file: /cvs/ports/security/libssh/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST 9 Aug 2013 19:14:50 - 1.3
+++ pkg/PLIST 8 Jan 2014 13:01:39 -
@@ -6,6 +6,9 @@ include/libssh/libssh.h
include/libssh/server.h
include/libssh/sftp.h
include/libssh/ssh2.h
+lib/cmake/
+lib/cmake/libssh-config-version.cmake
+lib/cmake/libssh-config.cmake
lib/libssh.a
@lib lib/libssh.so.${LIBssh_VERSION}
lib/libssh_threads.a
Re: [UPDATE/NEW] textproc/p5-Mojolicious-Plugin-TtRenderer
On Wed, Jan 08, 2014 at 10:38:51AM +, Stuart Henderson wrote:
On 2014/01/08 00:28, Remi Locherer wrote:
This is the successor to p5-MojoX-Renderer-TT (which is not on cpan
anymore). Code written for p5-MojoX-Renderer-TT might not work correct
with p5-Mojolicious-Plugin-TtRenderer. But p5-MojoX-Renderer-TT will
not work with an updated p5-Mojolicious.
To make the transission from p5-MojoX-Renderer-TT to
p5-Mojolicious-Plugin-TtRenderer a quirks entry is necessary. I tried it
with the following diff applied to devel/quirks but it looks like I'm doing
something wrong. I'm running this with the snapshot from Jan 2.
remi@mistral:..md64/all% sudo PKG_PATH=/usr/ports/packages/amd64/all
pkg_add -vu p5-MojoX-Renderer-TT
Update candidates: quirks-1.106 - quirks-1.106 (ok)
Skipping p5-Mojolicious-Plugin-TtRenderer-1.50 (update candidate for
p5-MojoX-Renderer-TT-1.13)
p5-MojoX-Renderer-TT-1.13 pkgpaths: textproc/p5-MojoX-Renderer-TT
p5-Mojolicious-Plugin-TtRenderer-1.50 pkgpaths:
textproc/p5-Mojolicious-Plugin-TtRenderer
remi@mistral:..md64/all%
This one's easy: you need to add an @pkgpath annotation in
p5-Mojolicious-Plugin-TtRenderer/pkg/PLIST.
Yes, this did the trick. New tar.gz attached and again the diff for
devel/quirks.
cvs diff: Diffing .
Index: Makefile
===
RCS file: /cvs/ports/devel/quirks/Makefile,v
retrieving revision 1.109
diff -u -p -r1.109 Makefile
--- Makefile7 Jan 2014 15:06:38 - 1.109
+++ Makefile8 Jan 2014 13:24:03 -
@@ -5,7 +5,7 @@ CATEGORIES =devel databases
DISTFILES =
# API.rev
-PKGNAME = quirks-1.106
+PKGNAME = quirks-1.107
PKG_ARCH = *
MAINTAINER = Marc Espie es...@openbsd.org
cvs diff: Diffing files
Index: files/Quirks.pm
===
RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
retrieving revision 1.116
diff -u -p -r1.116 Quirks.pm
--- files/Quirks.pm 7 Jan 2014 15:06:38 - 1.116
+++ files/Quirks.pm 8 Jan 2014 13:25:51 -
@@ -330,6 +330,7 @@ my $stem_extensions = {
'wcb' ='tklib',
'foomatic-filters' ='cups-filters',
'faad-xmms' = 'xmms-faad',
+ 'p5-MojoX-Renderer-TT' = 'p5-Mojolicious-Plugin-TtRenderer',
};
# reasons for obsolete packages
cvs diff: Diffing files/Quirks
cvs diff: Diffing pkg
p5-Mojolicious-Plugin-TtRenderer-1.50.tar.gz
Description: application/tar-gz
unbreak emulators/dosbox on i386
Broken by PIE on i386, register clobbered by asm. We could disable PIE,
but there is alternative asm for MacOSX which avoids using this register
too, so the diff below switches to using this.
dosbox now builds again on i386 and works in very light testing but that
involves X forwarding over WAN links so I can't do any kind of detailed
test.. Can anyone test further? OK?
Index: Makefile
===
RCS file: /cvs/ports/emulators/dosbox/Makefile,v
retrieving revision 1.27
diff -u -p -r1.27 Makefile
--- Makefile4 Jun 2013 18:41:41 - 1.27
+++ Makefile8 Jan 2014 14:35:06 -
@@ -6,7 +6,7 @@ COMMENT=x86 with DOS emulator targeted
BROKEN-hppa = mpu401.cpp:42: error: expected identifier before numeric
constant
DISTNAME= dosbox-0.74
-REVISION= 3
+REVISION= 4
CATEGORIES=games x11 emulators
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dosbox/}
Index: patches/patch-src_cpu_core_dyn_x86_risc_x86_h
===
RCS file: patches/patch-src_cpu_core_dyn_x86_risc_x86_h
diff -N patches/patch-src_cpu_core_dyn_x86_risc_x86_h
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-src_cpu_core_dyn_x86_risc_x86_h 8 Jan 2014 14:35:06
-
@@ -0,0 +1,75 @@
+$OpenBSD$
+--- src/cpu/core_dyn_x86/risc_x86.h.orig Mon May 10 11:43:54 2010
src/cpu/core_dyn_x86/risc_x86.hWed Jan 8 07:34:42 2014
+@@ -112,7 +112,7 @@ return_address:
+ pop ebx
+ mov [retval],eax
+ }
+-#elif defined (MACOSX)
++#elif defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ register Bit32u tempflags=reg_flags FMASK_TEST;
+ __asm__ volatile (
+ pushl %%ebx\n
+@@ -752,7 +752,7 @@ static void gen_call_function(void * func,char const*
+ if (ops) {
+ va_list params;
+ va_start(params,ops);
+-#if defined (MACOSX)
++#if defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ Bitu stack_used=0;
+ bool free_flags=false;
+ #endif
+@@ -761,7 +761,7 @@ static void gen_call_function(void * func,char const*
+ if (*ops=='%') {
+ pinfo[pindex].line=ops+1;
+ pinfo[pindex].value=va_arg(params,Bitu);
+-#if defined (MACOSX)
++#if defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ const char * scan=pinfo[pindex].line;
+ if ((*scan=='I') || (*scan=='D')) stack_used+=4;
+ else if (*scan=='F') free_flags=true;
+@@ -771,7 +771,7 @@ static void gen_call_function(void * func,char const*
+ ops++;
+ }
+
+-#if defined (MACOSX)
++#if defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ /* align stack */
+ stack_used+=4; // saving esp on stack as well
+
+@@ -846,7 +846,7 @@ static void gen_call_function(void * func,char const*
+ IllegalOption(gen_call_function unknown
param);
+ }
+ }
+-#if defined (MACOSX)
++#if defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ if (free_flags) release_flags=false;
+ } else {
+ /* align stack */
+@@ -903,7 +903,7 @@ static void gen_call_function(void * func,char const*
+ /* Restore EAX registers to be used again */
+ x86gen.regs[X86_REG_EAX]-notusable=false;
+
+-#if defined (MACOSX)
++#if defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ /* restore stack */
+ cache_addb(0x5c); // pop esp
+ #endif
+@@ -915,7 +915,7 @@ static void gen_call_write(DynReg * dr,Bit32u val,Bitu
+ x86gen.regs[X86_REG_EAX]-notusable=true;
+ gen_protectflags();
+
+-#if defined (MACOSX)
++#if defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ /* align stack */
+ Bitu stack_used=12;
+
+@@ -952,7 +952,7 @@ static void gen_call_write(DynReg * dr,Bit32u val,Bitu
+ x86gen.regs[X86_REG_EAX]-notusable=false;
+ gen_releasereg(dr);
+
+-#if defined (MACOSX)
++#if defined (MACOSX) || (defined (__OpenBSD__) defined(__i386__))
+ /* restore stack */
+ cache_addb(0x5c); // pop esp
+ #endif
Re: Update: mail/greyscanner to version 2.00
On Jan 07 17:06:52, skin...@britvault.co.uk wrote:
If DNS_SOCK_MAX is defined in the config,
greyscanner checks that the domain part of every sender
has an A and an MX record, and blacklists everything else.
That itself is surely a good thing, but:
(2) I am getting a lot of false negatives, such as
Jan 6 01:15:53 www greyscanner[10017]: Trapped 115.67.162.38: Mailed from
sender google.com with no MX or A
Needless to say, there is an MX and an A for google.com.
The fact that 115.67.162.38 itself does not have an A
and is not actually google's outgoing SMTP server does
not come into it: this is not checked in greyscanner.
Here's a sample of greyscanner trapped no MX lines from my logs
(most of it looks spamish, others not so.):
for line in $(fgrep greyscanner /var/log/maillog | awk '/ MX / { print $7$11
}'); do print -n $line\nPTR: ; dig -x $(print $line | cut -d: -f1) +short;
print; done
173.85.227.74:jaytronautomation.com
PTR:
37.6.249.99:hol.gr
PTR: adsl-99.37.6.249.tellas.gr.
50.193.227.41:gmail.com
PTR: 50-193-227-41-static.hfc.comcastbusiness.net.
209.85.220.50:gmail.com
PTR: mail-pa0-f50.google.com.
This is what I'm talking about:
there is an MX and A for 'gmail.com',
plus this host resolves there and back,
(and apparently is an outgoing smtp of google.com).
Yet greyscanner blacklists it, with 'no MX or A for gmail.com'.
110.175.80.66:gmail.com
PTR: 110-175-80-66.static.tpgi.com.au.
This is a spammer alright, but still,
there _is_ an MX and A for 'gmail.com',
which is all that greyscanner checks for.
Somehow those DNS lookups must be failing,
but so far I haven't found time to look into Net::DNS
Jan
Re: [UPDATE/NEW] textproc/p5-Mojolicious-Plugin-TtRenderer
On 2014/01/08 14:29, Remi Locherer wrote: Yes, this did the trick. New tar.gz attached and again the diff for devel/quirks. This, and the other related updates, read OK to me, but I'm not in a position to really test them. It would be nice if someone actively using this would be willing to take maintainer btw :)
Re: UPDATE: MPlayer 20140106
On Jan 07 17:53:40, b...@comstyle.com wrote: On 07/01/14 9:14 AM, Jan Stary wrote: On Jan 06 19:52:23, b...@comstyle.com wrote: Here is an update to MPlayer 20140106. This is current/i386: Configuring for mplayer-20140106 Checking for cc version ... 4.2.1 Checking for working compiler ... yes Detected operating system: OpenBSD Detected host architecture: i386 Checking for cross compilation ... no Checking for host cc ... cc Checking for GCC CPU optimization abilities ... i386 Checking for byte order ... little-endian Checking for extern symbol prefix ... Checking for assembler support of -pipe option ... yes Checking for relocatable binary ... no Checking for assembler (as 2.15) ... ok Checking for PIC ... yes Checking for .align is a power of two ... no Checking for ebx availability ... no Checking for yasm ... Error: yasm not found, use --yasm='' if you really want to compile without Check config.log if you do not understand why it failed. *** Error 1 in . (/usr/ports/infrastructure/mk/bsd.port.mk:2648 '/usr/ports/pobj/mplayer-20140106/.configure_done') *** Error 1 in /usr/ports/x11/mplayer (/usr/ports/infrastructure/mk/bsd.port.mk:2404 'all') I do have yasm-1.2.0 installed, which provides /usr/local/bin/yasm It is a build dependency so it has to be there. You left out the most important part which the error message points you towards. Sorry; here goes: Checking for yasm pextrd [eax], xmm0, 1 yasm -f elf -DPIC -o /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp.S Bad system call (core dumped) pextrd [eax], xmm0, 1 yasm -f elf -DPIC -o /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp /usr/ports/pobj/mplayer-20140106/mplayer-20140106/mplayer-configure-9837-31972/tmp.S Bad system call (core dumped) After a pkg_add -ui yasm, it builds fine. Sorry for the noise. Jan
Re: UPDATE: devel/quilt
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
Kent R. Spillner kspill...@acm.org writes:
On Tue, Dec 24, 2013 at 08:11:13AM -0600, Kent R. Spillner wrote:
Here is an updated patch with the portability improvments suggested by jca@.
Actually, after cluebat from Quilt maintainers this diff should be ignored
and my original diff preferred.
When you configure quilt with --with-foo=/path/to/gnu/gfoo Quilt actually
creates a compat/ directory and copies gfoo to compat/foo. Then the quilt
wrapper (bin/quilt.in) adds compat/ to the front of PATH.
So long story short, those uses of sed 's/.../i' are actually portable
because sed is really gsed at run-time. Slightly misleading, but portable.
:)
I did not notice the compat/ symlinks, sorry if you wasted time on this.
OTOH we have a better understanding of how this port works now. O:)
I reviewed all the scripts and did not find any offender but those:
- md5sum in quilt/scripts/inspect
- cp --parents --blabla in quilt/scripts/backup-files
The latter is handled by the script if there's an error, using
a file-by-file copy. Since we depend on coreutils anyway, why not use
gcp?
Another issue is that ${SYSCONFDIR} in Makefile.in wasn't expanded
(using MAKE_FLAGS). Let's use @sysconfdir@ instead so that quilt
properly finds /etc/quilt.quiltrc.
ok?
I intend to commit this tomorrow.
Index: Makefile
===
RCS file: /cvs/ports/devel/quilt/Makefile,v
retrieving revision 1.4
diff -u -p -r1.4 Makefile
--- Makefile 31 Aug 2013 17:22:16 - 1.4
+++ Makefile 30 Dec 2013 17:23:19 -
@@ -2,11 +2,11 @@
COMMENT= manage large numbers of patches
-DISTNAME=quilt-0.60
-REVISION=1
+DISTNAME=quilt-0.61
CATEGORIES= devel
HOMEPAGE=http://savannah.nongnu.org/projects/quilt/
+MAINTAINER= Kent R. Spillner kspill...@acm.org
# GPLv3+
PERMIT_PACKAGE_CDROM=Yes
@@ -33,12 +33,15 @@ RUN_DEPENDS= devel/gpatch \
BUILD_DEPENDS= ${RUN_DEPENDS}
-CONFIGURE_STYLE= gnu
-CONFIGURE_ARGS= --with-date=${LOCALBASE}/bin/gdate \
+CONFIGURE_STYLE= autoconf no-autoheader
+AUTOCONF_VERSION=2.69
+CONFIGURE_ARGS= --with-cp=${LOCALBASE}/bin/gcp \
+ --with-date=${LOCALBASE}/bin/gdate \
--with-diff=${LOCALBASE}/bin/gdiff \
--with-find=${LOCALBASE}/bin/gfind \
--with-getopt=${LOCALBASE}/bin/gnugetopt \
--with-grep=${LOCALBASE}/bin/ggrep \
+ --with-md5sum=${LOCALBASE}/bin/gmd5sum \
--with-patch=${LOCALBASE}/bin/gpatch \
--with-sed=${LOCALBASE}/bin/gsed \
--without-patch-wrapper \
Index: distinfo
===
RCS file: /cvs/ports/devel/quilt/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- distinfo 8 Oct 2012 15:14:25 - 1.1.1.1
+++ distinfo 27 Dec 2013 16:18:36 -
@@ -1,2 +1,2 @@
-SHA256 (quilt-0.60.tar.gz) = PXKikuQyvrmnP50Kz+OnfJtNfkIgmRm7JE6ZWMfP5ks=
-SIZE (quilt-0.60.tar.gz) = 442369
+SHA256 (quilt-0.61.tar.gz) = HuwKJwrE1B7qD9WCNgPJ0qNatrirc6kN2SzhKRsqn8M=
+SIZE (quilt-0.61.tar.gz) = 450552
Index: patches/patch-Makefile_in
===
RCS file: /cvs/ports/devel/quilt/patches/patch-Makefile_in,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 patch-Makefile_in
--- patches/patch-Makefile_in 8 Oct 2012 15:14:25 - 1.1.1.1
+++ patches/patch-Makefile_in 30 Dec 2013 17:41:26 -
@@ -1,12 +1,21 @@
$OpenBSD: patch-Makefile_in,v 1.1.1.1 2012/10/08 15:14:25 rpe Exp $
Makefile.in.orig Sun Sep 2 19:19:00 2012
-+++ Makefile.in Sun Sep 2 19:19:16 2012
+--- Makefile.in.orig Sun Dec 8 10:40:42 2013
Makefile.in Mon Dec 30 18:40:55 2013
@@ -13,7 +13,7 @@ docdir := @docdir@
mandir := @mandir@
localedir :=$(datadir)/locale
emacsdir := $(datadir)/emacs/site-lisp
-etcdir := $(subst /usr/etc,/etc,$(prefix)/etc)
-+etcdir := ${SYSCONFDIR}
++etcdir := @sysconfdir@
INSTALL := @INSTALL@
POD2MAN := @POD2MAN@
+@@ -42,6 +42,8 @@ MSGCAT := @MSGCAT@
+ DIFFSTAT := @DIFFSTAT@
+ RPMBUILD := @RPMBUILD@
+ SENDMAIL := @SENDMAIL@
++CP := @CP@
++MD5SUM := @MD5SUM@
+
+ USE_NLS := @USE_NLS@
+ STAT_HARDLINK := @STAT_HARDLINK@
Index: patches/patch-configure_ac
===
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-configure_ac30 Dec 2013 17:33:48 -
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- configure.ac.origSun Dec 8
Re: irssi include files
Florian Stinglmayr fstinglm...@gmail.com writes:
Hi,
is there any specific reasons you delete the include files from irssi
before installing? Those header files are needed if one wishes to build
irssi plugins like the irssi-otr plugin.
I have attached a patch that does no longer delete those include files
allowing third party plugins for irssi to be compiled.
This makes sense. I intend to commit this tomorrow if no one objects.
Florian: please use diff -u.
Regards,
Florian
Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.56
diff -r1.56 Makefile
8c8
REVISION= 4
---
REVISION=5
54,56d53
post-install:
@rm -rf ${PREFIX}/include
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/irssi/pkg/PLIST,v
retrieving revision 1.18
diff -r1.18 PLIST
2a3,129
include/irssi/
include/irssi/irssi-config.h
include/irssi/irssi-version.h
include/irssi/src/
include/irssi/src/common.h
include/irssi/src/core/
include/irssi/src/core/args.h
include/irssi/src/core/channel-rec.h
include/irssi/src/core/channel-setup-rec.h
include/irssi/src/core/channels-setup.h
include/irssi/src/core/channels.h
include/irssi/src/core/chat-protocols.h
include/irssi/src/core/chatnet-rec.h
include/irssi/src/core/chatnets.h
include/irssi/src/core/commands.h
include/irssi/src/core/core.h
include/irssi/src/core/expandos.h
include/irssi/src/core/ignore.h
include/irssi/src/core/levels.h
include/irssi/src/core/line-split.h
include/irssi/src/core/log.h
include/irssi/src/core/masks.h
include/irssi/src/core/misc.h
include/irssi/src/core/module.h
include/irssi/src/core/modules-load.h
include/irssi/src/core/modules.h
include/irssi/src/core/net-disconnect.h
include/irssi/src/core/net-nonblock.h
include/irssi/src/core/net-sendbuffer.h
include/irssi/src/core/network.h
include/irssi/src/core/nick-rec.h
include/irssi/src/core/nicklist.h
include/irssi/src/core/nickmatch-cache.h
include/irssi/src/core/pidwait.h
include/irssi/src/core/queries.h
include/irssi/src/core/query-rec.h
include/irssi/src/core/rawlog.h
include/irssi/src/core/recode.h
include/irssi/src/core/server-connect-rec.h
include/irssi/src/core/server-rec.h
include/irssi/src/core/server-setup-rec.h
include/irssi/src/core/servers-reconnect.h
include/irssi/src/core/servers-setup.h
include/irssi/src/core/servers.h
include/irssi/src/core/session.h
include/irssi/src/core/settings.h
include/irssi/src/core/signals.h
include/irssi/src/core/special-vars.h
include/irssi/src/core/window-item-def.h
include/irssi/src/core/window-item-rec.h
include/irssi/src/core/write-buffer.h
include/irssi/src/fe-common/
include/irssi/src/fe-common/core/
include/irssi/src/fe-common/core/chat-completion.h
include/irssi/src/fe-common/core/command-history.h
include/irssi/src/fe-common/core/completion.h
include/irssi/src/fe-common/core/fe-channels.h
include/irssi/src/fe-common/core/fe-common-core.h
include/irssi/src/fe-common/core/fe-core-commands.h
include/irssi/src/fe-common/core/fe-exec.h
include/irssi/src/fe-common/core/fe-messages.h
include/irssi/src/fe-common/core/fe-queries.h
include/irssi/src/fe-common/core/fe-recode.h
include/irssi/src/fe-common/core/fe-windows.h
include/irssi/src/fe-common/core/formats.h
include/irssi/src/fe-common/core/hilight-text.h
include/irssi/src/fe-common/core/keyboard.h
include/irssi/src/fe-common/core/module-formats.h
include/irssi/src/fe-common/core/module.h
include/irssi/src/fe-common/core/printtext.h
include/irssi/src/fe-common/core/themes.h
include/irssi/src/fe-common/core/window-activity.h
include/irssi/src/fe-common/core/window-items.h
include/irssi/src/fe-common/core/windows-layout.h
include/irssi/src/fe-common/irc/
include/irssi/src/fe-common/irc/dcc/
include/irssi/src/fe-common/irc/dcc/fe-dcc.h
include/irssi/src/fe-common/irc/dcc/module-formats.h
include/irssi/src/fe-common/irc/dcc/module.h
include/irssi/src/fe-common/irc/fe-irc-server.h
include/irssi/src/fe-common/irc/module-formats.h
include/irssi/src/fe-common/irc/module.h
include/irssi/src/fe-common/irc/notifylist/
include/irssi/src/fe-common/irc/notifylist/module-formats.h
include/irssi/src/fe-common/irc/notifylist/module.h
include/irssi/src/fe-text/
include/irssi/src/fe-text/statusbar-item.h
include/irssi/src/irc/
include/irssi/src/irc/core/
include/irssi/src/irc/core/bans.h
include/irssi/src/irc/core/channel-rejoin.h
include/irssi/src/irc/core/ctcp.h
include/irssi/src/irc/core/irc-channels.h
include/irssi/src/irc/core/irc-chatnets.h
include/irssi/src/irc/core/irc-commands.h
include/irssi/src/irc/core/irc-masks.h
include/irssi/src/irc/core/irc-nicklist.h
include/irssi/src/irc/core/irc-queries.h
include/irssi/src/irc/core/irc-servers-setup.h
include/irssi/src/irc/core/irc-servers.h
include/irssi/src/irc/core/irc.h
Re: i386 bulk build failures
I've fixed/worked-around some more. Failures from the last build: emulators/dosbox - see diff sent earlier sysutils/grub - see diff sent earlier multimedia/avidemux - could probably switch to non asm code, or use no-pie games/openarena - will probably need no-pie or rewriting asm games/megaglest/base - small asm code (cpuid flag checker) directly uses register used by PIE lang/nhc98 - segfaults in build devel/hs-ghc-paths - unhandled ELF relocation devel/hasktags - unhandled ELF relocation (and java is broken, knocking out dependent ports, including libreoffice). On 2014/01/01 21:38, Stuart Henderson wrote: Quick summary of the failures in the last i386 bulk build. Java ports are now broken on i386 as a result of JDK problems. www/chromium,proprietary: 'chrome/common/extensions/api/runtime.h' file not found - this is possibly the missing interdependency that espie just fixed. Following are PIE-related, in some cases use of -fomit-frame-pointer for i386 may help, others will need more. devel/hasktags: unhandled ELF relocation(Rel) type 10, ghc: unable to load package `integer-gmp' devel/hs-ghc-paths: unhandled ELF relocation(Rel) type 10, ghc: unable to load package `integer-gmp' emulators/dosbox: PIC register '%ebx' clobbered in 'asm' emulators/mupen64plus/core: now uses PIC #ifdef in src/r4300/x86/rjump.c:104 which needs newer GCC (about to send diff for this). emulators/openmsx: out of reg's emulators/xnp2: PIC register 'ebx' clobbered in 'asm' games/eduke32: out of reg's games/megaglest/base: out of reg's games/openarena: out of reg's graphics/cqcam: PIC register 'bx' clobbered in 'asm' graphics/rawstudio: out of reg's multimedia/avidemux: out of reg's sysutils/grub: GRUB requires a working absolute objcopy x11/mplayer: out of reg's x11/xdesktopwaves: PIC register 'ebx' clobbered in 'asm' Not sure about cause yet, some may be PIE-related too: lang/gcc/4.8: gcj: fatal error: can't specify '-D' without '--main' lang/gprolog: segfault when running gplc -c --fast-math fd2c.pl lang/nhc98: segfaults in build lang/petite-chez: undefined reference to `__guard' mail/zarafa/zarafa: 'SWIG_From_long' was not declared in this scope textproc/redland-bindings: -php4 is no longer supported. This is with the committed PIE changes only, there is a diff around to enable PIE in ports compilers too, which may expose further problems.
Re: CVS: cvs.openbsd.org: src
Pascal Stumpf pascal.stu...@cubes.de writes:
On Fri, 27 Dec 2013 10:41:30 -0700 (MST), Theo de Raadt wrote:
CVSROOT: /cvs
Module name: src
Changes by: dera...@cvs.openbsd.org 2013/12/27 10:41:30
Modified files:
etc/mtree : 4.4BSD.dist 4.4BSD.root
Log message:
/stand has not been used in decades
ok miod
That needs a small adaption in sysutils/memtest86+. I think just
putting the bootable files in / is ok.
So do I, ok.
Index: Makefile
===
RCS file: /cvs/ports/sysutils/memtest86+/Makefile,v
retrieving revision 1.9
diff -u -p -r1.9 Makefile
--- Makefile 11 Mar 2013 11:41:31 - 1.9
+++ Makefile 27 Dec 2013 18:09:19 -
@@ -7,7 +7,7 @@ COMMENT= thorough, stand alone memory t
VERSION= 4.20
DISTNAME=memtest86+-${VERSION}
CATEGORIES= sysutils
-REVISION=1
+REVISION=2
HOMEPAGE=http://www.memtest.org/
Index: pkg/PLIST
===
RCS file: /cvs/ports/sysutils/memtest86+/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 7 Nov 2010 18:29:54 - 1.2
+++ pkg/PLIST 27 Dec 2013 18:09:19 -
@@ -4,9 +4,9 @@ share/doc/pkg-readmes/${FULLPKGNAME}
share/memtest86+/
share/memtest86+/README
share/memtest86+/memtest
-@sample /stand/memtest
+@sample /memtest
share/memtest86+/memtest-serial
-@sample /stand/memtest-serial
+@sample /memtest-serial
share/memtest86+/memtest-serial.floppy
share/memtest86+/memtest-serial.iso
share/memtest86+/memtest.floppy
Index: pkg/README
===
RCS file: /cvs/ports/sysutils/memtest86+/pkg/README,v
retrieving revision 1.2
diff -u -p -r1.2 README
--- pkg/README2 Jun 2011 13:41:41 - 1.2
+++ pkg/README27 Dec 2013 18:09:19 -
@@ -7,7 +7,7 @@ $RuOBSD: README.OpenBSD,v 1.2 2009/02/07
Using Memtest86+ in OpenBSD environment
-o Reboot the machine and boot Memtest86+ using `boot /stand/memtest' command
+o Reboot the machine and boot Memtest86+ using `boot memtest' command
at the `boot' prompt. You can also boot Memtest86+ from network using
pxeboot(8).
--
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
(previous: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494)
Re: NEW: sysutils/kyua
Alexandr Shadchin alexandr.shadc...@gmail.com writes:
On Wed, Dec 25, 2013 at 08:47:45PM +0400, Sergey Bronnikov wrote:
On 14:24 Tue 24 Dec , Jérémie Courrèges-Anglas wrote:
Alexandr Shadchin alexandr.shadc...@gmail.com writes:
[...]
Now ok for me. Does anyone have objections to import these ports ? or OK
?
Those ports look fine to me too. There are a few minor glitches:
- their build flags use -Wredundant-decls, this makes the build
unreadable and makes it hard to detect real problems. Patching
configure is enough.
- kyua-cli needs a patch for 32 bits archs (attached)
- lutok build fine with lua5.2 but kyua-cli has lua5.1 hardcoded in its
WANTLIB. I don't know what's the way to go, forcing one version of
lua for both ports, or using flavors and MODULES = /lang/lua in
kyua-cli?
- I modified Sergey's patch for kyua-testers so that mounting tmpfs is
supported, and emulated lchmod instead instead of just removing the
call (also attached).
Thanks for review. I have corrected ports according to your comments.
--
jca | PGP: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494
Your kyua-cli is incorrect. I have attached a patch.
It is indeed. However,
diff --git a/devel/kyua-cli/Makefile b/devel/kyua-cli/Makefile
index e22af57..96b5d59 100644
--- a/devel/kyua-cli/Makefile
+++ b/devel/kyua-cli/Makefile
@@ -15,18 +15,25 @@ WANTLIB += atf-c atf-c++ c ${MODLUA_WANTLIB} lutok m
sqlite3 stdc++
MASTER_SITES = https://kyua.googlecode.com/files/
+MODULES =lang/lua
+
BUILD_DEPENDS = ${RUN_DEPENDS}
RUN_DEPENDS =devel/kyua-testers
-LIB_DEPENDS =devel/atf \
- devel/lutok
+LIB_DEPENDS =devel/atf
CONFIGURE_STYLE =gnu
-CONFIGURE_ENV= LUA_CFLAGS=`pkg-config --cflags ${MODLUA_DEP}` \
-LUA_LIBS=`pkg-config --libs ${MODLUA_DEP}`
-
PORTHOME = ${WRKDIR}
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mlua52}
+MODLUA_VERSION = 5.2
+LIB_DEPENDS += devel/lutok,lua52
+.else
+LIB_DEPENDS += devel/lutok
+.endif
+
Setting MODLUA_VERSION doesn't feel right. IIUC lutok and kyua-cli
aren't lua applications. MODLUA_SA = Yes does the right thing here
wrt. the flavor name handling.
.include bsd.port.mk
diff --git a/devel/lutok/Makefile b/devel/lutok/Makefile
index 46112b9..b046589 100644
--- a/devel/lutok/Makefile
+++ b/devel/lutok/Makefile
@@ -29,4 +29,10 @@ CONFIGURE_ENV= LUA_CFLAGS=`pkg-config
--cflags ${MODLUA_DEP}` \
PORTHOME = ${WRKDIR}
+FLAVOR ?=
+
+.if ${FLAVOR:L:Mlua52}
+MODLUA_VERSION = 5.2
+.endif
+
Same here. Maybe also TEST_DEPENDS need to be more specific.
.include bsd.port.mk
Sergey, have you looked at these issues?
--
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
(previous: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494)
Re: irssi include files
On Wed, Jan 08, 2014 at 04:59:03PM +0100, Jérémie Courrèges-Anglas wrote:
Florian: please use diff -u.
Sorry for the noise. Here is an unified diff:
Index: Makefile
===
RCS file: /cvs/ports/net/irssi/Makefile,v
retrieving revision 1.56
diff -u -p -u -r1.56 Makefile
--- Makefile12 Dec 2013 14:10:13 - 1.56
+++ Makefile8 Jan 2014 16:34:59 -
@@ -5,7 +5,7 @@ SHARED_ONLY=Yes
COMMENT= modular IRC client with many features (ipv6,socks,proxy)
DISTNAME= irssi-0.8.15
-REVISION= 4
+REVISION= 5
CATEGORIES=net
HOMEPAGE= http://www.irssi.org/
@@ -51,8 +51,5 @@ FAKE_FLAGS= confdir=${PREFIX}/share/exa
pre-configure:
${SUBST_CMD} ${WRKSRC}/docs/irssi.1
-
-post-install:
- @rm -rf ${PREFIX}/include
.include bsd.port.mk
Index: pkg/PLIST
===
RCS file: /cvs/ports/net/irssi/pkg/PLIST,v
retrieving revision 1.18
diff -u -p -u -r1.18 PLIST
--- pkg/PLIST 23 May 2009 17:47:01 - 1.18
+++ pkg/PLIST 8 Jan 2014 16:34:59 -
@@ -1,5 +1,132 @@
@comment $OpenBSD: PLIST,v 1.18 2009/05/23 17:47:01 martynas Exp $
@bin bin/irssi
+include/irssi/
+include/irssi/irssi-config.h
+include/irssi/irssi-version.h
+include/irssi/src/
+include/irssi/src/common.h
+include/irssi/src/core/
+include/irssi/src/core/args.h
+include/irssi/src/core/channel-rec.h
+include/irssi/src/core/channel-setup-rec.h
+include/irssi/src/core/channels-setup.h
+include/irssi/src/core/channels.h
+include/irssi/src/core/chat-protocols.h
+include/irssi/src/core/chatnet-rec.h
+include/irssi/src/core/chatnets.h
+include/irssi/src/core/commands.h
+include/irssi/src/core/core.h
+include/irssi/src/core/expandos.h
+include/irssi/src/core/ignore.h
+include/irssi/src/core/levels.h
+include/irssi/src/core/line-split.h
+include/irssi/src/core/log.h
+include/irssi/src/core/masks.h
+include/irssi/src/core/misc.h
+include/irssi/src/core/module.h
+include/irssi/src/core/modules-load.h
+include/irssi/src/core/modules.h
+include/irssi/src/core/net-disconnect.h
+include/irssi/src/core/net-nonblock.h
+include/irssi/src/core/net-sendbuffer.h
+include/irssi/src/core/network.h
+include/irssi/src/core/nick-rec.h
+include/irssi/src/core/nicklist.h
+include/irssi/src/core/nickmatch-cache.h
+include/irssi/src/core/pidwait.h
+include/irssi/src/core/queries.h
+include/irssi/src/core/query-rec.h
+include/irssi/src/core/rawlog.h
+include/irssi/src/core/recode.h
+include/irssi/src/core/server-connect-rec.h
+include/irssi/src/core/server-rec.h
+include/irssi/src/core/server-setup-rec.h
+include/irssi/src/core/servers-reconnect.h
+include/irssi/src/core/servers-setup.h
+include/irssi/src/core/servers.h
+include/irssi/src/core/session.h
+include/irssi/src/core/settings.h
+include/irssi/src/core/signals.h
+include/irssi/src/core/special-vars.h
+include/irssi/src/core/window-item-def.h
+include/irssi/src/core/window-item-rec.h
+include/irssi/src/core/write-buffer.h
+include/irssi/src/fe-common/
+include/irssi/src/fe-common/core/
+include/irssi/src/fe-common/core/chat-completion.h
+include/irssi/src/fe-common/core/command-history.h
+include/irssi/src/fe-common/core/completion.h
+include/irssi/src/fe-common/core/fe-channels.h
+include/irssi/src/fe-common/core/fe-common-core.h
+include/irssi/src/fe-common/core/fe-core-commands.h
+include/irssi/src/fe-common/core/fe-exec.h
+include/irssi/src/fe-common/core/fe-messages.h
+include/irssi/src/fe-common/core/fe-queries.h
+include/irssi/src/fe-common/core/fe-recode.h
+include/irssi/src/fe-common/core/fe-windows.h
+include/irssi/src/fe-common/core/formats.h
+include/irssi/src/fe-common/core/hilight-text.h
+include/irssi/src/fe-common/core/keyboard.h
+include/irssi/src/fe-common/core/module-formats.h
+include/irssi/src/fe-common/core/module.h
+include/irssi/src/fe-common/core/printtext.h
+include/irssi/src/fe-common/core/themes.h
+include/irssi/src/fe-common/core/window-activity.h
+include/irssi/src/fe-common/core/window-items.h
+include/irssi/src/fe-common/core/windows-layout.h
+include/irssi/src/fe-common/irc/
+include/irssi/src/fe-common/irc/dcc/
+include/irssi/src/fe-common/irc/dcc/fe-dcc.h
+include/irssi/src/fe-common/irc/dcc/module-formats.h
+include/irssi/src/fe-common/irc/dcc/module.h
+include/irssi/src/fe-common/irc/fe-irc-server.h
+include/irssi/src/fe-common/irc/module-formats.h
+include/irssi/src/fe-common/irc/module.h
+include/irssi/src/fe-common/irc/notifylist/
+include/irssi/src/fe-common/irc/notifylist/module-formats.h
+include/irssi/src/fe-common/irc/notifylist/module.h
+include/irssi/src/fe-text/
+include/irssi/src/fe-text/statusbar-item.h
+include/irssi/src/irc/
+include/irssi/src/irc/core/
+include/irssi/src/irc/core/bans.h
+include/irssi/src/irc/core/channel-rejoin.h
+include/irssi/src/irc/core/ctcp.h
+include/irssi/src/irc/core/irc-channels.h
+include/irssi/src/irc/core/irc-chatnets.h
weird unzip symlink behavior
Download the master.zip from https://github.com/facebook/hhvm
(careful, it's like 30MB).
unzip it. observe lots of really weird output flying by.
stop extraction and look closer:
~/hhvm-master/hphp/third_party/ti ls -l
total 8
lrwxr-xr-x 1 tedu tedu 633 Jan 8 11:26 CMakeLists.txt@ -
set(CXX_SOURCES)?auto_sources(files *.cpp RECURSE
${CMAKE_CURRENT_SOURCE_DIR})?list(APPEND CXX_SOURCES
${files})??find_package(Boost 1.48.0 COMPONENTS thread system
REQUIRED)?include_directories(${Boost_INCLUDE_DIRS})?
link_directories(${Boost_LIBRARY_DIRS})??include_directories
(${HPHP_HOME}/hphp/third_party)?add_library(hphp_proxygen
STATIC ${CXX_SOURCES})??add_dependencies(hphp_proxygen
hphp_thrift)?target_link_libraries(hphp_proxygen hphp_thrift ?
${Boost_LIBRARIES}?
${LIBGLOG_LIBRARY}?
${LIBPTHREAD_LIBRARIES})??
I didn't even know zip files supported symlinks, apparently they do.
But why is it creating symlinks to the file contents? Is the zip file
broken (github to blame) or is unzip broken? I don't know enough to
peer into the file.
Apologies for being only tangentially openbsd related.
Re: Update: mail/greyscanner to version 2.00
On 2014-01-08 Wed 16:04 PM |, Jan Stary wrote: This is what I'm talking about: there is an MX and A for 'gmail.com', plus this host resolves there and back, (and apparently is an outgoing smtp of google.com). Yet greyscanner blacklists it, with 'no MX or A for gmail.com'. 110.175.80.66:gmail.com PTR: 110-175-80-66.static.tpgi.com.au. This is a spammer alright, but still, there _is_ an MX and A for 'gmail.com', which is all that greyscanner checks for. Somehow those DNS lookups must be failing, Yes. This diff is not a final solution, but enables users to see syslog warnings of what would be trapped if DNS checks were fully enabled: https://bitbucket.org/bonetruck/greyscanner/pull-request/4/disable-dns-checks-by-default-enable-warn/diff but so far I haven't found time to look into Net::DNS Cheers, -- Craig Skinner | http://www.bbc.co.uk/programmes/b03mtrg9/clips
Re: weird unzip symlink behavior
On Wed, Jan 08, 2014 at 11:38, Ted Unangst wrote: Download the master.zip from https://github.com/facebook/hhvm (careful, it's like 30MB). unzip it. observe lots of really weird output flying by. I didn't even know zip files supported symlinks, apparently they do. But why is it creating symlinks to the file contents? Is the zip file broken (github to blame) or is unzip broken? I don't know enough to peer into the file. After a few hints from others, it's definitely unzip 6.0 that's broken. Rolling the port back to unzip 5.52 works fine. Filing a bug with upstream if I can figure out how.
Re: emacs no_x11: less deps
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
j...@wxcvbn.org (Jérémie Courrèges-Anglas) writes:
Antoine Jacoutot ajacou...@bsdfrog.org writes:
On Sun, Jan 05, 2014 at 01:16:22AM +0100, Jérémie Courrèges-Anglas wrote:
Hi,
The emacs.desktop and emacs icon files shipped by the various emacs-24.3
flavors aren't useful for the no_x11 flavor, so I'd rather drop the
run-deps on desktop-file-utils and guic for the no_x11 case.
ok?
Then you need to move the corresponding icon and desktop files to PFRAG.
I wanted to avoid this but forgot to ask. Is it really needed, or just
for the sake of correctness?
Ahem ok, I missed the @exec calls at the end of PLIST. *headdesk*
So here's what I came up with.
ok?
Index: Makefile
===
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile11 Dec 2013 12:36:02 - 1.43
+++ Makefile5 Jan 2014 02:48:06 -
@@ -4,7 +4,7 @@ COMMENT=GNU editor: extensible, custom
VERSION= 24.3
DISTNAME= emacs-${VERSION}
-REVISION= 3
+REVISION= 4
CATEGORIES=editors
@@ -42,7 +42,6 @@ MAKE_ENV= INSTALL_EMACS=${INSTALL_SCRI
SUBST_VARS=GCCARCH VERSION
MODULES= devel/gettext
-RUN_DEPENDS= devel/desktop-file-utils x11/gtk+2,-guic
LIB_DEPENDS= devel/libexecinfo security/gnutls textproc/libxml
.if ${FLAVOR} == no_x11
@@ -59,7 +58,9 @@ LIB_DEPENDS+= x11/dbus \
graphics/tiff \
graphics/giflib \
graphics/ImageMagick
-RUN_DEPENDS+= devel/xdg-utils
+RUN_DEPENDS+= devel/desktop-file-utils \
+ devel/xdg-utils \
+ x11/gtk+2,-guic
WANTLIB+= dbus-1 rsvg-2 gio-2.0 gdk_pixbuf-2.0 gobject-2.0 \
glib-2.0 gconf-2 cairo png jpeg tiff gif z \
MagickWand MagickCore
@@ -88,5 +89,8 @@ ERRORS+= Fatal: Conflicting flavor: ${
post-install:
chmod -t ${PREFIX}/bin/emacs-${VERSION}
+.if ${FLAVOR:Mno_x11}
+ rm -Rf ${PREFIX}/share/applications/ ${PREFIX}/share/icons/
+.endif
.include bsd.port.mk
Index: pkg/PFRAG.athena
===
RCS file: /cvs/ports/editors/emacs/pkg/PFRAG.athena,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.athena
--- pkg/PFRAG.athena7 May 2013 07:06:42 - 1.2
+++ pkg/PFRAG.athena8 Jan 2014 18:22:51 -
@@ -1,3 +1,15 @@
@comment $OpenBSD: PFRAG.athena,v 1.2 2013/05/07 07:06:42 jasper Exp $
@pkgpath editors/emacs22,-main,
@pkgpath editors/emacs23,-main,athena
+share/applications/emacs.desktop
+share/icons/hicolor/128x128/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs.png
+share/icons/hicolor/24x24/apps/emacs.png
+share/icons/hicolor/32x32/apps/emacs.png
+share/icons/hicolor/48x48/apps/emacs.png
+share/icons/hicolor/scalable/apps/emacs.svg
+share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: pkg/PFRAG.gtk2
===
RCS file: /cvs/ports/editors/emacs/pkg/PFRAG.gtk2,v
retrieving revision 1.1
diff -u -p -r1.1 PFRAG.gtk2
--- pkg/PFRAG.gtk2 7 May 2013 07:06:42 - 1.1
+++ pkg/PFRAG.gtk2 8 Jan 2014 18:22:37 -
@@ -1,3 +1,15 @@
@comment $OpenBSD: PFRAG.gtk2,v 1.1 2013/05/07 07:06:42 jasper Exp $
@pkgpath editors/emacs23,-main,
@pkgpath editors/emacs,
+share/applications/emacs.desktop
+share/icons/hicolor/128x128/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs.png
+share/icons/hicolor/24x24/apps/emacs.png
+share/icons/hicolor/32x32/apps/emacs.png
+share/icons/hicolor/48x48/apps/emacs.png
+share/icons/hicolor/scalable/apps/emacs.svg
+share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: pkg/PFRAG.gtk3
===
RCS file: /cvs/ports/editors/emacs/pkg/PFRAG.gtk3,v
retrieving revision 1.2
diff -u -p -r1.2 PFRAG.gtk3
--- pkg/PFRAG.gtk3 7 May 2013 07:06:42 - 1.2
+++ pkg/PFRAG.gtk3 8 Jan 2014 18:22:24 -
@@ -1,2 +1,14 @@
@comment $OpenBSD: PFRAG.gtk3,v 1.2 2013/05/07 07:06:42 jasper Exp $
@pkgpath editors/emacs22,-main,gtk
+share/applications/emacs.desktop
+share/icons/hicolor/128x128/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs.png
Re: emacs no_x11: less deps
Better version thanks to sthen. I didn't want to add another PFRAG and
include it manually, but some !%%var%% plist magic does it for free.
I already got sthen's ok for the previous version so I plan to commit
this tomorrow.
BTW emacs-24.4 should be out soon, I can publish some pre-pre-release
tarballs with an updated port if people want to give it a try.
Index: Makefile
===
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile11 Dec 2013 12:36:02 - 1.43
+++ Makefile5 Jan 2014 02:48:06 -
@@ -4,7 +4,7 @@ COMMENT=GNU editor: extensible, custom
VERSION= 24.3
DISTNAME= emacs-${VERSION}
-REVISION= 3
+REVISION= 4
CATEGORIES=editors
@@ -42,7 +42,6 @@ MAKE_ENV= INSTALL_EMACS=${INSTALL_SCRI
SUBST_VARS=GCCARCH VERSION
MODULES= devel/gettext
-RUN_DEPENDS= devel/desktop-file-utils x11/gtk+2,-guic
LIB_DEPENDS= devel/libexecinfo security/gnutls textproc/libxml
.if ${FLAVOR} == no_x11
@@ -59,7 +58,9 @@ LIB_DEPENDS+= x11/dbus \
graphics/tiff \
graphics/giflib \
graphics/ImageMagick
-RUN_DEPENDS+= devel/xdg-utils
+RUN_DEPENDS+= devel/desktop-file-utils \
+ devel/xdg-utils \
+ x11/gtk+2,-guic
WANTLIB+= dbus-1 rsvg-2 gio-2.0 gdk_pixbuf-2.0 gobject-2.0 \
glib-2.0 gconf-2 cairo png jpeg tiff gif z \
MagickWand MagickCore
@@ -88,5 +89,8 @@ ERRORS+= Fatal: Conflicting flavor: ${
post-install:
chmod -t ${PREFIX}/bin/emacs-${VERSION}
+.if ${FLAVOR:Mno_x11}
+ rm -Rf ${PREFIX}/share/applications/ ${PREFIX}/share/icons/
+.endif
.include bsd.port.mk
Index: pkg/PFRAG.no-no_x11
===
RCS file: pkg/PFRAG.no-no_x11
diff -N pkg/PFRAG.no-no_x11
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.no-no_x11 8 Jan 2014 20:52:07 -
@@ -0,0 +1,13 @@
+@comment $OpenBSD$
+share/applications/emacs.desktop
+share/icons/hicolor/128x128/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs.png
+share/icons/hicolor/24x24/apps/emacs.png
+share/icons/hicolor/32x32/apps/emacs.png
+share/icons/hicolor/48x48/apps/emacs.png
+share/icons/hicolor/scalable/apps/emacs.svg
+share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 20 Aug 2013 22:05:51 - 1.13
+++ pkg/PLIST 8 Jan 2014 20:51:26 -
@@ -7,6 +7,7 @@
%%no_x11%%
%%gtk2%%
%%gtk3%%
+!%%no_x11%%
@bin bin/ctags
@bin bin/ebrowse
bin/emacs
@@ -85,8 +86,6 @@ libexec/emacs/${VERSION}/${GCCARCH}/rcs2
@man man/man1/emacsclient.1
@man man/man1/etags.1
@man man/man1/grep-changelog.1
-share/applications/
-share/applications/emacs.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/emacs/${VERSION}/
share/emacs/${VERSION}/etc/
@@ -3983,29 +3982,3 @@ share/emacs/${VERSION}/lisp/xt-mouse.elc
share/emacs/${VERSION}/site-lisp/
share/emacs/${VERSION}/site-lisp/subdirs.el
share/emacs/site-lisp/subdirs.el
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
-share/icons/hicolor/128x128/apps/emacs.png
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/16x16/apps/emacs.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
-share/icons/hicolor/24x24/apps/emacs.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/32x32/apps/emacs.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/emacs.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
-share/icons/hicolor/scalable/apps/emacs.svg
-share/icons/hicolor/scalable/mimetypes/
-share/icons/hicolor/scalable/mimetypes/emacs-document.svg
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
-@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
(previous: 0x06A11494 / 61DB D9A0 00A4 67CF 2A90 8961 6191 8FBF 06A1 1494)
Re: weird unzip symlink behavior
On Wed, Jan 08, 2014 at 14:53, Ted Unangst wrote: After a few hints from others, it's definitely unzip 6.0 that's broken. Rolling the port back to unzip 5.52 works fine. Filing a bug with upstream if I can figure out how. Rejoice! Steven Schweda replied and it's a known issue, with a patch. http://article.gmane.org/gmane.comp.version-control.git/181173 I delegate incorporating this patch into the port to you, the lucky reader. I can mostly only mess things up. :)
Re: weird unzip symlink behavior
On 01/09/14 00:04, Ted Unangst wrote:
On Wed, Jan 08, 2014 at 14:53, Ted Unangst wrote:
After a few hints from others, it's definitely unzip 6.0 that's broken.
Rolling the port back to unzip 5.52 works fine. Filing a bug with
upstream if I can figure out how.
Rejoice! Steven Schweda replied and it's a known issue, with a patch.
http://article.gmane.org/gmane.comp.version-control.git/181173
I delegate incorporating this patch into the port to you, the lucky
reader. I can mostly only mess things up. :)
free commit for you, lucky reader, time to go to sleep here.
Cheers
Giovanni
Index: Makefile
===
RCS file: /cvs/ports/archivers/unzip/Makefile,v
retrieving revision 1.46
diff -u -p -u -p -r1.46 Makefile
--- Makefile 16 Jul 2013 18:44:39 - 1.46
+++ Makefile 8 Jan 2014 23:19:25 -
@@ -5,7 +5,7 @@ COMMENT= extract, list test files in a
VERSION= 6.0
DISTNAME= unzip${VERSION:S/.//}
PKGNAME= unzip-${VERSION}
-REVISION = 2
+REVISION = 3
CATEGORIES= archivers
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=infozip/} \
http://mirror.switch.ch/ftp/mirror/infozip/src/ \
Index: patches/patch-process_c
===
RCS file: patches/patch-process_c
diff -N patches/patch-process_c
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-process_c 8 Jan 2014 23:19:25 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+--- process.c.orig Thu Jan 9 00:14:26 2014
process.c Thu Jan 9 00:15:49 2014
+@@ -1751,6 +1751,12 @@ int process_cdir_file_hdr(__G)/* return PK-type er
+ = (G.crec.general_purpose_bit_flag (1 11)) == (1 11);
+ #endif
+
++#ifdef SYMLINKS
++/* Initialize the symlink flag, may be set by the platform-specific
++ mapattr function. */
++G.pInfo-symlink = 0;
++#endif
++
+ return PK_COOL;
+
+ } /* end function process_cdir_file_hdr() */
Re: [UPDATE] OpenSCAD update to 2013.06
On 01/06/14 11:30, Fred wrote:
Hi ports@,
This diff updates OpenSCAD to verison 2013.06 - the last release, if my
mail agent mangles the inline diff - I have also attached it.
This is working on amd64 - and I'm currently testing it on macppc and i386.
Cheers
Fred
Index: Makefile
===
RCS file: /cvs/ports/cad/openscad/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile25 Nov 2013 14:16:22 -1.6
+++ Makefile6 Jan 2014 10:42:42 -
@@ -2,7 +2,7 @@
COMMENT =the programmer's solid 3D CAD modeller
-V =2013.01
+V =2013.06
DISTNAME =openscad-${V}
CATEGORIES =cad
Index: distinfo
===
RCS file: /cvs/ports/cad/openscad/distinfo,v
retrieving revision 1.3
diff -u -r1.3 distinfo
--- distinfo8 Mar 2013 01:36:59 -1.3
+++ distinfo6 Jan 2014 10:42:42 -
@@ -1,2 +1,2 @@
-SHA256 (openscad-2013.01.src.tar.gz) =
LvB4tYjEL3uoc4UPQKRpXGpH84BdFWBxfdP5j+gIIAc=
-SIZE (openscad-2013.01.src.tar.gz) = 3459766
+SHA256 (openscad-2013.06.src.tar.gz) =
8neow+alSCcvlSeeUN5tSm1zVSd1q3ozx/g3yOWRc98=
+SIZE (openscad-2013.06.src.tar.gz) = 4083085
Hi Ports@
Replying to my own post - as this worked on i386 and macppc (eventually
:~D).
So I have test on amd64, i386 and macppc.
Cheers
Fred
UPDATE: ircd-hybrid 8.1.13
Here is an update to ircd-hybrid 8.1.13.
OK?
Index: Makefile
===
RCS file: /home/cvs/ports/net/ircd-hybrid/Makefile,v
retrieving revision 1.29
diff -u -p -u -p -r1.29 Makefile
--- Makefile7 Dec 2013 10:29:03 - 1.29
+++ Makefile9 Jan 2014 00:52:07 -
@@ -4,7 +4,7 @@ SHARED_ONLY = Yes
COMMENT = Internet Relay Chat server
-DISTNAME = ircd-hybrid-8.1.11
+DISTNAME = ircd-hybrid-8.1.13
CATEGORIES = net
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=ircd-hybrid/}
EXTRACT_SUFX = .tgz
Index: distinfo
===
RCS file: /home/cvs/ports/net/ircd-hybrid/distinfo,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 distinfo
--- distinfo7 Dec 2013 10:29:03 - 1.11
+++ distinfo9 Jan 2014 00:52:18 -
@@ -1,2 +1,2 @@
-SHA256 (ircd-hybrid-8.1.11.tgz) = dyN0qxmG1H4onKAfWSYaQJ+d/Mz4f4+bcvoCUPvSU/o=
-SIZE (ircd-hybrid-8.1.11.tgz) = 1140736
+SHA256 (ircd-hybrid-8.1.13.tgz) = n2nSdsPej8S6W8EcQ1qdqEuR0SEKbEGV/buynISZa5E=
+SIZE (ircd-hybrid-8.1.13.tgz) = 1143544
Index: pkg/PLIST
===
RCS file: /home/cvs/ports/net/ircd-hybrid/pkg/PLIST,v
retrieving revision 1.8
diff -u -p -u -p -r1.8 PLIST
--- pkg/PLIST 7 Aug 2013 23:41:09 - 1.8
+++ pkg/PLIST 9 Jan 2014 00:57:15 -
@@ -95,6 +95,8 @@ lib/ircd-hybrid/modules/autoload/m_stats
lib/ircd-hybrid/modules/autoload/m_stats.so
lib/ircd-hybrid/modules/autoload/m_svinfo.la
lib/ircd-hybrid/modules/autoload/m_svinfo.so
+lib/ircd-hybrid/modules/autoload/m_svskill.la
+lib/ircd-hybrid/modules/autoload/m_svskill.so
lib/ircd-hybrid/modules/autoload/m_svsmode.la
lib/ircd-hybrid/modules/autoload/m_svsmode.so
lib/ircd-hybrid/modules/autoload/m_svsnick.la
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
UPDATE: converters/dos2unix 6.0.3 = 6.0.4
Hi ports -- Attached is a quick update for dos2unix, moving to 6.0.4 Works for me on amd64. OK? ~Brian Index: Makefile === RCS file: /cvs/ports/converters/dos2unix/Makefile,v retrieving revision 1.4 diff -u -p -r1.4 Makefile --- Makefile 24 Mar 2013 09:50:46 - 1.4 +++ Makefile 9 Jan 2014 06:56:26 - @@ -2,7 +2,7 @@ COMMENT= convert DOS/MAC files to UNIX (line-endings/charset) -DISTNAME= dos2unix-6.0.3 +DISTNAME= dos2unix-6.0.4 CATEGORIES= converters Index: distinfo === RCS file: /cvs/ports/converters/dos2unix/distinfo,v retrieving revision 1.3 diff -u -p -r1.3 distinfo --- distinfo 24 Mar 2013 09:50:46 - 1.3 +++ distinfo 9 Jan 2014 06:56:26 - @@ -1,2 +1,2 @@ -SHA256 (dos2unix-6.0.3.tar.gz) = 9SaMWyihmDU3IQxys/1D9KrReo2stnJ7YVtW3KLvmgQ= -SIZE (dos2unix-6.0.3.tar.gz) = 77227 +SHA256 (dos2unix-6.0.4.tar.gz) = Zr0iTUp/vhOjthqnCDte90z2RIo2cGBsZp9GqEu5s3o= +SIZE (dos2unix-6.0.4.tar.gz) = 84848 Index: patches/patch-Makefile === RCS file: /cvs/ports/converters/dos2unix/patches/patch-Makefile,v retrieving revision 1.2 diff -u -p -r1.2 patch-Makefile --- patches/patch-Makefile 6 Sep 2012 22:35:31 - 1.2 +++ patches/patch-Makefile 9 Jan 2014 06:56:26 - @@ -1,13 +1,13 @@ $OpenBSD: patch-Makefile,v 1.2 2012/09/06 22:35:31 sthen Exp $ Makefile.orig Thu Sep 6 20:17:00 2012 -+++ Makefile Thu Sep 6 23:33:34 2012 -@@ -219,6 +219,16 @@ endif +--- Makefile.orig Tue Nov 26 17:56:57 2013 Makefile Thu Jan 9 01:44:32 2014 +@@ -235,6 +235,16 @@ endif endif endif -+ifndef OS ++ifndef D2U_OS +ifeq (OpenBSD, $(shell uname -s)) -+ OS = openbsd ++ D2U_OS = openbsd +ifdef ENABLE_NLS + CFLAGS_OS = -I/usr/local/include + LDFLAGS_EXTRA = -liconv -lintl -L/usr/local/lib @@ -18,12 +18,3 @@ $OpenBSD: patch-Makefile,v 1.2 2012/09/0 ifeq (Darwin, $(shell uname -s)) D2U_OS = Darwin ifdef ENABLE_NLS -@@ -264,7 +274,7 @@ EO_NOTATION = -x - endif - - CFLAGS_USER = --CFLAGS = -O2 -Wall $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER) -+CFLAGS += -Wall $(RPM_OPT_FLAGS) $(CPPFLAGS) $(CFLAGS_USER) - - EXTRA_CFLAGS = -DVER_REVISION=\$(DOS2UNIX_VERSION)\ \ - -DVER_DATE=\$(DOS2UNIX_DATE)\ \ Index: pkg/PLIST === RCS file: /cvs/ports/converters/dos2unix/pkg/PLIST,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 PLIST --- pkg/PLIST 7 May 2012 12:07:07 - 1.1.1.1 +++ pkg/PLIST 9 Jan 2014 06:56:26 - @@ -23,6 +23,7 @@ share/doc/dos2unix/ share/doc/dos2unix/BUGS.txt share/doc/dos2unix/COPYING.txt share/doc/dos2unix/ChangeLog.txt +share/doc/dos2unix/INSTALL.txt share/doc/dos2unix/NEWS.txt share/doc/dos2unix/README.txt share/doc/dos2unix/TODO.txt @@ -32,3 +33,4 @@ share/locale/de/LC_MESSAGES/dos2unix.mo share/locale/eo/LC_MESSAGES/dos2unix.mo share/locale/es/LC_MESSAGES/dos2unix.mo share/locale/nl/LC_MESSAGES/dos2unix.mo +share/locale/ru/LC_MESSAGES/dos2unix.mo
Re: emacs no_x11: less deps
On Wed, Jan 08, 2014 at 11:16:20PM +0100, Jérémie Courrèges-Anglas wrote:
Better version thanks to sthen. I didn't want to add another PFRAG and
include it manually, but some !%%var%% plist magic does it for free.
I already got sthen's ok for the previous version so I plan to commit
this tomorrow.
Yes, that is *much* better this way -- ok aja
BTW emacs-24.4 should be out soon, I can publish some pre-pre-release
tarballs with an updated port if people want to give it a try.
Index: Makefile
===
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile 11 Dec 2013 12:36:02 - 1.43
+++ Makefile 5 Jan 2014 02:48:06 -
@@ -4,7 +4,7 @@ COMMENT= GNU editor: extensible, custom
VERSION= 24.3
DISTNAME=emacs-${VERSION}
-REVISION=3
+REVISION=4
CATEGORIES= editors
@@ -42,7 +42,6 @@ MAKE_ENV= INSTALL_EMACS=${INSTALL_SCRI
SUBST_VARS= GCCARCH VERSION
MODULES= devel/gettext
-RUN_DEPENDS= devel/desktop-file-utils x11/gtk+2,-guic
LIB_DEPENDS= devel/libexecinfo security/gnutls textproc/libxml
.if ${FLAVOR} == no_x11
@@ -59,7 +58,9 @@ LIB_DEPENDS+= x11/dbus \
graphics/tiff \
graphics/giflib \
graphics/ImageMagick
-RUN_DEPENDS+=devel/xdg-utils
+RUN_DEPENDS+=devel/desktop-file-utils \
+ devel/xdg-utils \
+ x11/gtk+2,-guic
WANTLIB+=dbus-1 rsvg-2 gio-2.0 gdk_pixbuf-2.0 gobject-2.0 \
glib-2.0 gconf-2 cairo png jpeg tiff gif z \
MagickWand MagickCore
@@ -88,5 +89,8 @@ ERRORS+=Fatal: Conflicting flavor: ${
post-install:
chmod -t ${PREFIX}/bin/emacs-${VERSION}
+.if ${FLAVOR:Mno_x11}
+ rm -Rf ${PREFIX}/share/applications/ ${PREFIX}/share/icons/
+.endif
.include bsd.port.mk
Index: pkg/PFRAG.no-no_x11
===
RCS file: pkg/PFRAG.no-no_x11
diff -N pkg/PFRAG.no-no_x11
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.no-no_x11 8 Jan 2014 20:52:07 -
@@ -0,0 +1,13 @@
+@comment $OpenBSD$
+share/applications/emacs.desktop
+share/icons/hicolor/128x128/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs.png
+share/icons/hicolor/24x24/apps/emacs.png
+share/icons/hicolor/32x32/apps/emacs.png
+share/icons/hicolor/48x48/apps/emacs.png
+share/icons/hicolor/scalable/apps/emacs.svg
+share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 20 Aug 2013 22:05:51 - 1.13
+++ pkg/PLIST 8 Jan 2014 20:51:26 -
@@ -7,6 +7,7 @@
%%no_x11%%
%%gtk2%%
%%gtk3%%
+!%%no_x11%%
@bin bin/ctags
@bin bin/ebrowse
bin/emacs
@@ -85,8 +86,6 @@ libexec/emacs/${VERSION}/${GCCARCH}/rcs2
@man man/man1/emacsclient.1
@man man/man1/etags.1
@man man/man1/grep-changelog.1
-share/applications/
-share/applications/emacs.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/emacs/${VERSION}/
share/emacs/${VERSION}/etc/
@@ -3983,29 +3982,3 @@ share/emacs/${VERSION}/lisp/xt-mouse.elc
share/emacs/${VERSION}/site-lisp/
share/emacs/${VERSION}/site-lisp/subdirs.el
share/emacs/site-lisp/subdirs.el
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
-share/icons/hicolor/128x128/apps/emacs.png
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/16x16/apps/emacs.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
-share/icons/hicolor/24x24/apps/emacs.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/32x32/apps/emacs.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/emacs.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
-share/icons/hicolor/scalable/apps/emacs.svg
-share/icons/hicolor/scalable/mimetypes/
-share/icons/hicolor/scalable/mimetypes/emacs-document.svg
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
-@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
--
jca | PGP: 0x1524E7EE / 5135 92C1 AD36 5293 2BDF DDCC 0DFA 74AE 1524 E7EE
Re: emacs no_x11: less deps
2014/1/9 Jérémie Courrèges-Anglas j...@wxcvbn.org:
Better version thanks to sthen. I didn't want to add another PFRAG and
include it manually, but some !%%var%% plist magic does it for free.
I already got sthen's ok for the previous version so I plan to commit
this tomorrow.
BTW emacs-24.4 should be out soon, I can publish some pre-pre-release
tarballs with an updated port if people want to give it a try.
Index: Makefile
===
RCS file: /cvs/ports/editors/emacs/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile11 Dec 2013 12:36:02 - 1.43
+++ Makefile5 Jan 2014 02:48:06 -
@@ -4,7 +4,7 @@ COMMENT=GNU editor: extensible, custom
VERSION= 24.3
DISTNAME= emacs-${VERSION}
-REVISION= 3
+REVISION= 4
CATEGORIES=editors
@@ -42,7 +42,6 @@ MAKE_ENV= INSTALL_EMACS=${INSTALL_SCRI
SUBST_VARS=GCCARCH VERSION
MODULES= devel/gettext
-RUN_DEPENDS= devel/desktop-file-utils x11/gtk+2,-guic
LIB_DEPENDS= devel/libexecinfo security/gnutls textproc/libxml
.if ${FLAVOR} == no_x11
@@ -59,7 +58,9 @@ LIB_DEPENDS+= x11/dbus \
graphics/tiff \
graphics/giflib \
graphics/ImageMagick
-RUN_DEPENDS+= devel/xdg-utils
+RUN_DEPENDS+= devel/desktop-file-utils \
+ devel/xdg-utils \
+ x11/gtk+2,-guic
WANTLIB+= dbus-1 rsvg-2 gio-2.0 gdk_pixbuf-2.0 gobject-2.0 \
glib-2.0 gconf-2 cairo png jpeg tiff gif z \
MagickWand MagickCore
@@ -88,5 +89,8 @@ ERRORS+= Fatal: Conflicting flavor: ${
post-install:
chmod -t ${PREFIX}/bin/emacs-${VERSION}
+.if ${FLAVOR:Mno_x11}
+ rm -Rf ${PREFIX}/share/applications/ ${PREFIX}/share/icons/
+.endif
.include bsd.port.mk
Index: pkg/PFRAG.no-no_x11
===
RCS file: pkg/PFRAG.no-no_x11
diff -N pkg/PFRAG.no-no_x11
--- /dev/null 1 Jan 1970 00:00:00 -
+++ pkg/PFRAG.no-no_x11 8 Jan 2014 20:52:07 -
@@ -0,0 +1,13 @@
+@comment $OpenBSD$
+share/applications/emacs.desktop
+share/icons/hicolor/128x128/apps/emacs.png
+share/icons/hicolor/16x16/apps/emacs.png
+share/icons/hicolor/24x24/apps/emacs.png
+share/icons/hicolor/32x32/apps/emacs.png
+share/icons/hicolor/48x48/apps/emacs.png
+share/icons/hicolor/scalable/apps/emacs.svg
+share/icons/hicolor/scalable/mimetypes/emacs-document.svg
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database
+@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
+@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Index: pkg/PLIST
===
RCS file: /cvs/ports/editors/emacs/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 20 Aug 2013 22:05:51 - 1.13
+++ pkg/PLIST 8 Jan 2014 20:51:26 -
@@ -7,6 +7,7 @@
%%no_x11%%
%%gtk2%%
%%gtk3%%
+!%%no_x11%%
@bin bin/ctags
@bin bin/ebrowse
bin/emacs
@@ -85,8 +86,6 @@ libexec/emacs/${VERSION}/${GCCARCH}/rcs2
@man man/man1/emacsclient.1
@man man/man1/etags.1
@man man/man1/grep-changelog.1
-share/applications/
-share/applications/emacs.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/emacs/${VERSION}/
share/emacs/${VERSION}/etc/
@@ -3983,29 +3982,3 @@ share/emacs/${VERSION}/lisp/xt-mouse.elc
share/emacs/${VERSION}/site-lisp/
share/emacs/${VERSION}/site-lisp/subdirs.el
share/emacs/site-lisp/subdirs.el
-share/icons/
-share/icons/hicolor/
-share/icons/hicolor/128x128/
-share/icons/hicolor/128x128/apps/
-share/icons/hicolor/128x128/apps/emacs.png
-share/icons/hicolor/16x16/
-share/icons/hicolor/16x16/apps/
-share/icons/hicolor/16x16/apps/emacs.png
-share/icons/hicolor/24x24/
-share/icons/hicolor/24x24/apps/
-share/icons/hicolor/24x24/apps/emacs.png
-share/icons/hicolor/32x32/
-share/icons/hicolor/32x32/apps/
-share/icons/hicolor/32x32/apps/emacs.png
-share/icons/hicolor/48x48/
-share/icons/hicolor/48x48/apps/
-share/icons/hicolor/48x48/apps/emacs.png
-share/icons/hicolor/scalable/
-share/icons/hicolor/scalable/apps/
-share/icons/hicolor/scalable/apps/emacs.svg
-share/icons/hicolor/scalable/mimetypes/
-share/icons/hicolor/scalable/mimetypes/emacs-document.svg
-@exec %D/bin/update-desktop-database
-@unexec-delete %D/bin/update-desktop-database
-@exec %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
-@unexec-delete %D/bin/gtk-update-icon-cache -q -t %D/share/icons/hicolor
Looks good to me, ok zhuk@.
--
WBR,
Vadim Zhukov
