Re: UPDATE: devel/py-twisted

2009-06-07 Thread vext01
Hi,

On Tue, Jan 20, 2009 at 11:39:53AM +0100, Eric Faurot wrote:
> Hi all,
> 
> This diff updates twisted to 8.2.0.  The most notable change is Web2
> being phased out.  I have reworked the regress target a bit too. 
> 
> Please comments and oks.
> 
> Eric.

Is this related to the error I get when building sthen's new trac
version (patch on the list currently)?

---8<---
# make install   
===>  trac-0.10.5p2 depends on: py-sqlite2-* - not found
===>  Verifying install for py-sqlite2-* in databases/py-sqlite2
===>  Checking files for py-sqlite2-2.5.5
`/usr/ports/distfiles/pysqlite-2.5.5.tar.gz' is up to date.
>> (SHA256) pysqlite-2.5.5.tar.gz: OK
===>  py-sqlite2-2.5.5 depends on: py-sphinx-* - not found
===>  Verifying install for py-sphinx-* in textproc/py-sphinx
===>  Checking files for py-sphinx-0.6.1
`/usr/ports/distfiles/Sphinx-0.6.1.tar.gz' is up to date.
>> (SHA256) Sphinx-0.6.1.tar.gz: OK
===>  py-sphinx-0.6.1 depends on: py-pygments-* - not found
===>  Verifying install for py-pygments-* in textproc/py-pygments
===>  Checking files for py-pygments-1.0p0
`/usr/ports/distfiles/Pygments-1.0.tar.gz' is up to date.
>> (SHA256) Pygments-1.0.tar.gz: OK
===>  py-pygments-1.0p0 depends on: python->=2.5,<2.6 - found
===>  py-pygments-1.0p0 depends on: py-setuptools-* - found
===>  Extracting for py-pygments-1.0p0
===>  Patching for py-pygments-1.0p0
===>  Configuring for py-pygments-1.0p0
===>  Building for py-pygments-1.0p0
running build
running build_py
creating
/usr/ports/textproc/py-pygments/w-py-pygments-1.0p0/Pygments-1.0/lib
creating
/usr/ports/textproc/py-pygments/w-py-pygments-1.0p0/Pygments-1.0/lib/py
gments
copying pygments/style.py ->
/usr/ports/textproc/py-pygments/w-py-pygments-1.0p0
/Pygments-1.0/lib/pygments

...

copying pygments/styles/friendly.py ->
/usr/ports/textproc/py-pygments/w-py-pygm
ents-1.0p0/Pygments-1.0/lib/pygments/styles
running egg_info
Traceback (most recent call last):
  File "./setup.py", line 37, in 
'Operating System :: OS Independent',
  File "/usr/local/lib/python2.5/distutils/core.py", line 151, in setup
dist.run_commands()
  File "/usr/local/lib/python2.5/distutils/dist.py", line 974, in
run_commands
self.run_command(cmd)
  File "/usr/local/lib/python2.5/distutils/dist.py", line 994, in
run_command
cmd_obj.run()
  File "/usr/local/lib/python2.5/distutils/command/build.py", line 112,
in run
self.run_command(cmd_name)
  File "/usr/local/lib/python2.5/distutils/cmd.py", line 333, in
run_command
self.distribution.run_command(command)
  File "/usr/local/lib/python2.5/distutils/dist.py", line 994, in
run_command
cmd_obj.run()
  File
"/usr/local/lib/python2.5/site-packages/setuptools/command/build_py.py", 
line 31, in run
self.build_package_data()
  File
"/usr/local/lib/python2.5/site-packages/setuptools/command/build_py.py", 
line 76, in build_package_data
for package, src_dir, build_dir, filenames in self.data_files:
  File
"/usr/local/lib/python2.5/site-packages/setuptools/command/build_py.py", 
line 39, in __getattr__
self.data_files = files = self._get_data_files(); return files
  File
"/usr/local/lib/python2.5/site-packages/setuptools/command/build_py.py", 
line 44, in _get_data_files
self.analyze_manifest()
  File
"/usr/local/lib/python2.5/site-packages/setuptools/command/build_py.py", 
line 92, in analyze_manifest
self.run_command('egg_info')
  File "/usr/local/lib/python2.5/distutils/cmd.py", line 333, in
run_command
self.distribution.run_command(command)
  File "/usr/local/lib/python2.5/distutils/dist.py", line 994, in
run_command
cmd_obj.run()
  File
"/usr/local/lib/python2.5/site-packages/setuptools/command/egg_info.py", 
line 169, in run
writer = ep.load(installer=installer)
  File "/usr/local/lib/python2.5/site-packages/pkg_resources.py", line
1913, in 
load
entry = __import__(self.module_name, globals(),globals(),
['__name__'])
  File
"/usr/local/lib/python2.5/site-packages/elisa-0.5.33-py2.5.egg/elisa/core
/utils/dist.py", line 30, in 
from elisa.core import config
  File
"/usr/local/lib/python2.5/site-packages/elisa-0.5.33-py2.5.egg/elisa/core
/config.py", line 29, in 
from elisa.core import log
  File
"/usr/local/lib/python2.5/site-packages/elisa-0.5.33-py2.5.egg/elisa/core
/log.py", line 19, in 
from elisa.core.utils.misc import un_camelify
  File
"/usr/local/lib/python2.5/site-packages/elisa-0.5.33-py2.5.egg/elisa/core
/utils/misc.py", line 30, in 
from twisted.internet import defer
ImportError: No module named twisted.internet
*** Error code 1
---8<---
-- 

Best Regards

Edd Barrett
(Freelance software developer / technical writer / open-source developer)

http://students.dec.bmth.ac.uk/ebarrett



can xpdf make a shared object and headers?

2009-06-07 Thread vext01
Hi,

I was wondering if we could get xpdf to make it's own .so and .h's so
that texlive can use them. As it stands every time we find a bug in
xpdf, we must duplicate the patch in tex live.

Thanks

-- 

Best Regards

Edd Barrett
(Freelance software developer / technical writer / open-source developer)

http://students.dec.bmth.ac.uk/ebarrett



Re: can xpdf make a shared object and headers?

2009-06-07 Thread Matthias Kilian
On Sun, Jun 07, 2009 at 05:47:18PM +0100, vex...@gmail.com wrote:
> I was wondering if we could get xpdf to make it's own .so and .h's so
> that texlive can use them. As it stands every time we find a bug in
> xpdf, we must duplicate the patch in tex live.

IMHO it would be a much better idea to nuke xpdf from texlive and
use poppler instead.

Ciao,
Kili



Re: can xpdf make a shared object and headers?

2009-06-07 Thread vext01
Hi,

On Sun, Jun 07, 2009 at 06:58:22PM +0200, Matthias Kilian wrote:
> On Sun, Jun 07, 2009 at 05:47:18PM +0100, vex...@gmail.com wrote:
> > I was wondering if we could get xpdf to make it's own .so and .h's so
> > that texlive can use them. As it stands every time we find a bug in
> > xpdf, we must duplicate the patch in tex live.
> 
> IMHO it would be a much better idea to nuke xpdf from texlive and
> use poppler instead.

I'm looking at that right as we speak actually, but poppler tends to be
a bit "iffy" with renderinf some PDF's. I plan to publish an
experimental SVN snapshot port of TL soon. Let's see how we get on with
that.

For now using poppler with TL is broken. Working with TL team to fix
this.

-- 

Best Regards

Edd Barrett
(Freelance software developer / technical writer / open-source developer)

http://students.dec.bmth.ac.uk/ebarrett



Re: NEW: games/chocolate-doom (update)

2009-06-07 Thread Ryan Freeman
On Sat, Jun 06, 2009 at 12:11:40AM +0200, Peter Hessler wrote:
> Sorry it took so long, but we finally imported this.  Many thanks!.
> 

*jump for joy* ;) thanks Peter, i do realize you guys have a lot more
important things to deal with besides games ports, hence i've been
locally keeping all my goodies until the time is right. happy to see
this one in there! regards,

- ryan

> On 2009 Jan 23 (Fri) at 11:42:27 -0800 (-0800), Ryan Freeman wrote:
> :hi,
> :
> :attached is another new tarball of this new port just updating
> :to version 1.2.1. regards,
> :
> :-ryan
> 
> 
> 
> -- 
> God isn't dead, He's just trying to avoid the draft.
> 



Change request to bsd.port.mk.org

2009-06-07 Thread Cem Kayali


Hello!

Below diff produces a port's license, and license problems of all 
dependencies -if any, including FTP and CDROM. Command to test after 
patching is


# make licence-all

It could be helpfull to see all license issues before compiling a port.

Regards,
Cem




# diff bsd.port.mk bsd.port.mk.org
2693,2717d2692
<
< license-all:
<   @echo "";
<   @echo "It shows package's license and if a dependency is 
not allowed, a warning follows:";

< .for _S in ${MULTI_PACKAGES}
<   @echo "";
<   @echo ${_S} FTP: ${PERMIT_PACKAGE_CDROM${_S}:Q};
<   @echo ${_S} CDROM: ${PERMIT_PACKAGE_CDROM${_S}:Q};
<   @SUBPACKAGE=${_S} ${MAKE} 
all-dir-depends|${_sort_dependencies}|while read subdir; do \

<   ${_flavor_fragment}; \
<   _MASTER_PERMIT_CDROM=${PERMIT_PACKAGE_CDROM${_S}:Q}; \
<   _MASTER_PERMIT_FTP=${PERMIT_PACKAGE_FTP${_S}:Q}; \
<   export _MASTER_PERMIT_CDROM _MASTER_PERMIT_FTP; \
<   eval $$toset ${MAKE} _license-all; \
<   done
< .endfor
<
< _license-all:
< .for _i in FTP CDROM
< .  if ${PERMIT_PACKAGE_${_i}:L} != "yes"
<   @echo >&2 "\tWarning: Dependency ${PKGPATH} is not allowed for 
${_i}: ${PERMIT_PACKAGE_${_i}:L}"

< .  endif
< .endfor
<
<



Re: Change request to bsd.port.mk.org

2009-06-07 Thread Cem Kayali


One of PERMIT_PACKAGE_CDROM should be PERMIT_PACKAGE_FTP

Regards,


# diff bsd.port.mk bsd.port.mk.org
2693,2717d2692
<
< license-all:
<   @echo "";
<   @echo "It shows package's license and if a dependency is 
not allowed, a warning follows:";

< .for _S in ${MULTI_PACKAGES}
<   @echo "";
<   @echo ${_S} FTP: ${PERMIT_PACKAGE_FTP${_S}:Q};
<   @echo ${_S} CDROM: ${PERMIT_PACKAGE_CDROM${_S}:Q};
<   @SUBPACKAGE=${_S} ${MAKE} 
all-dir-depends|${_sort_dependencies}|while read subdir; do \

<   ${_flavor_fragment}; \
<   _MASTER_PERMIT_CDROM=${PERMIT_PACKAGE_CDROM${_S}:Q}; \
<   _MASTER_PERMIT_FTP=${PERMIT_PACKAGE_FTP${_S}:Q}; \
<   export _MASTER_PERMIT_CDROM _MASTER_PERMIT_FTP; \
<   eval $$toset ${MAKE} _license-all; \
<   done
< .endfor
<
< _license-all:
< .for _i in FTP CDROM
< .  if ${PERMIT_PACKAGE_${_i}:L} != "yes"
<   @echo >&2 "\tWarning: Dependency ${PKGPATH} is not allowed for 
${_i}: ${PERMIT_PACKAGE_${_i}:L}"

< .  endif
< .endfor
<
<






Cem Kayali, 06/07/09 20:39:


Hello!

Below diff produces a port's license, and license problems of all 
dependencies -if any, including FTP and CDROM. Command to test after 
patching is


# make licence-all

It could be helpfull to see all license issues before compiling a port.

Regards,
Cem




# diff bsd.port.mk bsd.port.mk.org
2693,2717d2692
<
< license-all:
<   @echo "";
<   @echo "It shows package's license and if a dependency 
is not allowed, a warning follows:";

< .for _S in ${MULTI_PACKAGES}
<   @echo "";
<   @echo ${_S} FTP: ${PERMIT_PACKAGE_CDROM${_S}:Q};
<   @echo ${_S} CDROM: ${PERMIT_PACKAGE_CDROM${_S}:Q};
<   @SUBPACKAGE=${_S} ${MAKE} 
all-dir-depends|${_sort_dependencies}|while read subdir; do \

<   ${_flavor_fragment}; \
<   _MASTER_PERMIT_CDROM=${PERMIT_PACKAGE_CDROM${_S}:Q}; \
<   _MASTER_PERMIT_FTP=${PERMIT_PACKAGE_FTP${_S}:Q}; \
<   export _MASTER_PERMIT_CDROM _MASTER_PERMIT_FTP; \
<   eval $$toset ${MAKE} _license-all; \
<   done
< .endfor
<
< _license-all:
< .for _i in FTP CDROM
< .  if ${PERMIT_PACKAGE_${_i}:L} != "yes"
<   @echo >&2 "\tWarning: Dependency ${PKGPATH} is not allowed for 
${_i}: ${PERMIT_PACKAGE_${_i}:L}"

< .  endif
< .endfor
<
<






Re: can xpdf make a shared object and headers?

2009-06-07 Thread Predrag Punosevac
Matthias Kilian  wrote:

> On Sun, Jun 07, 2009 at 05:47:18PM +0100, vex...@gmail.com wrote:
> > I was wondering if we could get xpdf to make it's own .so and .h's so
> > that texlive can use them. As it stands every time we find a bug in
> > xpdf, we must duplicate the patch in tex live.
>
> IMHO it would be a much better idea to nuke xpdf from texlive and
> use poppler instead.
>
> Ciao,
>   Kili
I would not be rushing so much to ditch xpdf. I know of at least 
couple packages from TeXLive that do not interact well with poppler.
Also epdfviewer has much to be desired about. Full screen mode doesn't
interact well with CWM for instance. Epdfviewer doesn't support LPD 
spooling system as well. For me personally with all its draw backs 
xpdf is the pdf viewer for Unix. 



Re: can xpdf make a shared object and headers?

2009-06-07 Thread vext01
On Sun, Jun 07, 2009 at 03:06:05PM -0400, Predrag Punosevac wrote:
> I would not be rushing so much to ditch xpdf. I know of at least 
> couple packages from TeXLive that do not interact well with poppler.
> Also epdfviewer has much to be desired about. Full screen mode doesn't
> interact well with CWM for instance. Epdfviewer doesn't support LPD 
> spooling system as well. For me personally with all its draw backs 
> xpdf is the pdf viewer for Unix. 

There is no PDF viewer in TL, I think it is just used for PDF synthesis
and decoding in tools like pdf2ps. I will CC you when I post the
"testing" port (if thats OK with you. You are one of the frequent TL
testers anyway :P).

-- 

Best Regards

Edd Barrett
(Freelance software developer / technical writer / open-source developer)

http://students.dec.bmth.ac.uk/ebarrett



[UPDATE] archivers/p7zip

2009-06-07 Thread Josh Grosse
>From version 4.65 to version 9.04.

Fixes, enhancements, and a change to version numbering  to match "7zip" 
application.

No regressions on i386.

-
Changelog: 
--

Version 9.04 (Major bugfixes and Major enhancements) 


  - From Windows version of 7-zip 9.04 :
- 7-Zip now can update solid .7z archives.
- 7-Zip now supports LZMA2 compression method.
- 7-Zip now supports XZ archives.
- 7-Zip now can unpack NTFS, FAT, VHD and MBR archives.
- 7-Zip now can unpack GZip, BZip2, LZMA, XZ and TAR archives from stdin.
- New -scrc switch to calculate total CRC-32 during extracting / testing.
- Some bugs were fixed.

-

Index: Makefile
===
RCS file: /cvs/ports/archivers/p7zip/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- Makefile15 Feb 2009 08:02:19 -  1.10
+++ Makefile7 Jun 2009 18:47:55 -
@@ -5,7 +5,7 @@
 COMMENT-main=  file archiver with high compression ratio
 COMMENT-rar=   rar modules for p7zip
 
-V= 4.65
+V= 9.04
 DISTNAME=  p7zip_${V}_src_all
 PKGNAME=   p7zip-${V}
 PKGNAME-main=  p7zip-${V}
Index: distinfo
===
RCS file: /cvs/ports/archivers/p7zip/distinfo,v
retrieving revision 1.9
diff -u -r1.9 distinfo
--- distinfo15 Feb 2009 08:02:19 -  1.9
+++ distinfo7 Jun 2009 18:48:55 -
@@ -1,5 +1,5 @@
-MD5 (p7zip_4.65_src_all.tar.bz2) = 947SMkNtyPi+JaL5XU5fmg==
-RMD160 (p7zip_4.65_src_all.tar.bz2) = F0kDLBbnxa+qebwSPbM9YazHnro=
-SHA1 (p7zip_4.65_src_all.tar.bz2) = mI9uxj6T5uwjSS/TnjtIpY/WldE=
-SHA256 (p7zip_4.65_src_all.tar.bz2) = 
aRzJQZpzqTSDGfWyw7omVUcb7gUsbH+leiJoAMiasH8=
-SIZE (p7zip_4.65_src_all.tar.bz2) = 2501418
+MD5 (p7zip_9.04_src_all.tar.bz2) = kZTr+aKzc10jau0AHeX2+A==
+RMD160 (p7zip_9.04_src_all.tar.bz2) = LZyvgd0/wDhEG+fh5ZKpcqERTfc=
+SHA1 (p7zip_9.04_src_all.tar.bz2) = ZDD806XhbQow8e6/NKCF5TcrgTs=
+SHA256 (p7zip_9.04_src_all.tar.bz2) = 
3fu2eVoUvKsfliIJb+k4XCObQ8P2qagNhQIYSfc4+as=
+SIZE (p7zip_9.04_src_all.tar.bz2) = 3759021



@newuser question

2009-06-07 Thread patrick keshishian
Hi,

Just trying to see what other ports do with @newuser, it seems that
some use /nonexistent and some /var/empty for the user's home
directory. What is the preferred home directory to use for a daemon?

Also, when submitting the port, should a diff of user.list be
included? Otherwise, how does one request a user-id for the new port?

--patrick



Re: can xpdf make a shared object and headers?

2009-06-07 Thread Martin Schröder
2009/6/7, vex...@gmail.com :
> There is no PDF viewer in TL, I think it is just used for PDF synthesis
>  and decoding in tools like pdf2ps. I will CC you when I post the

Only for reading pdfs. debian has been using poppler with pdftex for
years.

Best
   Martin (pdftex developer)



UPDATE: Bochs 2.4.1

2009-06-07 Thread Brad
Here is an update to Bochs 2.4.1. Please test if you use Bochs.


Index: Makefile
===
RCS file: /cvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile16 Jul 2008 20:31:33 -  1.43
+++ Makefile8 Jun 2009 00:52:54 -
@@ -1,11 +1,9 @@
 # $OpenBSD: Makefile,v 1.43 2008/07/16 20:31:33 brad Exp $
-# $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $
 
 COMMENT=   x86 machine simulator
 
-DISTNAME=  bochs-2.3.7
+DISTNAME=  bochs-2.4.1
 CATEGORIES=emulators
-
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bochs/}
 
 HOMEPAGE=  http://bochs.sourceforge.net/
@@ -15,7 +13,6 @@ PERMIT_PACKAGE_CDROM= Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-
 WANTLIB=   c m stdc++ termlib
 
 USE_LIBTOOL=   Yes
@@ -27,16 +24,17 @@ CONFIGURE_ARGS+= --enable-acpi \
 --enable-pci \
 --enable-smp \
 --enable-x86-64 \
+--enable-usb \
+--enable-usb-ohci \
 --with-term
 
 FLAVORS=   debug no_x11
 FLAVOR?=
 
 .if ${FLAVOR:L:Mdebug}
-CONFIGURE_ARGS+= --enable-debugger \
---enable-disasm \
+CONFIGURE_ARGS+= --disable-debugger-gui \
+--enable-debugger \
 --enable-x86-debugger \
---enable-port-e9-hack \
 --enable-readline
 WANTLIB+=  curses readline
 .endif
@@ -51,21 +49,9 @@ WANTLIB+=ICE SM X11 Xau Xdmcp
 
 NO_REGRESS=Yes
 
-BIOS += BIOS-bochs-latest
-BIOS += VGABIOS-elpin-2.40 VGABIOS-elpin-LICENSE
-BIOS += VGABIOS-lgpl-latest VGABIOS-lgpl-README
-BIOS += VGABIOS-lgpl-latest-cirrus VGABIOS-lgpl-latest-cirrus-debug
-
-BINS+= bochs bxcommit bximage
-
-do-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/bochs
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bochs
-   cd ${WRKBUILD}; ${INSTALL_PROGRAM} ${BINS} ${PREFIX}/bin
-   cd ${WRKSRC}/bios; ${INSTALL_DATA} ${BIOS} ${PREFIX}/share/bochs
-   ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1
-   ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${PREFIX}/man/man5
+post-install:
${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${PREFIX}/share/doc/bochs
-   ${INSTALL_DATA} ${WRKSRC}/.bochsrc ${PREFIX}/share/bochs/bochsrc
+   @mv ${PREFIX}/share/doc/bochs/bochsrc-sample.txt \
+   ${PREFIX}/share/bochs/bochsrc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/emulators/bochs/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo16 Jul 2008 20:31:33 -  1.11
+++ distinfo8 Jun 2009 00:31:33 -
@@ -1,5 +1,5 @@
-MD5 (bochs-2.3.7.tar.gz) = ouX5IlBb8Wyr02u51XGixA==
-RMD160 (bochs-2.3.7.tar.gz) = tMnLjnd8TkhPZTCFeDvOlkWAT+A=
-SHA1 (bochs-2.3.7.tar.gz) = 5ofGl6i+g5audRBtDNYUm9Uspn0=
-SHA256 (bochs-2.3.7.tar.gz) = d/J/7a3GQx3woG7iJiWagEQ1JK6dIhyXxZhuP3knuwQ=
-SIZE (bochs-2.3.7.tar.gz) = 3989982
+MD5 (bochs-2.4.1.tar.gz) = yar0uZyGjafJNivYzSmleA==
+RMD160 (bochs-2.4.1.tar.gz) = wbcbpPbO+HEKpmpeaGLHzK8T1+s=
+SHA1 (bochs-2.4.1.tar.gz) = gKhbt7hZgphhXbEhbEqMNZdmYwk=
+SHA256 (bochs-2.4.1.tar.gz) = 1P1j4yiHDYqUUtg5fIOilbCT1dFYOG0e+bmPFh9SCrM=
+SIZE (bochs-2.4.1.tar.gz) = 4046505
Index: patches/patch-_bochsrc
===
RCS file: /cvs/ports/emulators/bochs/patches/patch-_bochsrc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-_bochsrc
--- patches/patch-_bochsrc  16 Jul 2008 20:31:33 -  1.3
+++ patches/patch-_bochsrc  17 May 2009 18:24:33 -
@@ -1,9 +1,9 @@
 $OpenBSD: patch-_bochsrc,v 1.3 2008/07/16 20:31:33 brad Exp $
 .bochsrc.orig  Fri May 30 17:00:05 2008
-+++ .bochsrc   Wed Jul 16 15:01:44 2008
-@@ -197,13 +197,13 @@ vga: extension=vbe
- # such as a: or b: as the path.  The parameter 'image' works with image files
- # only. In that case the size must match one of the supported types.
+--- .bochsrc.orig  Thu Apr 30 15:04:42 2009
 .bochsrc   Sun May 17 14:24:26 2009
+@@ -220,13 +220,13 @@ vga: extension=vbe
+ # The parameter 'type' can be used to enable the floppy drive without media
+ # and status specified. Usually the drive type is set up based on the media 
type.
  #===
 -floppya: 1_44=/dev/fd0, status=inserted
 +#floppya: 1_44=/dev/fd0, status=inserted
@@ -17,7 +17,7 @@ $OpenBSD: patch-_bochsrc,v 1.3 2008/07/1
  
  #===
  # FLOPPYB:
-@@ -334,7 +334,7 @@ boot: disk
+@@ -364,7 +364,7 @@ boot: disk
  # 
  # Default value are sync=none, time0=local
  #===
@@ -26,7 +26,7 @@ $OpenBSD: patch-_bochsrc,v 1.3 2008/07/1
  
  
  #==

Re: UPDATE: Bochs 2.4.1

2009-06-07 Thread Brad
On Sun, Jun 07, 2009 at 09:08:06PM -0400, Brad wrote:
> Here is an update to Bochs 2.4.1. Please test if you use Bochs.

oops. missed adding a patch before creating the diff.


Index: Makefile
===
RCS file: /cvs/ports/emulators/bochs/Makefile,v
retrieving revision 1.43
diff -u -p -r1.43 Makefile
--- Makefile16 Jul 2008 20:31:33 -  1.43
+++ Makefile8 Jun 2009 00:52:54 -
@@ -1,11 +1,9 @@
 # $OpenBSD: Makefile,v 1.43 2008/07/16 20:31:33 brad Exp $
-# $NetBSD: Makefile,v 1.2 1998/09/22 06:11:36 garbled Exp $
 
 COMMENT=   x86 machine simulator
 
-DISTNAME=  bochs-2.3.7
+DISTNAME=  bochs-2.4.1
 CATEGORIES=emulators
-
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=bochs/}
 
 HOMEPAGE=  http://bochs.sourceforge.net/
@@ -15,7 +13,6 @@ PERMIT_PACKAGE_CDROM= Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
-
 WANTLIB=   c m stdc++ termlib
 
 USE_LIBTOOL=   Yes
@@ -27,16 +24,17 @@ CONFIGURE_ARGS+= --enable-acpi \
 --enable-pci \
 --enable-smp \
 --enable-x86-64 \
+--enable-usb \
+--enable-usb-ohci \
 --with-term
 
 FLAVORS=   debug no_x11
 FLAVOR?=
 
 .if ${FLAVOR:L:Mdebug}
-CONFIGURE_ARGS+= --enable-debugger \
---enable-disasm \
+CONFIGURE_ARGS+= --disable-debugger-gui \
+--enable-debugger \
 --enable-x86-debugger \
---enable-port-e9-hack \
 --enable-readline
 WANTLIB+=  curses readline
 .endif
@@ -51,21 +49,9 @@ WANTLIB+=ICE SM X11 Xau Xdmcp
 
 NO_REGRESS=Yes
 
-BIOS += BIOS-bochs-latest
-BIOS += VGABIOS-elpin-2.40 VGABIOS-elpin-LICENSE
-BIOS += VGABIOS-lgpl-latest VGABIOS-lgpl-README
-BIOS += VGABIOS-lgpl-latest-cirrus VGABIOS-lgpl-latest-cirrus-debug
-
-BINS+= bochs bxcommit bximage
-
-do-install:
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/bochs
-   ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/bochs
-   cd ${WRKBUILD}; ${INSTALL_PROGRAM} ${BINS} ${PREFIX}/bin
-   cd ${WRKSRC}/bios; ${INSTALL_DATA} ${BIOS} ${PREFIX}/share/bochs
-   ${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${PREFIX}/man/man1
-   ${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${PREFIX}/man/man5
+post-install:
${INSTALL_DATA} ${WRKSRC}/docs-html/*.html ${PREFIX}/share/doc/bochs
-   ${INSTALL_DATA} ${WRKSRC}/.bochsrc ${PREFIX}/share/bochs/bochsrc
+   @mv ${PREFIX}/share/doc/bochs/bochsrc-sample.txt \
+   ${PREFIX}/share/bochs/bochsrc
 
 .include 
Index: distinfo
===
RCS file: /cvs/ports/emulators/bochs/distinfo,v
retrieving revision 1.11
diff -u -p -r1.11 distinfo
--- distinfo16 Jul 2008 20:31:33 -  1.11
+++ distinfo8 Jun 2009 00:31:33 -
@@ -1,5 +1,5 @@
-MD5 (bochs-2.3.7.tar.gz) = ouX5IlBb8Wyr02u51XGixA==
-RMD160 (bochs-2.3.7.tar.gz) = tMnLjnd8TkhPZTCFeDvOlkWAT+A=
-SHA1 (bochs-2.3.7.tar.gz) = 5ofGl6i+g5audRBtDNYUm9Uspn0=
-SHA256 (bochs-2.3.7.tar.gz) = d/J/7a3GQx3woG7iJiWagEQ1JK6dIhyXxZhuP3knuwQ=
-SIZE (bochs-2.3.7.tar.gz) = 3989982
+MD5 (bochs-2.4.1.tar.gz) = yar0uZyGjafJNivYzSmleA==
+RMD160 (bochs-2.4.1.tar.gz) = wbcbpPbO+HEKpmpeaGLHzK8T1+s=
+SHA1 (bochs-2.4.1.tar.gz) = gKhbt7hZgphhXbEhbEqMNZdmYwk=
+SHA256 (bochs-2.4.1.tar.gz) = 1P1j4yiHDYqUUtg5fIOilbCT1dFYOG0e+bmPFh9SCrM=
+SIZE (bochs-2.4.1.tar.gz) = 4046505
Index: patches/patch-Makefile_in
===
RCS file: patches/patch-Makefile_in
diff -N patches/patch-Makefile_in
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-Makefile_in   17 May 2009 21:42:56 -
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- Makefile.in.orig   Sun May 17 17:37:48 2009
 Makefile.inSun May 17 17:42:46 2009
+@@ -391,8 +391,8 @@ install_docbook: build_docbook
+ install_man::
+   -mkdir -p $(DESTDIR)$(man1dir)
+   -mkdir -p $(DESTDIR)$(man5dir)
+-  for i in $(MAN_PAGE_1_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED) 
's/@version@/$(VERSION)/g' | $(GZIP_BIN) -c >  $(DESTDIR)$(man1dir)/$$i.1.gz; 
chmod 644 $(DESTDIR)$(man1dir)/$$i.1.gz; done
+-  for i in $(MAN_PAGE_5_LIST); do cat $(srcdir)/doc/man/$$i.5 | 
$(GZIP_BIN) -c >  $(DESTDIR)$(man5dir)/$$i.5.gz; chmod 644 
$(DESTDIR)$(man5dir)/$$i.5.gz; done
++  for i in $(MAN_PAGE_1_LIST); do cat $(srcdir)/doc/man/$$i.1 | $(SED) 
's/@version@/$(VERSION)/g' > $(DESTDIR)$(man1dir)/$$i.1; chmod 644 
$(DESTDIR)$(man1dir)/$$i.1; done
++  for i in $(MAN_PAGE_5_LIST); do cat $(srcdir)/doc/man/$$i.5 > 
$(DESTDIR)$(man5dir)/$$i.5; chmod 644 $(DESTDIR)$(man5dir)/$$i.5; done
+ 
+ download_dlx: $(DLXLINUX_TAR)
+ 
Index: patches/patch-_bochsrc
===
RCS file: /cvs/ports/emulators/bochs/patches/patch-_bochsrc,v
retrieving revision 1.3
diff -u -p -r1.3 patch-_bochsrc
--- patches/patch-_bochsrc  16 Ju

Re: @newuser question

2009-06-07 Thread Stuart Henderson
On 2009/06/07 12:56, patrick keshishian wrote:
> Just trying to see what other ports do with @newuser, it seems that
> some use /nonexistent and some /var/empty for the user's home
> directory. What is the preferred home directory to use for a daemon?

imho: usually /nonexistent unless the port has a daemon which
chroot()s to its home directory and doesn't write to it (since
we don't want random crap in /var/empty).

> Also, when submitting the port, should a diff of user.list be
> included? Otherwise, how does one request a user-id for the new port?

a diff for user.list probably isn't necessary but won't hurt.
adding a big reminder to the message text is very welcome :)



use setusercontext in apache2 suexec

2009-06-07 Thread Claudio Jeker
Use setusercontext() instead of the setgid/setuid dance now. This makes
suexec2 do the same thing as the in tree suexec. Idea by f...@.
I fluked on the auto configuration stuff -- that's a rabbit hole I don't
even want to get close to.

-- 
:wq Claudio

Index: Makefile
===
RCS file: /cvs/ports/www/apache-httpd/Makefile,v
retrieving revision 1.20
diff -u -p -r1.20 Makefile
--- Makefile15 May 2009 15:46:58 -  1.20
+++ Makefile8 Jun 2009 03:17:40 -
@@ -3,7 +3,7 @@
 COMMENT=   apache HTTP server
 
 V= 2.2.11
-PKGNAME=   apache-httpd-${V}p0
+PKGNAME=   apache-httpd-${V}p1
 DISTNAME=  httpd-${V}
 
 CATEGORIES=www net
Index: patches/patch-support_suexec_c
===
RCS file: patches/patch-support_suexec_c
diff -N patches/patch-support_suexec_c
--- /dev/null   1 Jan 1970 00:00:00 -
+++ patches/patch-support_suexec_c  8 Jun 2009 03:16:26 -
@@ -0,0 +1,38 @@
+$OpenBSD$
+--- support/suexec.c.orig  Mon Jun  8 05:07:11 2009
 support/suexec.c   Mon Jun  8 05:16:15 2009
+@@ -55,6 +55,12 @@
+ #include 
+ #endif
+ 
++#define USE_SETUSERCONTEXT
++
++#if defined(USE_SETUSERCONTEXT)
++#include 
++#endif
++
+ /*
+  ***
+  * There is no initgroups() in QNX, so I believe this is safe :-)
+@@ -466,6 +472,13 @@ int main(int argc, char *argv[])
+ exit(108);
+ }
+ 
++#if defined(USE_SETUSERCONTEXT)
++  if (setusercontext(NULL, pw, uid,
++  LOGIN_SETALL & ~(LOGIN_SETLOGIN | LOGIN_SETPATH)) != 0) {
++  log_err("emerg: failed to setusercontext (%u: %s)\n", uid, cmd);
++  exit(110);
++  }
++#else
+ /*
+  * Change UID/GID here so that the following tests work over NFS.
+  *
+@@ -484,6 +497,7 @@ int main(int argc, char *argv[])
+ log_err("failed to setuid (%ld: %s)\n", uid, cmd);
+ exit(110);
+ }
++#endif
+ 
+ /*
+  * Get the current working directory, as well as the proper



Re: @newuser question

2009-06-07 Thread patrick keshishian
On Sun, Jun 7, 2009 at 8:05 PM, Stuart Henderson wrote:
> On 2009/06/07 12:56, patrick keshishian wrote:
>> Just trying to see what other ports do with @newuser, it seems that
>> some use /nonexistent and some /var/empty for the user's home
>> directory. What is the preferred home directory to use for a daemon?
>
> imho: usually /nonexistent unless the port has a daemon which
> chroot()s to its home directory and doesn't write to it (since
> we don't want random crap in /var/empty).

Thanks Stuart for the reply. One more questions if you don't mind.
Just want to make sure I'm doing this port thing correctly.

Is there any specific convention for user/group names for ports? The
port I'm making if for a pptp client, should the user/group I choose
reflect the name of the port/package or is _pptp sufficient?

I looked for examples, and I see obvious ones such as _cups for
print/cups and _mysql for database/mysql, but then i also see _news
for news/leafnode and _ups for sysutils/nut.

Thanks,
--patrick


>> Also, when submitting the port, should a diff of user.list be
>> included? Otherwise, how does one request a user-id for the new port?
>
> a diff for user.list probably isn't necessary but won't hurt.
> adding a big reminder to the message text is very welcome :)



UPDATE: Transcode 1.1.2

2009-06-07 Thread Brad
Here is an update to Transcode 1.1.2.

Please test if you use Transcode.


Index: Makefile
===
RCS file: /cvs/ports/multimedia/transcode/Makefile,v
retrieving revision 1.22
diff -u -p -r1.22 Makefile
--- Makefile11 Mar 2009 09:29:33 -  1.22
+++ Makefile8 Jun 2009 05:40:03 -
@@ -4,9 +4,10 @@ SHARED_ONLY=   Yes
 
 COMMENT=   video stream processing tools
 
-DISTNAME=  transcode-1.0.5
-PKGNAME=   ${DISTNAME}p2
+DISTNAME=  transcode-1.1.2
 CATEGORIES=multimedia
+MASTER_SITES=  ${MASTER_SITE_BERLIOS:=tcforge/}
+EXTRACT_SUFX=  .tar.bz2
 
 HOMEPAGE=  http://www.transcoding.org/
 
@@ -15,15 +16,10 @@ PERMIT_PACKAGE_CDROM=   Yes
 PERMIT_PACKAGE_FTP=Yes
 PERMIT_DISTFILES_CDROM=Yes
 PERMIT_DISTFILES_FTP=  Yes
+WANTLIB+=  ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xrandr Xrender Xt \
+   Xv bz2 c faad freetype m pthread sndio usbhid z
 
-WANTLIB += ICE SM X11 Xau Xaw Xdmcp Xext Xpm Xrandr Xrender Xt
-WANTLIB += Xv c faac faad freetype m pthread sndio usbhid x264
-WANTLIB += z
-
-MASTER_SITES=  http://fromani.exit1.org/
-EXTRACT_SUFX=  .tar.bz2
-
-FLAVORS=   lzo mjpegtools quicktime altivec
+FLAVORS=   mjpegtools quicktime altivec
 FLAVOR?=
 
 .if ${MACHINE_ARCH} == "i386"
@@ -31,30 +27,31 @@ PKG_ARGS+=  -Di386=1
 .else
 PKG_ARGS+= -Di386=0
 .endif
+
 .if ${MACHINE_ARCH} == "sparc64"
 PATCH_LIST=patch-* gcc-*
 .endif
 
 LIB_DEPENDS=   SDL.>=2::devel/sdl \
a52::audio/liba52 \
-   avcodec.>=10,avutil.>=4::graphics/ffmpeg \
+   
avcodec.>=10,avformat.>=12,avutil.>=4,postproc.>=6::graphics/ffmpeg \
dv.>=4::multimedia/libdv \
dvdread.>=3::devel/libdvdread \
iconv.>=4::converters/libiconv \
jpeg.>=62::graphics/jpeg \
mp3lame::audio/lame \
+   faac::audio/faac \
mpeg2,mpeg2convert::graphics/libmpeg2 \
ogg.>=5::audio/libogg \
-   postproc.>=6::graphics/ffmpeg \
theora.>=1::multimedia/libtheora \

vorbis.>=3,vorbisenc.>=2,vorbisfile.>=4::audio/libvorbis \
-   xml2.>=8::textproc/libxml
+   xml2.>=8::textproc/libxml \
+   x264::multimedia/x264
 
 RUN_DEPENDS=   ::graphics/ffmpeg \
::audio/sox \
::audio/vorbis-tools \
::audio/toolame \
-   ::multimedia/xvidcore \
::x11/mplayer
 
 SEPARATE_BUILD=concurrent
@@ -62,7 +59,8 @@ SEPARATE_BUILD=   concurrent
 USE_X11=   Yes
 USE_LIBTOOL=   Yes
 LIBTOOL_FLAGS+=--tag=disable-static
-CONFIGURE_STYLE=   gnu
+CONFIGURE_STYLE=   autoconf
+AUTOCONF_VERSION=  2.61
 CONFIGURE_ENV+=CPPFLAGS="-I${LOCALBASE}/include 
-I${X11BASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LIBAVCODEC_EXTRA_LIBS="-pthread"
@@ -75,6 +73,7 @@ CONFIGURE_ARGS+=  ${CONFIGURE_SHARED} \
--enable-a52 \
--enable-a52-default-decoder \
--enable-bktr \
+   --enable-faac \
--enable-freetype2 \
--enable-lame \
--enable-libdv \
@@ -88,15 +87,7 @@ CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \
--enable-sunau \
--enable-theora \
--enable-vorbis \
-   
--with-libpostproc-includes="${LOCALBASE}/include/libpostproc"
-
-.if ${FLAVOR:L:Mlzo}
-CONFIGURE_ARGS+=   --enable-lzo
-LIB_DEPENDS+=  lzo.>=1::archivers/lzo
-PKG_ARGS+= -Dlzo=1
-.else
-PKG_ARGS+= -Dlzo=0
-.endif
+   --enable-x264
 
 .if ${FLAVOR:L:Mmjpegtools}
 CONFIGURE_ARGS+=   --enable-mjpegtools
@@ -110,7 +101,7 @@ PKG_ARGS+=  -Dmjpegtools=0
 .if ${FLAVOR:L:Mquicktime}
 CONFIGURE_ARGS+=   --enable-libquicktime
 LIB_DEPENDS+=  quicktime::multimedia/libquicktime
-WANTLIB+=  GL intl
+WANTLIB+=  intl
 PKG_ARGS+= -Dquicktime=1
 .else
 PKG_ARGS+= -Dquicktime=0
Index: distinfo
===
RCS file: /cvs/ports/multimedia/transcode/distinfo,v
retrieving revision 1.5
diff -u -p -r1.5 distinfo
--- distinfo26 Jan 2008 02:17:50 -  1.5
+++ distinfo8 Jun 2009 03:40:33 -
@@ -1,5 +1,5 @@
-MD5 (transcode-1.0.5.tar.bz2) = Ek