CVS: cvs.openbsd.org: ports

2012-04-15 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2012/04/15 02:49:05

Modified files:
games/xmoto: Makefile distinfo 
games/xmoto/patches: patch-src_image_tim_png_cpp 
games/xmoto/pkg: PLIST 
Added files:
games/xmoto/patches: patch-bin_Makefile_am patch-configure_in 
 patch-m4_gettext_m4 patch-src_GameInit_cpp 
 patch-src_Makefile_am 
 patch-src_helpers_System_cpp 
Removed files:
games/xmoto/patches: patch-src_Replay_cpp 

Log message:
- Update to 0.5.9 from Antti Harri, thanks.
- Switch MAINTAINER, requested by previous maintainer.

ok armani@ (old maintainer)



il est temps de nettoyer votre piscine

2012-04-15 Thread Rachelle
Le nettoyage de votre piscine ne doit plus jtre une corvie.
Nous avons aujourd'hui la solution

---L'ASPIRATEUR
 INDISPENSABLE
---A VOTRE PISCINE

Aspirateur de piscine cyclone

  PROMOTION FRANCO DE PORT 229,00 

  L'ASPIRATEUR MANUEL QUI FONCTIONNE AVEC LE ROBINET D'EAU DU JARDIN
  PAR EFFET VENTURI

  NETTOYEZ VOTRE PISCINE EN UN TEMPS RECORD.
  votre Cyclone aspirera les feuilles, graviers, sables
  et pourssihres de votre piscine.
  Durie de la cartouche: 1 ` 2 saisons

  Ets Monetta Cyclone
  2689 voie romaine
  13600 Ceyreste
  04.42.83.18.39 - 06.88.24.45.77

  Passez commande par e-mail en cliquant ici
  Consulter notre Site Internet en cliquant ici

aspirateur de piscine Cyclone
GARANTIE 2 ANS
(appareil breveti, marque et modhle diposis)

vue d'une belle piscine

AVANTAGES DU CYCLONE

Rapiditi
Efficaciti
Economie d'eau, de produits, d'ilectriciti, de temps
Sicuriti: aucune manipulation / vannes / boutons ilectriques
Mise ` niveau de la piscine tout en la nettoyant
Robuste par sa conception et sans entretien
Pratique pour bac volet roulant et piscine ` dibordement

Envoyez ce message ` un ami
Pour jtre retiri de nos listes c'est ici
serial : 513969587[IMAGE]



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2012/04/15 04:40:44

Modified files:
www/chromium   : Makefile 
www/chromium/patches: patch-content_renderer_render_view_impl_cc 
Added files:
www/chromium/patches: patch-base_debug_debugger_posix_cc 
  patch-base_process_util_openbsd_cc 

Log message:
make sure we use big enough buffers for sysctl(3)



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Christian Weisgerber
CVSROOT:/cvs
Module name:ports
Changes by: na...@cvs.openbsd.org   2012/04/15 05:37:41

Modified files:
multimedia/avidemux: Makefile 
Added files:
multimedia/avidemux/patches: 
 
patch-avidemux_ADM_script_ADM_JSFunctions_cpp 

Log message:
The rfork() system call has been removed.



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Joel Sing
CVSROOT:/cvs
Module name:ports
Changes by: js...@cvs.openbsd.org   2012/04/15 07:19:15

Modified files:
lang/go/pkg: PLIST 

Log message:
Remove incorrect ${FULLPKGNAME} from PLIST.



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Robert Nagy
CVSROOT:/cvs
Module name:ports
Changes by: rob...@cvs.openbsd.org  2012/04/15 07:33:24

Modified files:
www/chromium   : Makefile distinfo 

Log message:
update to 18.0.1025.162



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Joel Sing
CVSROOT:/cvs
Module name:ports
Changes by: js...@cvs.openbsd.org   2012/04/15 07:37:27

Modified files:
lang/go: Makefile 
lang/go/patches: patch-src_pkg_runtime_sys_openbsd_386_s 
 patch-src_pkg_runtime_sys_openbsd_amd64_s 
 patch-src_pkg_runtime_thread_openbsd_c 

Log message:
Use the __tfork() syscall instead of rfork(), which no longer exists.

