pkgsrc-Bugs archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
pkg/40457: Diffs for various minor pkgsrc-2008Q4 fixes
>Number: 40457
>Category: pkg
>Synopsis: Diffs for various minor pkgsrc-2008Q4 fixes
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: pkg-manager
>State: open
>Class: sw-bug
>Submitter-Id: net
>Arrival-Date: Fri Jan 23 07:25:00 +0000 2009
>Originator: Matthew Mondor
>Release: NetBSD 5.0_BETA, pkgsrc-2008Q4
>Organization:
>Environment:
NetBSD hal.xisop 5.0_BETA NetBSD 5.0_BETA (GENERIC_MM) #1: Thu Jan 1 22:39:44
EST 2009 root%hal.xisop@localhost:/usr/obj/sys/arch/i386/compile/GENERIC_MM
i386
Architecture: i386
Machine: i386
>Description:
Although pkgsrc-2008Q4 wasn't officially released yet, I used it
to build my packages after upgrading a test box to track netbsd-5.
Here are minor fixes I had to apply to various packages for them
to successfully build.
Because the changes are minor, and that there are a number of
packages, I thought that it would be best to put them all here
together for an expeienced pkgsrc developer to review.
>How-To-Repeat:
>Fix:
db4 failed to build in some C++ code when building the rarely used RPC
code. This could potentially eventually be put as an option, but the
package was building it with --enable-rpc by default.
Index: databases/db4/Makefile
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/databases/db4/Makefile,v
retrieving revision 1.56
diff -u -r1.56 Makefile
--- databases/db4/Makefile 7 Sep 2008 11:27:08 -0000 1.56
+++ databases/db4/Makefile 10 Jan 2009 20:29:14 -0000
@@ -31,7 +31,7 @@
CONFIGURE_SCRIPT= ../dist/configure
CONFIGURE_ARGS+= --enable-cxx
-CONFIGURE_ARGS+= --enable-rpc
+#CONFIGURE_ARGS+= --enable-rpc
CONFIGURE_ARGS+= --enable-compat185
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db4
CONFIGURE_ARGS+= --program-transform-name=s,db_,db4_,
Index: databases/db4/PLIST
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/databases/db4/PLIST,v
retrieving revision 1.13
diff -u -r1.13 PLIST
--- databases/db4/PLIST 6 Sep 2008 20:53:51 -0000 1.13
+++ databases/db4/PLIST 10 Jan 2009 20:29:32 -0000
@@ -1,5 +1,4 @@
@comment $NetBSD: PLIST,v 1.13 2008/09/06 20:53:51 wiz Exp $
-bin/berkeley_db4_svc
bin/db4_archive
bin/db4_checkpoint
bin/db4_codegen
NSPR required an older autoconf to build, and the Makefile already
was fixed to require said autoconf; yet it still invoked the new
autoconf rather than the old one, which requires the version suffix.
Index: devel/nspr/Makefile
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/devel/nspr/Makefile,v
retrieving revision 1.27
diff -u -r1.27 Makefile
--- devel/nspr/Makefile 26 May 2008 02:13:17 -0000 1.27
+++ devel/nspr/Makefile 10 Jan 2009 21:11:14 -0000
@@ -70,7 +70,7 @@
${CHMOD} -x ${WRKSRC}/pr/include/prvrsion.h
pre-configure:
- cd ${WRKSRC} && autoconf
+ cd ${WRKSRC} && autoconf-2.13
do-install:
(cd ${WRKSRC}/build/dist/include && pax -Lrwpe .
${DESTDIR}${PREFIX}/include/ )
I'm not sure of the proper variable or fix to use here, netbsd-5 was installed
with in-base xorg, and no X11 related options are in mk.conf. It somehow
couldn't find the path to glut, which is part of base xorg. This hack worked
for me yet is not a proper solution.
Index: graphics/cal3d-examples/Makefile
===================================================================
RCS file:
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/graphics/cal3d-examples/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- graphics/cal3d-examples/Makefile 26 May 2008 02:13:20 -0000 1.15
+++ graphics/cal3d-examples/Makefile 15 Jan 2009 21:54:08 -0000
@@ -14,7 +14,7 @@
USE_TOOLS+= automake pax
CONFIGURE_ARGS+= --with-cal3d=${PREFIX:Q}
-CONFIGURE_ARGS+= --with-glut=${PREFIX:Q}
+CONFIGURE_ARGS+= --with-glut=/usr/X11R7
CONFIGURE_DIRS= ${WRKSRC}/examples/cally \
${WRKSRC}/examples/miniviewer_gl \
${WRKSRC}/tools/converter
The following failed to build only because the bootstrap SBCL couldn't
be downloaded, as it didn't yet exist on the maintainer's site.
This fix isn't a proper solution, but since my kernel was built with
COMPAT_4 support I forced it to use an SBCL built for 4.0 as bootstrap.
I now have a working SBCL for 5.0 which may be used to bootstrap for 5.0,
if the maintainer is interested.
Index: lang/sbcl/Makefile
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/lang/sbcl/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- lang/sbcl/Makefile 25 Jun 2008 23:42:19 -0000 1.18
+++ lang/sbcl/Makefile 16 Jan 2009 08:03:18 -0000
@@ -4,12 +4,12 @@
DISTNAME= ${PKGNAME_NOREV}-source
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
- sbcl-${OPSYS}-${MACHINE_ARCH}-${OS_VERSION}.tgz
+ sbcl-${OPSYS}-${MACHINE_ARCH}-4.0.tgz
PKGNAME= sbcl-1.0.16
CATEGORIES= lang
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=sbcl/}
EXTRACT_SUFX= .tar.bz2
-SITES.sbcl-${OPSYS}-${MACHINE_ARCH}-${OS_VERSION}.tgz= \
+SITES.sbcl-${OPSYS}-${MACHINE_ARCH}-4.0.tgz= \
ftp://ftp.NetBSD.org/pub/NetBSD/misc/jonb/sbcl/
MAINTAINER= jonb%NetBSD.org@localhost
Interestingly bogofilter configure script complained that "a proper libdb"
couldn't be found. Making it use db4 worked for me.
Index: mail/bogofilter/options.mk
===================================================================
RCS file:
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/mail/bogofilter/options.mk,v
retrieving revision 1.3
diff -u -r1.3 options.mk
--- mail/bogofilter/options.mk 12 Apr 2008 22:43:03 -0000 1.3
+++ mail/bogofilter/options.mk 14 Jan 2009 18:01:47 -0000
@@ -8,7 +8,7 @@
.include "../../mk/bsd.options.mk"
.if !empty(PKG_OPTIONS:Mdb4)
-CONFIGURE_ARGS+= --with-database=db
+CONFIGURE_ARGS+= --with-database=db4
.include "../../databases/db4/buildlink3.mk"
BUILDLINK_TRANSFORM+= l:db:db4
.endif
This was also part of a now-closed PR, but it seems it never was applied.
It adds options to mplayer so that it doesn't fail to build when it detects
the existence of these libraries: speex and lzo. Interestingly, it also
fails to build if ncurses is installed, unless built with the ncurses option,
because of conflicts with in-base curses (it detects ncurses and attempts
to use it yet wrongly without the buildlink include).
Index: multimedia/mplayer-share/options.mk
===================================================================
RCS file:
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/multimedia/mplayer-share/options.mk,v
retrieving revision 1.35
diff -u -r1.35 options.mk
--- multimedia/mplayer-share/options.mk 3 Jan 2009 15:18:18 -0000 1.35
+++ multimedia/mplayer-share/options.mk 11 Jan 2009 05:46:40 -0000
@@ -14,7 +14,7 @@
# Options supported by both mplayer* or mencoder*.
-PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis x264 debug
+PKG_SUPPORTED_OPTIONS= gif jpeg mad dts dv dvdread png theora vorbis x264
speex lzo ncurses debug
.if ${OSS_TYPE} != "none"
PKG_SUPPORTED_OPTIONS+= oss
.endif
@@ -76,7 +76,7 @@
.for _o_ in aalib arts cdparanoia dv dvdread esound gif jpeg \
lame mad mplayer-menu mplayer-real \
mplayer-default-cflags mplayer-runtime-cpudetection mplayer-win32 \
- nas oss pulseaudio png sdl theora vorbis x264 xvid
+ nas oss pulseaudio png sdl theora vorbis x264 xvid speex lzo ncurses
. if !empty(PKG_SUPPORTED_OPTIONS:M${_o_})
PKG_SUGGESTED_OPTIONS+= ${_o_}
. endif
@@ -278,6 +278,24 @@
CONFIGURE_ARGS+= --disable-theora
.endif
+.if !empty(PKG_OPTIONS:Mspeex)
+CONFIGURE_ARGS+= --enable-speex
+. include "../../audio/speex/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-speex
+.endif
+
+.if !empty(PKG_OPTIONS:Mlzo)
+#CONFIGURE_ARGS+= --enable-lzo configure script broken
+. include "../../archivers/lzo/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-lzo
+.endif
+
+.if !empty(PKG_OPTIONS:Mncurses)
+. include "../../devel/ncurses/buildlink3.mk"
+.endif
+
.if !empty(PKG_OPTIONS:Mv4l2)
CONFIGURE_ARGS+= --enable-tv-v4l2
.else
Ghostscript fails to build when debugging is disabled, it appears to be
a ghostcript bug, at linking time it couldn't find some symbols only built
when debugging is enabled. I thus simply re-enabled debugging which was
commented out, which made it build fine.
Index: print/ghostscript/Makefile
===================================================================
RCS file:
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/print/ghostscript/Makefile,v
retrieving revision 1.55
diff -u -r1.55 Makefile
--- print/ghostscript/Makefile 11 Dec 2008 09:18:20 -0000 1.55
+++ print/ghostscript/Makefile 13 Jan 2009 02:38:45 -0000
@@ -20,7 +20,7 @@
USE_TOOLS+= gmake perl:run lex pkg-config
GNU_CONFIGURE= yes
-#CONFIGURE_ARGS+= --enable-debug
+CONFIGURE_ARGS+= --enable-debug
MAKE_JOBS_SAFE= no
UNLIMIT_RESOURCES+= datasize # gsromfs1.c
Requires the ncurses buildlink include if ncurses exist on the system
(and a dependency of another package also requireing hunspell installs
ncurses).
Index: textproc/hunspell/Makefile
===================================================================
RCS file:
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/textproc/hunspell/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- textproc/hunspell/Makefile 20 Jul 2008 23:54:06 -0000 1.9
+++ textproc/hunspell/Makefile 10 Jan 2009 18:27:21 -0000
@@ -36,5 +36,6 @@
.include "options.mk"
.include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
Another case using an older autoconf requireing the version prefix.
Index: www/firefox/Makefile.common
===================================================================
RCS file:
/nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/www/firefox/Makefile.common,v
retrieving revision 1.25
diff -u -r1.25 Makefile.common
--- www/firefox/Makefile.common 19 May 2008 10:43:02 -0000 1.25
+++ www/firefox/Makefile.common 11 Jan 2009 09:17:21 -0000
@@ -162,9 +162,9 @@
&& ${CP} ${XPTCFILES} ${WRKSRC:Q}/xpcom/reflect/xptcall/src/md/unix/
pre-configure:
- cd ${WRKSRC:Q} && autoconf
- cd ${WRKSRC:Q}/nsprpub && autoconf
- cd ${WRKSRC:Q}/directory/c-sdk && autoconf
+ cd ${WRKSRC:Q} && autoconf-2.13
+ cd ${WRKSRC:Q}/nsprpub && autoconf-2.13
+ cd ${WRKSRC:Q}/directory/c-sdk && autoconf-2.13
post-build:
${ECHO} skin,install,select,classic/1.0 >> \
Yet another similar case but with older automake.
Index: www/libwww/Makefile
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/www/libwww/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- www/libwww/Makefile 12 Apr 2008 22:43:13 -0000 1.78
+++ www/libwww/Makefile 12 Jan 2009 11:36:18 -0000
@@ -38,7 +38,7 @@
.for f in aclocal.m4 configure stamp-h.in
touch ${WRKSRC}/${f}
.endfor
- cd ${WRKSRC} && automake
+ cd ${WRKSRC} && automake-1.4
.include "../../mk/bsd.prefs.mk"
Requires ncurses buildlink include or it fails to build if ncurses exists
(which generally installs via another dependency).
Index: x11/vte/Makefile
===================================================================
RCS file: /nfs/ginseng/home/data/cvsup/netbsd/pkgsrc/x11/vte/Makefile,v
retrieving revision 1.60
diff -u -r1.60 Makefile
--- x11/vte/Makefile 25 Oct 2008 12:23:09 -0000 1.60
+++ x11/vte/Makefile 11 Jan 2009 00:21:17 -0000
@@ -31,6 +31,7 @@
BUILDLINK_DEPMETHOD.libXt?= build
+.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pango/buildlink3.mk"
.include "../../fonts/fontconfig/buildlink3.mk"
Home |
Main Index |
Thread Index |
Old Index