ok sthen@



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Gleydson Soares
CVSROOT:/cvs
Module name:ports
Changes by: gsoa...@cvs.openbsd.org 2012/04/15 08:33:50

Modified files:
devel/cppcheck : Makefile distinfo 

Log message:
update to cppcheck-1.54



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/04/15 09:16:52

Modified files:
x11/gnome/gnote: Makefile distinfo 
x11/gnome/gnote/patches: patch-configure 
x11/gnome/gnote/pkg: PLIST 
Removed files:
x11/gnome/gnote/patches: patch-src_notebuffer_cpp 

Log message:
- update to 0.8.3



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Edd Barrett
CVSROOT:/cvs
Module name:ports
Changes by: e...@cvs.openbsd.org2012/04/15 09:23:54

Added files:
audio/hgd/patches: patch-Makefile_in 

Log message:
Fix missing CFLAGS exposed by sqlite import. Patch from Nigel Taylor. Thanks



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Jasper Lievisse Adriaanse
CVSROOT:/cvs
Module name:ports
Changes by: jas...@cvs.openbsd.org  2012/04/15 11:16:27

ports/devel/msp430/msp430mcu/patches

Update of /cvs/ports/devel/msp430/msp430mcu/patches
In directory cvs.openbsd.org:/tmp/cvs-serv1439/patches

Log Message:
Directory /cvs/ports/devel/msp430/msp430mcu/patches added to the repository



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Anthony J. Bentley
CVSROOT:/cvs
Module name:ports
Changes by: bent...@cvs.openbsd.org 2012/04/15 11:47:00

Modified files:
emulators/openmsx: Makefile distinfo 
emulators/openmsx/patches: patch-build_detectsys_py 
emulators/openmsx/pkg: PLIST 
Removed files:
emulators/openmsx/patches: patch-build_libraries_py 
   patch-src_video_PNG_cc 

Log message:
Update emulators/openmsx to 0.8.2.

While here, respect CXX et al.

ok jasper@, MAKE_FLAGS bit ok naddy@



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Gonzalo L. Rodriguez
CVSROOT:/cvs
Module name:ports
Changes by: gonz...@cvs.openbsd.org 2012/04/15 12:38:53

Modified files:
editors/ht : Makefile distinfo 
editors/ht/patches: patch-configure 

Log message:
Little update for 'ht', with some fixes:

- Fixed loading of 32 bit ELFs
- Use wide ncurses if necessars
- Show search progress in MiB
- [x86] fixed a lot of small bugs
- fixed a crash with the follow function on
invalid addresses in analyser
- [x86] AVX updates
- [x86] AVX2
- [x86] BMI, BMI2 and TBM instructions
- fixed loading of ELF files with no section headers

OK, benoit@ (maintainer), edd@, aja@



CVS: cvs.openbsd.org: ports

2012-04-15 Thread Kirill Bychkov
CVSROOT:/cvs
Module name:ports
Changes by: ki...@cvs.openbsd.org   2012/04/15 14:03:16

Modified files:
geo/gpsbabel   : Makefile 
geo/gpsbabel/pkg: PLIST-main PLIST-qt 

Log message:
Add .desktop file for -qt subpackage
With the help from landry@, naddy@ and sthen@
OK from sthen@
Maintainer timeout



Re: Error building cfengine 3.3.0

2012-04-15 Thread Martijn Rijkeboer
Hello Okan,

 I'm trying to make a port for cfengine 3.3.0. The configure finishes
 without errors,

 ... but you need to read config.log!

You're right.


 Apparently HAVE_SOCKLEN_T is not defined, but should be. What is the
 recommended way to handle this?

 The configure script is missing sys/types.h and incorrectly (not)
 defining HAVE_SOCKLEN_T.

 $OpenBSD$
 --- configure.origFri Apr 13 18:01:26 2012
 +++ configure Fri Apr 13 18:02:03 2012
 @@ -15485,7 +15485,9 @@ _ACEOF

  fi

 -ac_fn_c_check_type $LINENO socklen_t ac_cv_type_socklen_t #include
 sys/socket.h
 +ac_fn_c_check_type $LINENO socklen_t ac_cv_type_socklen_t 
 +#include sys/types.h
 +#include sys/socket.h
  
  if test x$ac_cv_type_socklen_t = xyes; then :

The patch above makes it work.


 I don't have box that can build cfengine right in front of me right now,
 but I know I've got mostly working ports of cfengine3 in various stages
 scattered across a few places.  Time to find and merge them I guess :)
 (and hope the patches I sent upstream got integrated)

That would be nice. An up to date version of cfengine in OpenBSD would be
great.


 Let me know of other issues while I get my stuff together...

With your patch it compiles. It does need gmake however, otherwise I get
an error with the manpages (gmake is also required according to the
INSTALL file).

I still got issues with the location of some of the files (bin vs sbin
and share/doc vs share/doc/cfengine).

Kind regards,


Martijn Rijkeboer





nginx: SECURITY UPDATE to 1.0.15 - FIX CVE-2012-2089

2012-04-15 Thread Gleydson Soares
hi,

update www/nginx to 1.015.
* fix for CVE-2012-2089 - Buffer overflow in the ngx_http_mp4_module
(http://nginx.org/en/security_advisories.html)

btw be default this module isnt enabled in our base tree. this bug dont affect 
the OpenBSD base src/usr.sbin/nginx.

Changelog:
Changes with nginx 1.0.1512 Apr 2012

*) Security: specially crafted mp4 file might allow to overwrite memory
locations in a worker process if the ngx_http_mp4_module was used,
potentially resulting in arbitrary code execution (CVE-2012-2089).
Thanks to Matthew Daley.

*) Bugfix: in the ngx_http_mp4_module.

OK ?
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.51
diff -u -p -r1.51 Makefile
--- Makefile16 Mar 2012 00:44:06 -  1.51
+++ Makefile15 Apr 2012 14:46:40 -
@@ -2,7 +2,7 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
-DISTNAME=  nginx-1.0.14
+DISTNAME=  nginx-1.0.15
 CATEGORIES=www
 
 HOMEPAGE=  http://nginx.org/
Index: distinfo
===
RCS file: /cvs/ports/www/nginx/distinfo,v
retrieving revision 1.30
diff -u -p -r1.30 distinfo
--- distinfo16 Mar 2012 00:44:06 -  1.30
+++ distinfo15 Apr 2012 14:46:40 -
@@ -1,5 +1,5 @@
-MD5 (nginx-1.0.14.tar.gz) = AZhE5Iw0lSJTyibdbijDXA==
-RMD160 (nginx-1.0.14.tar.gz) = 5vWa2RJkZ+9KKuWAyJdrSIQKupA=
-SHA1 (nginx-1.0.14.tar.gz) = 90y9pPcmMnhBq+BmdsYDQZhCfOk=
-SHA256 (nginx-1.0.14.tar.gz) = mOSDkl2rg2g3YtsywhoeLsaF15opjC4y54WvDMS6468=
-SIZE (nginx-1.0.14.tar.gz) = 692465
+MD5 (nginx-1.0.15.tar.gz) = F9pIAiCbg9m+uw8O3Zdd/A==
+RMD160 (nginx-1.0.15.tar.gz) = mWU0mZFrgfsPWEJ1VISYNgbOpew=
+SHA1 (nginx-1.0.15.tar.gz) = 5QazAeqEn1jy77SZ13uBn+Ve6po=
+SHA256 (nginx-1.0.15.tar.gz) = Ha85UGI8kLCE5+zrEEBxWWBgrKXHIb+JBUn8KZCx6+Y=
+SIZE (nginx-1.0.15.tar.gz) = 693025


nginx_OPENBSD_5_1: SECURITY FIX for CVE-2012-2089 / CVE-2012-1180

2012-04-15 Thread Gleydson Soares
hi,

SECURITY FIX for nginx OPENBSD_5_1 branch.

resolves: 
CVE-2012-2089 - Buffer overflow in the ngx_http_mp4_module
CVE-2012-1180 - Memory disclosure with specially crafted backend responses

OK ?
Index: Makefile
===
RCS file: /cvs/ports/www/nginx/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile18 Jan 2012 10:00:52 -  1.48
+++ Makefile15 Apr 2012 15:20:12 -
@@ -2,6 +2,7 @@
 
 COMMENT=   robust and small HTTP server and mail proxy server
 
+REVISION=  0
 DISTNAME=  nginx-1.0.11
 CATEGORIES=www
 
Index: patches/patch-src_http_modules_ngx_http_fastcgi_module_c
===
RCS file: patches/patch-src_http_modules_ngx_http_fastcgi_module_c
diff -N patches/patch-src_http_modules_ngx_http_fastcgi_module_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_http_modules_ngx_http_fastcgi_module_c15 Apr 2012 
15:20:12 -
@@ -0,0 +1,23 @@
+$OpenBSD$
+
+SECURITY FIX:
+CVE-2012-1180 - Memory disclosure with specially crafted backend responses
+patch from upstream: http://nginx.org/download/patch.2012.memory.txt
+
+--- src/http/modules/ngx_http_fastcgi_module.c.origWed Dec 14 13:13:25 2011
 src/http/modules/ngx_http_fastcgi_module.c Sun Apr 15 12:00:09 2012
+@@ -1445,10 +1445,10 @@ ngx_http_fastcgi_process_header(ngx_http_request_t *r)
+ h-lowcase_key = h-key.data + h-key.len + 1
+  + h-value.len + 1;
+ 
+-ngx_cpystrn(h-key.data, r-header_name_start,
+-h-key.len + 1);
+-ngx_cpystrn(h-value.data, r-header_start,
+-h-value.len + 1);
++ngx_memcpy(h-key.data, r-header_name_start, h-key.len);
++h-key.data[h-key.len] = '\0';
++ngx_memcpy(h-value.data, r-header_start, h-value.len);
++h-value.data[h-value.len] = '\0';
+ }
+ 
+ h-hash = r-header_hash;
Index: patches/patch-src_http_modules_ngx_http_mp4_module_c
===
RCS file: patches/patch-src_http_modules_ngx_http_mp4_module_c
diff -N patches/patch-src_http_modules_ngx_http_mp4_module_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-src_http_modules_ngx_http_mp4_module_c15 Apr 2012 
15:20:14 -
@@ -0,0 +1,588 @@
+$OpenBSD$
+
+SECURITY FIX:
+CVE-2012-2089 - Buffer overflow in the ngx_http_mp4_module
+patch from upstream: http://nginx.org/download/patch.2012.mp4.txt
+
+--- src/http/modules/ngx_http_mp4_module.c.origWed Dec 14 16:02:37 2011
 src/http/modules/ngx_http_mp4_module.c Sun Apr 15 12:11:24 2012
+@@ -155,6 +155,7 @@ typedef struct {
+ 
+ #define ngx_mp4_atom_header(mp4)   (mp4-buffer_pos - 8)
+ #define ngx_mp4_atom_data(mp4) mp4-buffer_pos
++#define ngx_mp4_atom_data_size(t)  (uint64_t) (sizeof(t) - 8)
+ #define ngx_mp4_atom_next(mp4, n)  mp4-buffer_pos += n; mp4-offset += n
+ 
+ 
+@@ -203,7 +204,7 @@ typedef struct {
+ static ngx_int_t ngx_http_mp4_process(ngx_http_mp4_file_t *mp4);
+ static ngx_int_t ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4,
+ ngx_http_mp4_atom_handler_t *atom, uint64_t atom_data_size);
+-static ngx_int_t ngx_http_mp4_read(ngx_http_mp4_file_t *mp4);
++static ngx_int_t ngx_http_mp4_read(ngx_http_mp4_file_t *mp4, size_t size);
+ static ngx_int_t ngx_http_mp4_read_ftyp_atom(ngx_http_mp4_file_t *mp4,
+ uint64_t atom_data_size);
+ static ngx_int_t ngx_http_mp4_read_moov_atom(ngx_http_mp4_file_t *mp4,
+@@ -264,7 +265,7 @@ static ngx_int_t ngx_http_mp4_update_stsc_atom(ngx_htt
+ ngx_http_mp4_trak_t *trak);
+ static ngx_int_t ngx_http_mp4_read_stsz_atom(ngx_http_mp4_file_t *mp4,
+ uint64_t atom_data_size);
+-static void ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4,
++static ngx_int_t ngx_http_mp4_update_stsz_atom(ngx_http_mp4_file_t *mp4,
+ ngx_http_mp4_trak_t *trak);
+ static ngx_int_t ngx_http_mp4_read_stco_atom(ngx_http_mp4_file_t *mp4,
+ uint64_t atom_data_size);
+@@ -692,7 +693,9 @@ ngx_http_mp4_process(ngx_http_mp4_file_t *mp4)
+ return NGX_ERROR;
+ }
+ 
+-ngx_http_mp4_update_stsz_atom(mp4, trak[i]);
++if (ngx_http_mp4_update_stsz_atom(mp4, trak[i]) != NGX_OK) {
++return NGX_ERROR;
++}
+ 
+ if (trak[i].out[NGX_HTTP_MP4_CO64_DATA].buf) {
+ if (ngx_http_mp4_update_co64_atom(mp4, trak[i]) != NGX_OK) {
+@@ -784,10 +787,8 @@ ngx_http_mp4_read_atom(ngx_http_mp4_file_t *mp4,
+ 
+ while (mp4-offset  end) {
+ 
+-if (mp4-buffer_pos + sizeof(uint32_t)  mp4-buffer_end) {
+-if (ngx_http_mp4_read(mp4) != NGX_OK) {
+-return NGX_ERROR;
+-}
++if (ngx_http_mp4_read(mp4, sizeof(uint32_t)) != NGX_OK) {
++

Re: Kill audio/bmp?

2012-04-15 Thread Edd Barrett
Hi ports,

I have checked which ports depends upon audio/bmp. There is only xmp.
The following diff removes the bmp multipackage from xmp. All we would
need to do after this is remove and unlink audio/bmp.

I have one OK, but I would like another from a senior porter if
possible.

Cheers


Index: Makefile
===
RCS file: /cvs/ports/audio/xmp/Makefile,v
retrieving revision 1.48
diff -u -p -r1.48 Makefile
--- Makefile22 Mar 2012 13:32:55 -  1.48
+++ Makefile15 Apr 2012 15:32:36 -
@@ -3,12 +3,10 @@
 SHARED_ONLY=   Yes
 
 COMMENT-main=  extended module player
-COMMENT-bmp=   extended module player plugin for BMP
 COMMENT-xmms=  extended module player plugin for XMMS
 
 DISTNAME=  xmp-3.5.0
 PKGNAME-main=  ${DISTNAME}
-PKGNAME-bmp=   bmp-${DISTNAME}
 PKGNAME-xmms=  xmms-${DISTNAME}
 CATEGORIES=audio
 
@@ -22,7 +20,7 @@ PERMIT_DISTFILES_FTP= Yes
 
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=xmp/}
 
-MULTI_PACKAGES=-main -bmp -xmms
+MULTI_PACKAGES=-main -xmms
 
 MODULES=   devel/gettext
 
@@ -35,15 +33,6 @@ LIB_DEPENDS-main=# empty
 RUN_DEPENDS-main=  # empty
 WANTLIB-main=  c m sndio
 
-LIB_DEPENDS-bmp=   audio/bmp
-WANTLIB-bmp=   GL X11 Xcomposite Xcursor Xdamage Xext Xfixes \
-   Xi Xinerama Xrandr Xrender atk-1.0 beep cairo \
-   expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 \
-   gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
-   gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0 \
-   pixman-1 png pthread-stubs xcb xcb-render xcb-shm z \
-   ${MODGETTEXT_WANTLIB}
-
 LIB_DEPENDS-xmms=  audio/xmms
 WANTLIB-xmms=  X11 Xext Xi gdk glib gmodule gtk m xmms 
${MODGETTEXT_WANTLIB}
 
@@ -55,7 +44,6 @@ CONFIGURE_ARGS+=  --disable-alsa \
--disable-esd \
--disable-oss \
--disable-pulseaudio \
-   --enable-bmp-plugin \
--enable-xmms-plugin
 CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib
Index: pkg/PLIST-bmp
===
RCS file: pkg/PLIST-bmp
diff -N pkg/PLIST-bmp
--- pkg/PLIST-bmp   23 Aug 2010 18:13:58 -  1.2
+++ /dev/null   1 Jan 1970 00:00:00 -
@@ -1,4 +0,0 @@
-@comment $OpenBSD: PLIST-bmp,v 1.2 2010/08/23 18:13:58 jasper Exp $
-lib/bmp/
-lib/bmp/Input/
-lib/bmp/Input/xmp-bmp.so

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk



.desktop file for gpsbabel

2012-04-15 Thread Kirill Bychkov
Hi.
I've got a simple patch for adding .desktop file in gpsbabel-qt package.
Chris (maintainer) keeps silence for a week.
OK?

Index: Makefile
===
RCS file: /cvs/ports/geo/gpsbabel/Makefile,v
retrieving revision 1.21
diff -u -r1.21 Makefile
--- Makefile18 Feb 2012 22:04:07 -  1.21
+++ Makefile7 Apr 2012 11:08:14 -
@@ -9,6 +9,7 @@
 PKGNAME-main=  gpsbabel-${VERSION}
 PKGNAME-tk=gpsbabel-tk-${VERSION}
 PKGNAME-qt=gpsbabel-qt-${VERSION}
+REVISION-qt=   0
 CATEGORIES=geo

 HOMEPAGE=  http://www.gpsbabel.org/
@@ -55,10 +56,13 @@
 PKG_ARCH-tk=   *
 RUN_DEPENDS-tk=geo/gpsbabel \
${MODTK_RUN_DEPENDS}
-RUN_DEPENDS-qt=geo/gpsbabel
+RUN_DEPENDS-qt=geo/gpsbabel \
+   devel/desktop-file-utils

 pre-configure:2
${SUBST_CMD} ${WRKSRC}/guibabel
+   @perl -pi -e 's/gpsbabelfe-bin/guibabel-qt/' \
+   ${WRKSRC}/gui/gpsbabel.desktop
 post-configure:
cd ${WRKSRC}/gui  ${SETENV} ${CONFIGURE_ENV} qmake4 \
app.pro
@@ -75,5 +79,11 @@
${INSTALL_DATA} ${WRKSRC}/babelweb/htmldoc-*/*.html \
${PREFIX}/share/doc/gpsbabel
${INSTALL_DATA} ${WRKSRC}/README* ${PREFIX}/share/doc/gpsbabel
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/applications
+   ${INSTALL_DATA} ${WRKSRC}/gui/gpsbabel.desktop \
+   ${PREFIX}/share/applications
+   ${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
+   ${INSTALL_DATA} ${WRKSRC}/gui/images/appicon.png \
+   ${PREFIX}/share/pixmaps/gpsbabel.png

 .include bsd.port.mk
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/geo/gpsbabel/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -r1.3 PLIST-main
--- pkg/PLIST-main  18 Feb 2012 22:04:07 -  1.3
+++ pkg/PLIST-main  7 Apr 2012 11:08:14 -
@@ -1,6 +1,7 @@
 @comment $OpenBSD: PLIST-main,v 1.3 2012/02/18 22:04:07 sthen Exp $
 @pkgpath geo/gpsbabel
 @bin bin/gpsbabel
+share/applications/
 share/doc/gpsbabel/
 share/doc/gpsbabel/Advanced_Usage.html
 share/doc/gpsbabel/Data_Filters.html
@@ -229,3 +230,4 @@
 share/doc/gpsbabel/styles_internal_const.html
 share/doc/gpsbabel/styles_intro.html
 share/doc/gpsbabel/tracking.html
+share/pixmaps/
Index: pkg/PLIST-qt
===
RCS file: /cvs/ports/geo/gpsbabel/pkg/PLIST-qt,v
retrieving revision 1.1
diff -u -r1.1 PLIST-qt
--- pkg/PLIST-qt18 Feb 2012 22:04:07 -  1.1
+++ pkg/PLIST-qt7 Apr 2012 11:08:14 -
@@ -1,2 +1,6 @@
 @comment $OpenBSD: PLIST-qt,v 1.1 2012/02/18 22:04:07 sthen Exp $
 @bin bin/guibabel-qt
+share/applications/gpsbabel.desktop
+share/pixmaps/gpsbabel.png
+@exec %D/bin/update-desktop-database
+@unexec-delete %D/bin/update-desktop-database



Re: .desktop file for gpsbabel

2012-04-15 Thread Landry Breuil
On Sun, Apr 15, 2012 at 10:24:02PM +0400, Kirill Bychkov wrote:
 Hi.
 I've got a simple patch for adding .desktop file in gpsbabel-qt package.
 Chris (maintainer) keeps silence for a week.

share/applications and share/pixmaps should go to PLIST-qt, if at all.
Dont blindly trust make update-plist for that kind of things..

Landry



NEW: ocaml-glpk

2012-04-15 Thread Edd Barrett
Hi,

GLPK bindings for ocaml. See attached.

OK?

-- 
Best Regards
Edd Barrett

http://www.theunixzoo.co.uk


ocaml-glpk.tgz
Description: application/tar-gz


Re: Error building cfengine 3.3.0

2012-04-15 Thread Martijn Rijkeboer
Hallo Okan,

 Let me know of other issues while I get my stuff together...

With your patch for configure and the following makefile it works. The
port is not finished but it runs without problems with my local cfengine
setup. Unfortunately the binaries are not yet static linked.

Kind regards,


Martijn Rijkeboer


# $OpenBSD: Makefile,v 1.38 2011/09/16 11:41:39 espie Exp $

COMMENT=GNU system administration tool for networks

DISTNAME=   cfengine-3.3.0
CATEGORIES= sysutils

HOMEPAGE=   https://www.cfengine.org/

MAINTAINER= Okan Demirmen o...@openbsd.org

# GPLv3
PERMIT_PACKAGE_CDROM=   Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP=   Yes

WANTLIB=c crypto m pthread pcre qdbm

MASTER_SITES=  
${HOMEPAGE}source-code/download?file=${DISTFILES}dummy=/

CONFIGURE_STYLE=gnu

CONFIGURE_ENV+= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib

CONFIGURE_ARGS+=--with-openssl=/usr \
--with-pcre \
--with-qdbm \
--without-mysql \
--without-postgresql \
--disable-shared \
--enable-static \
--enable-fhs

USE_GMAKE = Yes

LIB_DEPENDS=databases/qdbm devel/pcre

.include bsd.port.mk



UPDATE: texworks-0.4.3

2012-04-15 Thread Edd Barrett
Hi,

I have had this in my tree for a while.

There is a minor bug in text selection where text can become invisible.
To work around this, you must turn *off* highlight current line. This
bug has also appeared (where once it was not present) in our in-tree
texworks package too, so its something in QT/X that has changed.

Upstream bug report:
http://code.google.com/p/texworks/issues/detail?can=2start=0num=100q=disappearscolspec=ID%20Type%20Status%20Priority%20Milestone%20Owner%20Summarygroupby=sort=id=569

Anyway, OK?

 
Index: Makefile
===
RCS file: /cvs/ports/editors/texworks/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- Makefile16 Sep 2011 09:48:09 -  1.13
+++ Makefile15 Apr 2012 21:24:45 -
@@ -4,15 +4,13 @@ COMMENT-main =easy to use LaTeX and Co
 COMMENT-python =   Python scripting for TeXworks
 COMMENT-lua =  Lua scripting for TeXworks
 
-V =0.4.0
-DISTNAME = texworks-${V}-r759
+V =0.4.3
+R =858
+DISTNAME = texworks-${V}-r${R}
 
 PKGNAME-main = texworks-${V}
 PKGNAME-lua =  texworks-lua-${V}
 PKGNAME-python =   texworks-python-${V}
-REVISION-main =1
-REVISION-python =  2
-REVISION-lua = 1
 
 WRKDIST =  ${WRKDIR}/texworks-${V}
 
@@ -32,10 +30,18 @@ MODULES =   x11/qt4 \
lang/lua
 
 SHARED_ONLY =  Yes
-WANTLIB += QtDBus QtGui QtScript QtScriptTools QtXml c \
-   hunspell-1.2 m poppler poppler-qt4 pthread stdc++ z
-WANTLIB-lua =  QtCore QtGui QtXml lua m stdc++
-WANTLIB-python =   QtCore QtGui QtXml ${MODPY_WANTLIB} stdc++ m
+
+WANTLIB += ICE QtDBus QtGui QtScript QtScriptTools QtXml SM X11
+WANTLIB += Xext Xi Xinerama Xrender c fontconfig freetype hunspell-1.2
+WANTLIB += m poppler-qt4 pthread stdc++ z
+
+WANTLIB-lua =  lua
+WANTLIB-lua += ICE QtCore QtGui QtXml SM X11 Xext Xi Xinerama Xrender
+WANTLIB-lua += fontconfig freetype m stdc++
+
+WANTLIB-python =  ${MODPY_WANTLIB}
+WANTLIB-python += ICE QtCore QtGui QtXml SM X11 Xext Xi Xinerama Xrender
+WANTLIB-python += fontconfig freetype m stdc++
 
 MULTI_PACKAGES =   -main -lua -python
 
@@ -78,14 +84,13 @@ pre-build:
cd ${PLUGIN_SRC}/TWLuaPlugin  ${MAKE_PROGRAM}

 # install main stuff and then plugins
-INSTALL_PATHS = ${WRKSRC} \
-   ${PLUGIN_SRC}/TWPythonPlugin \
-   ${PLUGIN_SRC}/TWLuaPlugin
-
-# note: install does not depend upon fake env or fake flags
-do-install:
-   for i in ${INSTALL_PATHS}; do \
-   cd $$i  ${MAKE_PROGRAM} -f ${MAKE_FILE} ${FAKE_TARGET}; \
+PLUGIN_INSTALLS =  ${PLUGIN_SRC}/TWPythonPlugin \
+   ${PLUGIN_SRC}/TWLuaPlugin
+
+FAKE_FLAGS +=  INSTALL_ROOT=${WRKINST}
+post-install:
+   for i in ${PLUGIN_INSTALLS}; do \
+   cd $$i  ${MAKE_PROGRAM} -f ${MAKE_FILE} ${FAKE_TARGET} 
INSTALL_ROOT=${WRKINST}; \
done
 
 .include bsd.port.mk
Index: distinfo
===
RCS file: /cvs/ports/editors/texworks/distinfo,v
retrieving revision 1.3
diff -u -p -u -r1.3 distinfo
--- distinfo20 Apr 2011 22:16:25 -  1.3
+++ distinfo15 Apr 2012 21:24:45 -
@@ -1,5 +1,5 @@
-MD5 (texworks-0.4.0-r759.tar.gz) = iq/66ZklO3zOalYxvLoyTA==
-RMD160 (texworks-0.4.0-r759.tar.gz) = PP+93b13cSV2yvmy/6gG53ydicc=
-SHA1 (texworks-0.4.0-r759.tar.gz) = rfhl9jxFfcX3KofHe7Qe70pjVm4=
-SHA256 (texworks-0.4.0-r759.tar.gz) = 
tOSYzHM7pX9i770v0pEZw2g0Lv9xTm6WCyayOvIufk0=
-SIZE (texworks-0.4.0-r759.tar.gz) = 5018740
+MD5 (texworks-0.4.3-r858.tar.gz) = Scj2jb53hDXdlR3/tDs92w==
+RMD160 (texworks-0.4.3-r858.tar.gz) = Ronh6hjz4/LZnQCnpEC0EMs0gOQ=
+SHA1 (texworks-0.4.3-r858.tar.gz) = uiRXpQgjNDjWZkHrayocFkV5Pvg=
+SHA256 (texworks-0.4.3-r858.tar.gz) = 
1e2fkf086lUU8+elW0Y1P8qJDOyNEpJ2a0VmN/xIEHw=
+SIZE (texworks-0.4.3-r858.tar.gz) = 5169890
Index: pkg/PLIST-main
===
RCS file: /cvs/ports/editors/texworks/pkg/PLIST-main,v
retrieving revision 1.1
diff -u -p -u -r1.1 PLIST-main
--- pkg/PLIST-main  20 Apr 2011 22:16:25 -  1.1
+++ pkg/PLIST-main  15 Apr 2012 21:24:45 -
@@ -2,12 +2,105 @@
 @pkgpath editors/texworks
 @bin bin/texworks
 lib/texworks/
-@man man/man1/texworks.1
 share/applications/texworks.desktop
 share/doc/texworks/
 share/doc/texworks/COPYING
+share/doc/texworks/NEWS
 share/doc/texworks/README
+share/man/
+share/man/man1/
+@man share/man/man1/texworks.1
 share/pixmaps/
 share/pixmaps/TeXworks.png
+share/texworks-help/
+share/texworks-help/en/
+share/texworks-help/en/Acknowledgements.html
+share/texworks-help/en/AdvanceduseScripting.html
+share/texworks-help/en/Beyondthismanual.html
+share/texworks-help/en/CompilingTw.html
+share/texworks-help/en/CustomizingTw.html