update Sun Jan 31 18:37:00 PST 2010
authorCharlie <root@crater.dragonflybsd.org>
Mon, 1 Feb 2010 02:48:22 +0000 (18:48 -0800)
committerCharlie <root@crater.dragonflybsd.org>
Mon, 1 Feb 2010 02:48:22 +0000 (18:48 -0800)
126 files changed:
archivers/libzip/Makefile
archivers/libzip/distinfo
audio/cddbd/Makefile
audio/cddbd/distinfo
audio/cddbd/patches/patch-aa
audio/daapd/Makefile
audio/gkrellm-volume/Makefile
audio/gkrellm-xmms/Makefile
audio/libvisual0.2-plugins/Makefile
audio/mpg123-nas/Makefile
audio/mstream/Makefile
audio/mt-daapd/Makefile
audio/muse/Makefile
audio/muse/distinfo
audio/muse/patches/patch-ae
audio/terminatorx/Makefile
audio/trm/Makefile
audio/trm/distinfo
audio/trm/patches/patch-ac
audio/ubs/Makefile
audio/ubs/distinfo
audio/ubs/patches/patch-aa
audio/wsoundprefs/Makefile
audio/wsoundprefs/distinfo
audio/wsoundprefs/patches/patch-aa
audio/wsoundprefs/patches/patch-ab
audio/wsoundprefs/patches/patch-ah [new file with mode: 0644]
audio/wsoundprefs/patches/patch-ai [new file with mode: 0644]
audio/wsoundserver/Makefile
cad/freehdl/Makefile
cad/gtkwave/Makefile
cad/verilog/Makefile
cad/verilog/distinfo
cad/verilog/patches/patch-ab [new file with mode: 0644]
cad/verilog/patches/patch-ad
comms/jpilot/Makefile
comms/libmal/Makefile
converters/odt2txt/distinfo
converters/odt2txt/patches/patch-aa
devel/gcvs/Makefile
devel/gcvs/distinfo
devel/gcvs/patches/patch-au [new file with mode: 0644]
devel/nana/distinfo
devel/nana/patches/patch-aa [new file with mode: 0644]
devel/xulrunner/Makefile
devel/xulrunner/dist.mk
doc/CHANGES-2010
editors/ex/Makefile
editors/ex/distinfo
editors/ex/patches/patch-aa
emulators/handy_sdl/Makefile
emulators/p11/Makefile
games/galaxa/Makefile
games/galaxa/PLIST
games/galaxa/distinfo
games/galaxa/patches/patch-aa
games/golddig/Makefile
games/golddig/distinfo
games/imaze/distinfo
games/imaze/patches/patch-ab
games/jetpack/distinfo
games/jetpack/patches/patch-ac
games/kdetoys3/Makefile
geography/xrmap-base/Makefile
graphics/GLXKit/Makefile
graphics/GLXKit/distinfo
graphics/GLXKit/patches/patch-ab
graphics/GeometryKit/Makefile
graphics/GlutKit/Makefile
graphics/GlutKit/distinfo
graphics/GlutKit/patches/patch-ab
graphics/Ngraph/Makefile
graphics/Ngraph/distinfo
graphics/Ngraph/patches/patch-aa
mail/exim/Makefile
mail/exim/distinfo
mail/exim/patches/patch-ae
mk/build/bsd.build-vars.mk
net/irrtoolset5/Makefile
net/wpa_supplicant/Makefile
net/wpa_supplicant/distinfo
net/ytalk/Makefile
news/newsx/Makefile
news/nntpclnt/Makefile
parallel/dqs/Makefile
print/Makefile
print/cups-drivers-Magicolor5440DL/DESCR [moved from wip/cups-driver-Magicolor5440DL/DESCR with 100% similarity]
print/cups-drivers-Magicolor5440DL/MESSAGE [moved from wip/cups-driver-Magicolor5440DL/MESSAGE with 91% similarity]
print/cups-drivers-Magicolor5440DL/Makefile [moved from wip/cups-driver-Magicolor5440DL/Makefile with 73% similarity]
print/cups-drivers-Magicolor5440DL/PLIST [moved from wip/cups-driver-Magicolor5440DL/PLIST with 93% similarity]
print/cups-drivers-Magicolor5440DL/distinfo [moved from wip/cups-driver-Magicolor5440DL/distinfo with 81% similarity]
print/cups-drivers-Magicolor5440DL/patches/patch-aa [moved from wip/cups-driver-Magicolor5440DL/patches/patch-aa with 96% similarity]
print/tex-pkfix-doc/Makefile
security/seccure/Makefile
security/seccure/distinfo
security/seccure/patches/patch-aa
security/tacshell/Makefile
security/tacshell/distinfo
security/tacshell/patches/patch-aa [deleted file]
time/wmzcalock/Makefile
wip/Makefile
wip/firefox/Makefile
wip/kmymoney-devel/Makefile
wip/kmymoney-devel/PLIST
wip/kmymoney-devel/distinfo
wip/kmymoney-devel/options.mk
wip/kmymoney-devel/patches/patch-aa
wip/kmymoney-svn/Makefile
wip/kmymoney-svn/PLIST
wip/kmymoney-svn/options.mk
wip/poco-data-mysql/Makefile
wip/poco-data-mysql/PLIST
wip/poco-data-sqlite/Makefile
wip/poco-data-sqlite/PLIST
wip/poco-data/Makefile
wip/poco-data/PLIST
wip/poco/Makefile
wip/poco/Makefile.common
wip/poco/PLIST
wip/poco/distinfo
wip/poco/patches/patch-ae
wip/poco/patches/patch-af
wip/poco/patches/patch-ag
wip/xulrunner/Makefile
wip/xulrunner/dist.mk
www/firefox/Makefile

index 8e236b3..9660b0b 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2010/01/24 23:13:52 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2010/01/31 23:34:34 wiz Exp $
 #
 
-DISTNAME=              libzip-0.9.1
+DISTNAME=              libzip-0.9.2
 CATEGORIES=            archivers devel
 MASTER_SITES=          http://www.nih.at/libzip/
 
index cf3b8e0..7d41b31 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.8 2010/01/24 23:13:52 wiz Exp $
+$NetBSD: distinfo,v 1.9 2010/01/31 23:34:34 wiz Exp $
 
-SHA1 (libzip-0.9.1.tar.gz) = e56a8ab964b46951faca70dc100c2a9fd249728a
-RMD160 (libzip-0.9.1.tar.gz) = 6a7f27ed036988ca32483d65c75ba9d321376cb1
-Size (libzip-0.9.1.tar.gz) = 428413 bytes
+SHA1 (libzip-0.9.2.tar.gz) = 9a667a2f5f6e706ed526740f46dbfc4b39676259
+RMD160 (libzip-0.9.2.tar.gz) = 33c503c13cddfa213493f63b3060cb3ec2ff3023
+Size (libzip-0.9.2.tar.gz) = 391571 bytes
index 25b8962..341266b 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/12/29 10:13:08 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/01 01:38:42 joerg Exp $
 #
 
 DISTNAME=      cddbd-1.3.1
@@ -14,15 +14,20 @@ MAINTAINER= pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://www.freedb.org/en/download__server_software.4.html
 COMMENT=       Internet CD Database Server
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAKE_FILE=     makefile
 
+INSTALLATION_DIRS+=    bin
+
 do-configure:
        cd ${WRKSRC};                                                   \
        ${SETENV} BASEDIR=${PREFIX:Q}/share ${SH} config.sh
 
 do-install:
        cd ${WRKSRC};                                                   \
-       ${SETENV} INSTALL=${INSTALL:Q} BINDIR=${PREFIX:Q}/bin           \
+       ${SETENV} INSTALL=${INSTALL:Q} DESTDIR=${DESTDIR}               \
+         BINDIR=${DESTDIR}${PREFIX}/bin        \
          BINPERM=${BINMODE:Q} BINOWNER=${BINOWN:Q}                     \
          BINGROUP=${BINGRP:Q} ${SH} install.sh
 
index cb29ea0..1fb7294 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2007/08/30 14:12:38 joerg Exp $
+$NetBSD: distinfo,v 1.6 2010/02/01 01:38:42 joerg Exp $
 
 SHA1 (cddbd-1.3.1.tar.gz) = 2e8ab932750e54e6058edbcc6107835c9be7840c
 RMD160 (cddbd-1.3.1.tar.gz) = a2b666407db9d6415f430a9df8ef4a96fa24572c
@@ -6,7 +6,7 @@ Size (cddbd-1.3.1.tar.gz) = 93959 bytes
 SHA1 (cddbd-1.3.1.patch1.gz) = 08a96dac6c95cf6c289922215be6e6c99cd9f49e
 RMD160 (cddbd-1.3.1.patch1.gz) = 6e0343ded77336cec190682581ad8b9ee78f46d8
 Size (cddbd-1.3.1.patch1.gz) = 416 bytes
-SHA1 (patch-aa) = d7bd76f66e0a4d2cf08ced19b2c4ed684efa7064
+SHA1 (patch-aa) = 9ae4099537d81c792c6183837d25a7015edf5873
 SHA1 (patch-ab) = 6a84d5d1c9c811dc6d5faf8e806b065bc79e0959
 SHA1 (patch-ac) = 3701b82b47444eb8196069580e46f31d1d800160
 SHA1 (patch-ad) = afca1d372bf7e7bf4fc47b9100a914d6f16e431b
index df7d1f3..4fa94d8 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/01 01:38:42 joerg Exp $
 
 --- install.sh.orig    1996-12-22 03:49:54.000000000 +0000
 +++ install.sh
@@ -78,6 +78,15 @@ $NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
                return 0
        else
                $ECHO "\t$2 NOT installed"
+@@ -330,7 +328,7 @@ done
+ # Find other directories
+-BASEDIR=`cat .accessfile`
++BASEDIR=${DESTDIR}`cat .accessfile`
+ WORKDIR=${BASEDIR}
+ CDDBDIR=`dirname ${BASEDIR}`
 @@ -588,7 +586,7 @@ fi
  
  $ECHO "permissions:  default connect nopost noupdate noget" >> access
@@ -87,7 +96,7 @@ $NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
  if getyn "Do you want to create the motd file now"
  then
        if [ "$EDITOR" = "" ]
-@@ -624,7 +622,7 @@ makedir $WORKDIR $DPERM $OWNID $GRPID
+@@ -624,10 +622,10 @@ makedir $WORKDIR $DPERM $OWNID $GRPID
  $ECHO "\nInstalling cddbd files..."
  
  # Binaries
@@ -95,7 +104,11 @@ $NetBSD: patch-aa,v 1.3 2007/08/30 14:12:38 joerg Exp $
 +instfile cddbd ${BINDIR}/cddbd $BINPERM $BINOWNER $BINGROUP
  
  # Configuration files
- instfile access `cat .accessfile`/access $FPERM $OWNID $GRPID
+-instfile access `cat .accessfile`/access $FPERM $OWNID $GRPID
++instfile access ${BASEDIR}/access $FPERM $OWNID $GRPID
+ instfile sites $SITE $FPERM $OWNID $GRPID
+ if [ -f motd ]
 @@ -635,7 +633,7 @@ then
        instfile motd $MOTD $FPERM $OWNID $GRPID
  fi
index ccb43ea..c82bfa1 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2007/01/30 07:05:58 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2010/02/01 00:59:27 joerg Exp $
 
 DISTNAME=              daapd-0.2.4b
 PKGREVISION=           1
@@ -10,6 +10,8 @@ MAINTAINER=           nathanw@NetBSD.org
 HOMEPAGE=              http://www.deleet.de/projekte/daap/daapd/
 COMMENT=               Server for DAA protocol (iTunes)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake
 MAKE_FILE=             makefile
@@ -31,16 +33,18 @@ SUBST_STAGE.paths=  post-patch
 SUBST_FILES.paths=     daapd.8 daapd.cc
 SUBST_SED.paths=       -e 's,/etc/,${PKG_SYSCONFDIR}/,g'
 
+INSTALLATION_DIRS+=    bin ${PKGMANDIR}/man8 ${EGDIR}
+
 post-extract:
        for FILE in `${FIND} ${WRKSRC}/daaplib -type f -print`; do      \
          ${TR} -d \\r <$${FILE} >$${FILE}.new;                         \
          ${MV} $${FILE}.new $${FILE};                                  \
        done
 
-post-install:
-       ${INSTALL_DATA_DIR} ${PKG_SYSCONFDIR}
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/daapd-example.conf ${EGDIR}/daapd.conf
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/daapd ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_MAN} ${WRKSRC}/daapd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8
+       ${INSTALL_DATA} ${WRKSRC}/daapd-example.conf ${DESTDIR}${EGDIR}/daapd.conf
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../net/howl/buildlink3.mk"
index 8f0feaf..1d5c4fe 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2010/02/01 01:10:28 joerg Exp $
 
 DISTNAME=      gkrellm-volume-2.1.13
 PKGREVISION=   6
@@ -9,6 +9,8 @@ MAINTAINER=     cube@NetBSD.org
 HOMEPAGE=      http://gkrellm.luon.net/volume.phtml
 COMMENT=       Gkrellm2 volume mixer plugin
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=      YES
 WRKSRC=                        ${WRKDIR}/gkrellm-volume
@@ -16,6 +18,10 @@ WRKSRC=                      ${WRKDIR}/gkrellm-volume
 MAKE_ENV+=     LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
                enable_nls=1
 
+INSTALLATION_DIRS+=    lib/gkrellm2/plugins
+INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX} \
+                       LOCALEDIR=${DESTDIR}${PREFIX}/${PKGLOCALEDIR}/locale
+
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/oss.buildlink3.mk"
index 17db55e..653f7a6 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2010/01/17 12:02:04 wiz Exp $
+# $NetBSD: Makefile,v 1.31 2010/02/01 01:13:28 joerg Exp $
 #
 
 DISTNAME=      gkrellmms-2.1.20
@@ -11,6 +11,8 @@ MAINTAINER=   cube@NetBSD.org
 HOMEPAGE=      http://gkrellm.luon.net/gkrellmms.phtml
 COMMENT=       GKrellM2 plugin to remotely control XMMS
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_TOOLS+=            gmake msgfmt pkg-config
 USE_PKGLOCALEDIR=      YES
 
@@ -20,6 +22,8 @@ WRKSRC=               ${WRKDIR}/gkrellmms
 MAKE_ENV+=     LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
                enable_nls=1
 
+INSTALLATION_DIRS+=    lib/gkrellm2/plugins
+
 .include "../../sysutils/gkrellm/buildlink3.mk"
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
index 12e57fd..3716eb1 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2009/08/26 19:57:10 sno Exp $
+# $NetBSD: Makefile,v 1.6 2010/02/01 00:52:10 joerg Exp $
 #
 
 DISTNAME=              libvisual-plugins-0.2.0
@@ -11,6 +11,8 @@ MAINTAINER=           pkgsrc-users@NetBSD.org
 HOMEPAGE=              http://localhost.nl/~synap/libvisual-wiki/
 COMMENT=               Plugins for libvisual
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS=             libvisual-nebulus-[0-9]* libvisual-gforce-[0-9]*
 CONFLICTS+=            libvisual-plugins<0.4.0
 
@@ -28,7 +30,7 @@ CONFIGURE_ARGS+=      --x-libraries=${X11BASE}/lib
 
 # install unnecessarily installed files
 post-install:
-       ${RM} ${PREFIX}/share/libvisual-plugins/*/Makefile*
+       ${RM} ${DESTDIR}${PREFIX}/share/libvisual-plugins/*/Makefile*
 
 .include "../../audio/goom/buildlink3.mk"
 .include "../../audio/libvisual0.2/buildlink3.mk"
index a06596b..cb90d70 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/01/26 21:39:00 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/01 01:16:24 joerg Exp $
 
 PKGNAME=       mpg123${TARGET_SUFFIX}-${MPG123_VERSION}
 PKGREVISION=   10
@@ -6,6 +6,8 @@ COMMENT=        Command-line player for mpeg layer 1, 2 and 3 audio with NAS output
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 TARGET_SUFFIX= -nas
 
 CONFLICTS+=            mpg123-[0-9]*
index 719fd42..6eca431 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2009/05/24 15:53:19 zafer Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/01 00:40:32 joerg Exp $
 #
 
 DISTNAME=      mstream-1.3
@@ -9,18 +9,24 @@ MAINTAINER=   kim@tac.nyc.ny.us
 HOMEPAGE=      http://kimmo.suominen.com/gwradio/
 COMMENT=       Mserv player package to queue tracks to IceS
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      ices-mp3>=0.3:../../audio/ices-mp3
 DEPENDS+=      p5-MP3-Info>=1.0:../../audio/p5-MP3-Info
 
 NO_CONFIGURE=  yes
 USE_TOOLS+=    perl:run
 
-DATADIR=       ${LOCALBASE}/share/mstream
-MODDIR=                ${LOCALBASE}/share/ices-mp3
+DATADIR=       ${PREFIX}/share/mstream
+MODDIR=                ${PREFIX}/share/ices-mp3
 
-MAKE_FLAGS+=   PREFIX=${PREFIX:Q}
-MAKE_FLAGS+=   DATADIR=${DATADIR:Q}
-MAKE_FLAGS+=   MODDIR=${MODDIR:Q}
+MAKE_FLAGS+=   PREFIX=${PREFIX}
+MAKE_FLAGS+=   DATADIR=${DATADIR}
+MAKE_FLAGS+=   MODDIR=${MODDIR}
 MAKE_FLAGS+=   PERL=${PERL5:Q}
 
+INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX}
+INSTALL_MAKE_FLAGS+=   DATADIR=${DESTDIR}${DATADIR}
+INSTALL_MAKE_FLAGS+=   MODDIR=${DESTDIR}${MODDIR}
+
 .include "../../mk/bsd.pkg.mk"
index ab4530d..77f1ffb 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2009/07/17 18:00:13 adrianp Exp $
+# $NetBSD: Makefile,v 1.10 2010/02/01 01:17:59 joerg Exp $
 
 DISTNAME=      mt-daapd-0.2.4.2
 PKGREVISION=   1
@@ -9,6 +9,8 @@ MAINTAINER=     pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://www.mt-daapd.org/
 COMMENT=       Server for DAAP (iTunes)
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_LANGUAGES= c
 USE_TOOLS+=    gmake
 
@@ -50,10 +52,11 @@ SUBST_FILES.paths=  src/main.c
 SUBST_SED.paths=       -e "s,/etc,${PKG_SYSCONFDIR},"
 SUBST_SED.paths+=      -e "s,/var,${VARBASE},"
 
+INSTALLATION_DIRS+=    ${EGDIR}
+
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf ${EGDIR}
-       ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.playlist ${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.conf ${DESTDIR}${EGDIR}
+       ${INSTALL_DATA} ${WRKSRC}/contrib/mt-daapd.playlist ${DESTDIR}${EGDIR}
 
 .include "../../audio/libid3tag/buildlink3.mk"
 .include "../../databases/gdbm/buildlink3.mk"
index 35c81f4..24bc9d3 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2009/08/26 19:57:11 sno Exp $
+# $NetBSD: Makefile,v 1.27 2010/02/01 01:25:29 joerg Exp $
 #
 
 DISTNAME=      MuSE-0.9
@@ -12,6 +12,8 @@ MAINTAINER=   pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://muse.dyne.org/
 COMMENT=       Multiple Streaming Engine
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 USE_LANGUAGES=         c c++
 USE_TOOLS+=            gmake pkg-config msgfmt
index 4d9f426..2edf6dc 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2009/03/11 14:42:35 hasso Exp $
+$NetBSD: distinfo,v 1.9 2010/02/01 01:25:29 joerg Exp $
 
 SHA1 (MuSE-0.9.tar.gz) = c73dfe6cf5a8da3430864a76d0bc8d9f2cb7d118
 RMD160 (MuSE-0.9.tar.gz) = 53eb653a0488ae3a5ef9486d8b2a9006fdba619d
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = 5020bece9b44c5006efe0c90b23f3c54f9313b57
 SHA1 (patch-ab) = 26d87f65078e45aec187ed4436b5ffce289247b3
 SHA1 (patch-ac) = fcf1efbbd99d70e055c903c41431a1630ca381fa
 SHA1 (patch-ad) = 5f2322a1c9c3c9ee4e4dbe3aa810c0f2c5d999fd
-SHA1 (patch-ae) = 1097b09eb842fe1d90ec28913ad511e515f55a8a
+SHA1 (patch-ae) = 54d5cd059c72ecd2b60d1ac188540c29343322f7
 SHA1 (patch-af) = 20b68a9758ec109b3dec37b5898076a0cff5bfcc
 SHA1 (patch-ag) = 65515e3a2e8947a1ac1b01e5585a1ca04513bd70
 SHA1 (patch-ah) = 458d747f30e7767f53bc5dd890da1dd9e94cabfa
index 322073a..98f6216 100644 (file)
@@ -1,11 +1,11 @@
-$NetBSD: patch-ae,v 1.1 2004/05/09 17:27:53 minskim Exp $
+$NetBSD: patch-ae,v 1.2 2010/02/01 01:25:29 joerg Exp $
 
 --- po/Makefile.orig   2004-04-14 17:52:44.000000000 -0500
 +++ po/Makefile
 @@ -1,5 +1,5 @@
  INSTALL= /usr/bin/install -c
 -INSTALLNLSDIR=$(BASEDIR)/usr/local/share/locale
-+INSTALLNLSDIR=$(BASEDIR)${PREFIX}/${PKGLOCALEDIR}/locale
++INSTALLNLSDIR=$(DESTDIR)${PREFIX}/${PKGLOCALEDIR}/locale
  
  PACKAGE = muse
  
index 0ee5071..7ac8737 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2009/08/26 19:57:13 sno Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/01 01:43:59 joerg Exp $
 #
 
 DISTNAME=      terminatorX-3.82
@@ -12,6 +12,8 @@ MAINTAINER=   pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://terminatorx.org/
 COMMENT=       Realtime audio synthesizer
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 DEPENDS+=      mpg123-[0-9]*:../../audio/mpg123
 DEPENDS+=      sox-[0-9]*:../../audio/sox
 DEPENDS+=      vorbis-tools-[0-9]*:../../audio/vorbis-tools
index ea04de4..4df16c1 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/07/01 11:59:01 chris Exp $
+# $NetBSD: Makefile,v 1.11 2010/02/01 01:50:04 joerg Exp $
 #
 
 DISTNAME=      trm-0.2.1
@@ -10,6 +10,8 @@ MAINTAINER=   chris@NetBSD.org
 HOMEPAGE=      http://www.musicbrainz.org/products/trmgen/download.html
 COMMENT=       Acoustic signature generator
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 CONFLICTS=     tunepimp-[0-9]*
 
 PKG_INSTALLATION_TYPES= overwrite pkgviews
@@ -20,6 +22,8 @@ USE_LANGUAGES=                c c++
 AUTOMAKE_REQD= 1.6.3
 USE_TOOLS+=    automake aclocal autoheader autoconf
 
+INSTALLATION_DIRS+=    bin
+
 pre-configure:
        set -e; cd ${WRKSRC}; \
        aclocal; autoheader; automake -a --foreign -i; autoconf
index ecd1498..fdacf34 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2007/07/01 11:59:01 chris Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 01:50:04 joerg Exp $
 
 SHA1 (trm-0.2.1.tar.gz) = ea032c38ca83266026e0c10919749814282994e9
 RMD160 (trm-0.2.1.tar.gz) = fb74d692920af62a7fcbbacfb32cd0e277e56126
 Size (trm-0.2.1.tar.gz) = 131349 bytes
 SHA1 (patch-aa) = 152a7b8503ca887c641aeedfdd78f2520b88763b
 SHA1 (patch-ab) = 909c55da818a72b687c88c69a4e8d682f5a02df5
-SHA1 (patch-ac) = 980651e3f8b196575c09aa99cf33e9ce008a708f
+SHA1 (patch-ac) = a189db1a7b5b85baa0cd813e10869146045303c7
index 5e82f0b..8b2a712 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.1 2007/07/01 11:59:01 chris Exp $
+$NetBSD: patch-ac,v 1.2 2010/02/01 01:50:04 joerg Exp $
 
 --- ./Makefile.am.orig 2007-07-01 12:27:37.000000000 +0100
 +++ ./Makefile.am
@@ -7,4 +7,4 @@ $NetBSD: patch-ac,v 1.1 2007/07/01 11:59:01 chris Exp $
  
  install:
 -      $(INSTALL) -s -m 0655 trm $(prefix)/bin 
-+      $(INSTALL) -s -m 0755 trm $(prefix)/bin 
++      $(INSTALL) -s -m 0755 trm ${DESTDIR}$(prefix)/bin       
index 087f846..da230e7 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/07/04 20:54:31 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2010/02/01 01:51:50 joerg Exp $
 #
 
 DISTNAME=              ubs-0.17
@@ -11,6 +11,8 @@ MAINTAINER=           pkgsrc-users@NetBSD.org
 # HOMEPAGE=            http://aboleo.net/software/ubs/
 COMMENT=               Uninterrupted Broadcasting System
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 
 RCD_SCRIPTS=           ubs
index 2abcc92..331ca20 100644 (file)
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.3 2006/07/02 09:53:00 rillig Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 01:51:50 joerg Exp $
 
 SHA1 (ubs-0.17.tar.gz) = f0f67d437e4c5c7026b2f05d1aaff53688eb3253
 RMD160 (ubs-0.17.tar.gz) = 4e0e46bb8346f0c86989b0b33973000bbb86f1aa
 Size (ubs-0.17.tar.gz) = 372222 bytes
-SHA1 (patch-aa) = 4a5690fa3e7a8dc1dc50329bf844199575a09319
+SHA1 (patch-aa) = 466b0809dfc5df30bc77282e6ea2caa6f8d46ab7
 SHA1 (patch-ab) = 88d06fca850e7bf2d38ad587021e4352c96cc89b
 SHA1 (patch-ac) = af22e0ca907b22eedb86e79ce2e81e4fb87283e9
index f849cf9..875d403 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1.1.1 2004/04/05 11:46:11 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2010/02/01 01:51:50 joerg Exp $
 
 --- Makefile.in.orig   2003-10-31 05:49:58.000000000 +0100
 +++ Makefile.in        2003-10-31 05:50:52.000000000 +0100
@@ -7,16 +7,18 @@ $NetBSD: patch-aa,v 1.1.1.1 2004/04/05 11:46:11 xtraeme Exp $
  
  install-data-local:
 -      $(mkinstalldirs) $(prefix)/etc
-       $(mkinstalldirs) $(prefix)/include
+-      $(mkinstalldirs) $(prefix)/include
 -      $(mkinstalldirs) $(prefix)/log
 -      $(mkinstalldirs) $(prefix)/tmp
 -      $(mkinstalldirs) $(prefix)/var
-+      $(mkinstalldirs) $(datadir)/examples/ubs
++      $(mkinstalldirs) ${DESTDIR}$(prefix)/include
++      $(mkinstalldirs) ${DESTDIR}$(datadir)/examples/ubs
  
 -      $(INSTALL_DATA) config/help.conf $(prefix)/etc
 -      $(INSTALL_DATA) config/ubs.conf.default $(prefix)/etc
-+      $(INSTALL_DATA) config/help.conf $(datadir)/examples/ubs
-+      $(INSTALL_DATA) config/ubs.conf.default $(datadir)/examples/ubs
++      $(INSTALL_DATA) config/help.conf ${DESTDIR}$(datadir)/examples/ubs
++      $(INSTALL_DATA) config/ubs.conf.default ${DESTDIR}$(datadir)/examples/ubs
  
-       $(INSTALL_DATA) include/*.h $(prefix)/include
+-      $(INSTALL_DATA) include/*.h $(prefix)/include
++      $(INSTALL_DATA) include/*.h ${DESTDIR}$(prefix)/include
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
index 6a176f3..c409fca 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/02/01 02:00:32 joerg Exp $
 
 DISTNAME=      WSoundPrefs-1.1.1
 PKGNAME=       wsoundprefs-1.1.1
@@ -10,6 +10,8 @@ MAINTAINER=   pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://shadowmere.student.utwente.nl/
 COMMENT=       WSoundServer configuration utility
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_IMAKE=             yes
 BROKEN_GETTEXT_DETECTION=      yes
 
index 4ed0809..fcb15b3 100644 (file)
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.7 2005/02/23 20:39:53 agc Exp $
+$NetBSD: distinfo,v 1.8 2010/02/01 02:00:32 joerg Exp $
 
 SHA1 (WSoundPrefs-1.1.1.tar.gz) = 444571543e7a076cc49ee484dbcfd0aefc184316
 RMD160 (WSoundPrefs-1.1.1.tar.gz) = c9793dd9c6b100f9de3fa9b2771c684ac890016e
 Size (WSoundPrefs-1.1.1.tar.gz) = 32042 bytes
-SHA1 (patch-aa) = 8ae650bc0a79ee02dbbefc5519eff735a02a722b
-SHA1 (patch-ab) = 8daeb7657ba5518d730ec88ff73da5a577fd5710
+SHA1 (patch-aa) = ef58a08d3687e339502a985e106639c0702226bf
+SHA1 (patch-ab) = 336ae3b74f1b3541f180f186ea9591348eb51af1
 SHA1 (patch-ac) = 592155f98fa0b51690e766eb75bde69531313533
 SHA1 (patch-ad) = 5d37585aea3950f2d01d66333cbd6fd59d3a42c8
 SHA1 (patch-ae) = 675b6b8039016f99b7bdb744eb01747f5f5f8c31
 SHA1 (patch-af) = 9b60b779af703075058f8a88669cae70a5eecddb
 SHA1 (patch-ag) = ec0c1a3c2223b9728fa69f85547cce6b12177c06
+SHA1 (patch-ah) = 7346f4b9f65782606b61bb0e5e7b52f5134a02c5
+SHA1 (patch-ai) = 806866b0efebdd19ff6b5aedbcf0c534ab581dc4
index 6752055..782fba7 100644 (file)
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.3 2001/03/12 21:19:10 wiz Exp $
+$NetBSD: patch-aa,v 1.4 2010/02/01 02:00:32 joerg Exp $
 
---- Imakefile.orig     Fri Mar 31 16:16:47 2000
+--- Imakefile.orig     2000-03-31 14:16:47.000000000 +0000
 +++ Imakefile
-@@ -6,15 +6,16 @@
+@@ -6,15 +6,14 @@ XCOMM Specify Your Installation Prefix H
  XCOMM Installation Path: $(PREFIX)/Apps/WSoundPrefs.app
  XCOMM -------------------------------------------------
  XCOMM PREFIX = /usr/GNUstep/Local
 -PREFIX = /usr/local/GNUstep
-+XCOMM PREFIX = /usr/local/GNUstep
++PREFIX := ${PREFIX}/GNUstep
  
  
  XCOMM CDEBUGFLAGS = -Wall -ggdb -DDEBUG
@@ -18,7 +18,6 @@ $NetBSD: patch-aa,v 1.3 2001/03/12 21:19:10 wiz Exp $
  SUBDIRS = src
  
 -DESTDIR = $(PREFIX)
-+DESTDIR = $(PREFIX)/GNUstep
+-
  MakeSubdirs($(SUBDIRS))
  DependSubdirs($(SUBDIRS))
index 8446c45..419d9b5 100644 (file)
@@ -1,8 +1,17 @@
-$NetBSD: patch-ab,v 1.7 2002/08/31 03:08:59 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2010/02/01 02:00:32 joerg Exp $
 
---- src/Imakefile.orig Mon Oct 18 01:35:58 1999
+--- src/Imakefile.orig 1999-10-18 08:35:58.000000000 +0000
 +++ src/Imakefile
-@@ -30,7 +30,7 @@
+@@ -7,7 +7,7 @@ ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
+ CC = gcc
+-BINDIR = /Apps/WSoundPrefs.app
++BINDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app
+ XCOMM EFENCELIB = -lefence
+ EFENCELIB =
+@@ -30,7 +30,7 @@ LINTLIBS = $(LINTXLIB)
  SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
  OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
  
diff --git a/audio/wsoundprefs/patches/patch-ah b/audio/wsoundprefs/patches/patch-ah
new file mode 100644 (file)
index 0000000..3f6fdce
--- /dev/null
@@ -0,0 +1,10 @@
+$NetBSD: patch-ah,v 1.1 2010/02/01 02:00:32 joerg Exp $
+
+--- src/tiff/Imakefile.orig    2010-02-01 01:58:13.000000000 +0000
++++ src/tiff/Imakefile
+@@ -1,4 +1,4 @@
+-TIFFDIR = /Apps/WSoundPrefs.app/tiff/
++TIFFDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app/tiff/
+ TIFFS = loadset.tiff saveset.tiff
diff --git a/audio/wsoundprefs/patches/patch-ai b/audio/wsoundprefs/patches/patch-ai
new file mode 100644 (file)
index 0000000..eae8783
--- /dev/null
@@ -0,0 +1,10 @@
+$NetBSD: patch-ai,v 1.1 2010/02/01 02:00:32 joerg Exp $
+
+--- src/xpm/Imakefile.orig     2010-02-01 01:58:31.000000000 +0000
++++ src/xpm/Imakefile
+@@ -1,4 +1,4 @@
+-XPMDIR = /Apps/WSoundPrefs.app/xpm/
++XPMDIR = ${PREFIX}/GNUstep/Apps/WSoundPrefs.app/xpm/
+ XPMS = loadset.xpm saveset.xpm
index 1890da3..8c2c561 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2010/01/18 09:58:39 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2010/02/01 02:01:59 joerg Exp $
 #
 
 DISTNAME=      WSoundServer-0.4.0
@@ -11,6 +11,8 @@ MAINTAINER=   pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://shadowmere.student.utwente.nl/
 COMMENT=       Sound server for windowmaker
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 USE_X11BASE=           YES
 GNU_CONFIGURE=         YES
 USE_LIBTOOL=           YES
@@ -26,6 +28,8 @@ SUBST_MESSAGE.1x=     Changing the man page category from 1x to 1.
 SUBST_FILES.1x=                doc/*
 SUBST_SED.1x=          -e s,1x,1,g
 
+INSTALLATION_DIRS+=    ${EGDIR}
+
 post-patch:
        set -e;                                                         \
        cd ${WRKSRC:Q}/doc;                                             \
@@ -38,8 +42,7 @@ post-patch:
                ${FILESDIR:Q}/WMSound > ${WRKSRC:Q}/WMSound
 
 post-install:
-       ${INSTALL_DATA_DIR} ${EGDIR:Q}
-       ${INSTALL_DATA} ${WRKSRC:Q}/WMSound ${EGDIR:Q}
+       ${INSTALL_DATA} ${WRKSRC:Q}/WMSound ${DESTDIR}${EGDIR}
 
 .include "../../mk/bsd.prefs.mk"
 
index 6408693..d044e08 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/01/22 17:14:33 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/31 21:15:25 joerg Exp $
 #
 
 DISTNAME=      freehdl-0.0.7
@@ -12,7 +12,7 @@ COMMENT=      VHDL simulator
 GNU_CONFIGURE= yes
 USE_LIBTOOL=   yes
 USE_LANGUAGES= c c++
-USE_TOOLS+=    gmake perl:run
+USE_TOOLS+=    gmake perl:run pkg-config
 INFO_FILES=    yes
 REPLACE_PERL+= freehdl/gvhdl.in
 PKG_DESTDIR_SUPPORT= user-destdir
index 127e5f6..17d7e6c 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2010/01/22 17:25:44 drochner Exp $
+# $NetBSD: Makefile,v 1.24 2010/01/31 21:31:21 joerg Exp $
 #
 
 DISTNAME=              gtkwave-3.3.2
@@ -12,6 +12,8 @@ COMMENT=              Electronic waveform viewer
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+BUILD_DEPENDS+=                gperf-[0-9]*:../../devel/gperf
+
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake pkg-config
 
index cfad531..7899add 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2009/05/20 00:58:07 wiz Exp $
+# $NetBSD: Makefile,v 1.33 2010/02/01 02:19:35 joerg Exp $
 #
 
 DISTNAME=      verilog-0.8.7
@@ -11,6 +11,7 @@ HOMEPAGE=     http://icarus.com/eda/verilog/index.html
 COMMENT=       Verilog simulation and synthesis tool (stable release version)
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 CONFLICTS+=    verilog-current-[0-9]*
 
@@ -21,6 +22,8 @@ USE_TOOLS+=           gmake bison lex
 CONFIGURE_ARGS+=       --without-ipal
 TEST_TARGET=           check
 
+INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../archivers/bzip2/buildlink3.mk"
 .include "../../devel/gperf/buildlink3.mk"
index 0c233d2..1b7a286 100644 (file)
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.14 2009/10/08 16:52:04 dmcmahill Exp $
+$NetBSD: distinfo,v 1.15 2010/02/01 02:19:35 joerg Exp $
 
 SHA1 (verilog-0.8.7.tar.gz) = 814f12a99463a637cb13e0d86755f762c5d90270
 RMD160 (verilog-0.8.7.tar.gz) = 63fb4f9e1e85157010d480e5d66513d6c9ac4326
 Size (verilog-0.8.7.tar.gz) = 1273972 bytes
 SHA1 (patch-aa) = c109856bb5ff121bf70856a5a13678e2c7b68f80
-SHA1 (patch-ad) = 41628d48a697499e71471defccb596426a098da7
+SHA1 (patch-ab) = a24f627af270c848e84ecbfe63053daebb1ec37d
+SHA1 (patch-ad) = 334c20f008ca509e63553f36aaed70fe002c75cf
diff --git a/cad/verilog/patches/patch-ab b/cad/verilog/patches/patch-ab
new file mode 100644 (file)
index 0000000..eed2d0e
--- /dev/null
@@ -0,0 +1,30 @@
+$NetBSD: patch-ab,v 1.9 2010/02/01 02:19:35 joerg Exp $
+
+--- tgt-vvp/Makefile.in.orig   2010-02-01 02:14:50.000000000 +0000
++++ tgt-vvp/Makefile.in
+@@ -87,20 +87,20 @@ check: all
+ install: all installdirs $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
+ $(libdir)/ivl$(suffix)/vvp.tgt: ./vvp.tgt
+-      $(INSTALL_PROGRAM) ./vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt
++      $(INSTALL_PROGRAM) ./vvp.tgt $(libdir)/ivl$(suffix)/vvp.tgt
+ $(libdir)/ivl$(suffix)/vvp.conf: vvp.conf
+-      $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf
++      $(INSTALL_DATA) $< $(libdir)/ivl$(suffix)/vvp.conf
+ $(libdir)/ivl$(suffix)/vvp-s.conf: vvp-s.conf
+-      $(INSTALL_DATA) $< $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
++      $(INSTALL_DATA) $< $(libdir)/ivl$(suffix)/vvp-s.conf
+ installdirs: ../mkinstalldirs
+-      $(srcdir)/../mkinstalldirs $(DESTDIR)$(libdir)/ivl$(suffix)
++      $(srcdir)/../mkinstalldirs $(libdir)/ivl$(suffix)
+ uninstall:
+-      rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.tgt $(DESTDIR)$(libdir)/ivl$(suffix)/vvp.conf $(DESTDIR)$(libdir)/ivl$(suffix)/vvp-s.conf
++      rm -f $(libdir)/ivl$(suffix)/vvp.tgt $(libdir)/ivl$(suffix)/vvp.conf $(libdir)/ivl$(suffix)/vvp-s.conf
+ -include $(patsubst %.o, dep/%.d, $O)
index 1de31df..359bc71 100644 (file)
@@ -1,8 +1,9 @@
-$NetBSD: patch-ad,v 1.8 2006/10/04 23:52:48 dmcmahill Exp $
+$NetBSD: patch-ad,v 1.9 2010/02/01 02:19:35 joerg Exp $
 
---- Makefile.in.orig   2006-10-04 17:08:59.000000000 +0000
-+++ Makefile.in        2006-10-04 22:39:41.000000000 +0000
-@@ -171,6 +171,17 @@
+--- Makefile.in.orig   2008-12-10 03:21:48.000000000 +0000
++++ Makefile.in
+@@ -176,8 +176,19 @@ dep:
  lexor.o: lexor.cc parse.h
  
 -parse.o: parse.cc
@@ -21,3 +22,60 @@ $NetBSD: patch-ad,v 1.8 2006/10/04 23:52:48 dmcmahill Exp $
 + 
  parse.cc parse.h: $(srcdir)/parse.y
        $(YACC) --verbose -t -p VL -d -o parse.cc $(srcdir)/parse.y
+       mv parse.cc.h parse.h 2>/dev/null || mv parse.hh parse.h
+@@ -233,10 +244,10 @@ install: all installdirs $(libdir)/ivl$(
+           do (cd $$dir ; $(MAKE) $@); done
+ $(bindir)/iverilog-vpi$(suffix): ./iverilog-vpi
+-      $(INSTALL_SCRIPT) ./iverilog-vpi $(DESTDIR)$(bindir)/iverilog-vpi$(suffix)
++      $(INSTALL_SCRIPT) ./iverilog-vpi $(bindir)/iverilog-vpi$(suffix)
+ $(libdir)/ivl$(suffix)/ivl@EXEEXT@: ./ivl@EXEEXT@
+-      $(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(DESTDIR)$(libdir)/ivl$(suffix)/ivl@EXEEXT@
++      $(INSTALL_PROGRAM) ./ivl@EXEEXT@ $(libdir)/ivl$(suffix)/ivl@EXEEXT@
+ $(libdir)/ivl$(suffix)/xnf-s.conf: $(srcdir)/xnf-s.conf
+       $(INSTALL_DATA) $(srcdir)/xnf-s.conf $(libdir)/ivl$(suffix)/xnf-s.conf
+@@ -260,15 +271,15 @@ $(includedir)/veriuser.h: $(srcdir)/veri
+       $(INSTALL_DATA) $(srcdir)/veriuser.h $(includedir)/veriuser.h
+ $(mandir)/man1/iverilog-vpi$(suffix).1: $(srcdir)/iverilog-vpi.man
+-      $(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1
++      $(INSTALL_DATA) $(srcdir)/iverilog-vpi.man $(mandir)/man1/iverilog-vpi$(suffix).1
+ $(prefix)/iverilog-vpi$(suffix).pdf: iverilog-vpi.pdf
+-      $(INSTALL_DATA) iverilog-vpi.pdf $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
++      $(INSTALL_DATA) iverilog-vpi.pdf $(prefix)/iverilog-vpi$(suffix).pdf
+ installdirs: mkinstalldirs
+-      $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(includedir) $(DESTDIR)$(libdir)/ivl$(suffix) \
+-          $(DESTDIR)$(libdir)/ivl$(suffix)/include $(DESTDIR)$(mandir) $(DESTDIR)$(mandir)/man1
++      $(srcdir)/mkinstalldirs $(bindir) $(includedir) $(libdir)/ivl$(suffix) \
++          $(libdir)/ivl$(suffix)/include $(mandir) $(mandir)/man1
+ uninstall:
+       for dir in $(SUBDIRS); do (cd $$dir ; $(MAKE) $@); done
+@@ -276,15 +287,15 @@ uninstall:
+       for dir in vpi ivlpp driver; \
+           do (cd $$dir ; $(MAKE) $@); done
+       for f in xnf.conf xnf-s.conf ivl@EXEEXT@; \
+-          do rm -f $(DESTDIR)$(libdir)/ivl$(suffix)/$$f; done
+-      -rmdir $(DESTDIR)$(libdir)/ivl$(suffix)/include
+-      -rmdir $(DESTDIR)$(libdir)/ivl$(suffix)
++          do rm -f $(libdir)/ivl$(suffix)/$$f; done
++      -rmdir $(libdir)/ivl$(suffix)/include
++      -rmdir $(libdir)/ivl$(suffix)
+       for f in verilog$(suffix) iverilog-vpi$(suffix); \
+-          do rm -f $(DESTDIR)$(bindir)/$$f; done
++          do rm -f $(bindir)/$$f; done
+       for f in ivl_target.h vpi_user.h _pli_types.h acc_user.h veriuser.h; \
+-          do rm -f $(DESTDIR)$(includedir)/$$f; done
+-      -test X$(suffix) = X || rmdir $(DESTDIR)/$(includedir)
+-      rm -f $(DESTDIR)$(mandir)/man1/iverilog-vpi$(suffix).1 $(DESTDIR)$(prefix)/iverilog-vpi$(suffix).pdf
++          do rm -f $(includedir)/$$f; done
++      -test X$(suffix) = X || rmdir /$(includedir)
++      rm -f $(mandir)/man1/iverilog-vpi$(suffix).1 $(prefix)/iverilog-vpi$(suffix).pdf
+ -include $(patsubst %.o, dep/%.d, $O)
index 7c64c0b..89e4db5 100644 (file)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.68 2010/01/27 19:22:35 joerg Exp $
+# $NetBSD: Makefile,v 1.69 2010/01/31 21:39:07 zafer Exp $
 #
 
 DISTNAME=              jpilot-1.6.0
 PKGREVISION=           3
 CATEGORIES=            comms
-MASTER_SITES=          http://www.jpilot.org/
+MASTER_SITES=          http://www.jpilot.org/older/
 
 MAINTAINER=            pkgsrc-users@NetBSD.org
 HOMEPAGE=              http://www.jpilot.org/
index e5065ec..1046ce3 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.12 2009/05/20 00:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2010/01/31 21:34:39 zafer Exp $
 
 DISTNAME=              libmal-0.44
 PKGREVISION=           1
 CATEGORIES=            comms
-MASTER_SITES=          http://jasonday.home.att.net/code/libmal/
+MASTER_SITES=          http://www.jlogday.com/code/libmal/archive/
 
 MAINTAINER=            markd@NetBSD.org
 HOMEPAGE=              http://jasonday.home.att.net/code/libmal/
index e2a93b6..783a4ae 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2010/01/29 16:47:52 joerg Exp $
+$NetBSD: distinfo,v 1.3 2010/01/31 22:21:32 joerg Exp $
 
 SHA1 (odt2txt-0.3.tar.gz) = efebf01e77a2bfa44ce7f4f24fc244889c480d77
 RMD160 (odt2txt-0.3.tar.gz) = 0648959ab64018c0376045e8ae6d284d804cff9c
 Size (odt2txt-0.3.tar.gz) = 28810 bytes
-SHA1 (patch-aa) = 26bae43601f8e06936ac39d7fb1c599a2c094ca8
+SHA1 (patch-aa) = d54320f8eda5b17c2e461639efb9b69e82320bb7
index 5da4276..b2ddf2f 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.2 2010/01/29 16:47:52 joerg Exp $
+$NetBSD: patch-aa,v 1.3 2010/01/31 22:21:32 joerg Exp $
 
 --- Makefile.orig      2007-05-21 20:50:37.000000000 +0000
 +++ Makefile
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.2 2010/01/29 16:47:52 joerg Exp $
 -PREFIX  =
  BINDIR  = $(PREFIX)/bin
 -MANDIR  = $(PREFIX)/share/man
-+MANDIR  = $(PREFIX)/${PKGMANDIR}/man
++MANDIR  = $(PREFIX)/${PKGMANDIR}
  MAN1DIR = $(MANDIR)/man1
  
  ifeq ($(UNAME_S),FreeBSD)
index 582fd9c..a231b1c 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2010/01/29 18:02:59 joerg Exp $
+# $NetBSD: Makefile,v 1.29 2010/02/01 00:24:37 joerg Exp $
 
 DISTNAME=              gcvs-1.0
 PKGREVISION=           4
@@ -24,10 +24,6 @@ CONFIGURE_ARGS+=     --with-tclinclude="${BUILDLINK_PREFIX.tcl}/include"
 CONFIGURE_ARGS+=       --with-tcllib="${BUILDLINK_PREFIX.tcl}/lib"
 CONFIGURE_ARGS+=       perl_path=${PERL5}
 
-INSTALL_MAKE_FLAGS+=   prefix=${DESTDIR}${PREFIX} \
-                       infodir=${DESTDIR}${PREFIX}/${PKGINFODIR} \
-                       mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \
-
 .include "../../lang/tcl/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 
index cbab7aa..8ae8f56 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2008/08/17 04:01:37 dholland Exp $
+$NetBSD: distinfo,v 1.8 2010/02/01 00:24:37 joerg Exp $
 
 SHA1 (gcvs-1.0.tar.gz) = 42b2469d0a9acc0e69a127b44000cd1b11bb895e
 RMD160 (gcvs-1.0.tar.gz) = 195698283848cd1f22d00eb37df7dd0f6b52cffc
@@ -26,3 +26,4 @@ SHA1 (patch-aq) = 544d6b2d44cba7ab31fea66c13ff391d0cd81932
 SHA1 (patch-ar) = 05244267342a031e5470e4c2641ac359985c6334
 SHA1 (patch-as) = db6412aee518e989cca0d3b288513a718d6eee8c
 SHA1 (patch-at) = 02343059426fabe3ef50bfe7bc61bb6214b10a47
+SHA1 (patch-au) = f413e66cd0bf438c1fba83dc1632543a84507f8d
diff --git a/devel/gcvs/patches/patch-au b/devel/gcvs/patches/patch-au
new file mode 100644 (file)
index 0000000..7d2b05e
--- /dev/null
@@ -0,0 +1,26 @@
+$NetBSD: patch-au,v 1.1 2010/02/01 00:24:37 joerg Exp $
+
+--- cvsunix/Makefile.in.orig   2010-02-01 00:11:27.000000000 +0000
++++ cvsunix/Makefile.in
+@@ -46,7 +46,7 @@ LDFLAGS = @LDFLAGS@
+ MAKEINFO = makeinfo
+ TEXI2DVI = texi2dvi
+-prefix = @prefix@
++prefix = ${DESTDIR}@prefix@
+ exec_prefix = @exec_prefix@
+ # Where to install the executables.
+@@ -56,10 +56,10 @@ bindir = @bindir@
+ libdir = @libdir@
+ # Where to put the Info files
+-infodir = @infodir@
++infodir = ${DESTDIR}${PREFIX}/${PKGINFODIR}
+ # Where to put the manual pages.
+-mandir = @mandir@
++mandir = ${DESTDIR}${PREFIX}/${PKGMANDIR}
+ #### End of system configuration section. ####
index 62693a0..a3378c4 100644 (file)
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.5 2006/03/31 05:37:09 jlam Exp $
+$NetBSD: distinfo,v 1.6 2010/02/01 00:35:00 joerg Exp $
 
 SHA1 (nana-2.4.tar.gz) = a1679889fe43da2d25e70974ace6d1f2a44568e0
 RMD160 (nana-2.4.tar.gz) = 135a4025fc1b24ae5d1613970490eae053e70292
 Size (nana-2.4.tar.gz) = 345014 bytes
+SHA1 (patch-aa) = c6b8b528623c51a566275b4a08cd9952855b50d2
diff --git a/devel/nana/patches/patch-aa b/devel/nana/patches/patch-aa
new file mode 100644 (file)
index 0000000..00a4490
--- /dev/null
@@ -0,0 +1,15 @@
+$NetBSD: patch-aa,v 1.3 2010/02/01 00:35:00 joerg Exp $
+
+--- man/Makefile.in.orig       2010-02-01 00:30:49.000000000 +0000
++++ man/Makefile.in
+@@ -275,8 +275,8 @@ maintainer-clean-generic clean mostlycle
+ install-data-local:
+       @sect=1;                                \
+       inst=`echo "nana" | sed '$(transform)'`.1; \
+-      echo installing nana.1 as $(mandir)/man$$sect/$$inst; \
+-      $(INSTALL_DATA) $(srcdir)/nana.1 $(mandir)/man$$sect/$$inst
++      echo installing nana.1 as ${DESTDIR}$(mandir)/man$$sect/$$inst; \
++      $(INSTALL_DATA) $(srcdir)/nana.1 ${DESTDIR}$(mandir)/man$$sect/$$inst
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
index 1158e8a..83bc86f 100644 (file)
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2010/01/26 16:22:59 tron Exp $
+# $NetBSD: Makefile,v 1.36 2010/01/31 20:54:44 tnn Exp $
 
 .include "dist.mk"
-PKGNAME=       ${DISTNAME:S/firefox/xulrunner/:S/3.5/1.9.1/:S/.source//}
+PKGNAME=       xulrunner-${MOZ_BRANCH}.${MOZ_BRANCH_MINOR}
 CATEGORIES=    devel www
 
 MAINTAINER=    tnn@NetBSD.org
index 35e2e37..ebc8781 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: dist.mk,v 1.5 2010/01/26 16:22:59 tron Exp $
+# $NetBSD: dist.mk,v 1.6 2010/01/31 20:54:44 tnn Exp $
 #
 # used by devel/nspr/Makefile
 # used by devel/nss/Makefile
@@ -6,11 +6,13 @@
 # used by www/firefox/Makefile
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
-FIREFOX_VER=   3.5.7
+FIREFOX_VER=   3.5.${MOZ_BRANCH_MINOR}
+MOZ_BRANCH=    1.9.1
+MOZ_BRANCH_MINOR=      7
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
 
 DISTINFO_FILE= ${.CURDIR}/../../devel/xulrunner/distinfo
 PATCHDIR=      ${.CURDIR}/../../devel/xulrunner/patches
 
-WRKSRC=                ${WRKDIR}/mozilla-1.9.1
+WRKSRC=                ${WRKDIR}/mozilla-${MOZ_BRANCH}
index 53c5cca..638d4e0 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2010,v 1.437 2010/01/31 20:38:35 roy Exp $
+$NetBSD: CHANGES-2010,v 1.439 2010/02/01 00:46:46 jym Exp $
 
 Changes to the packages collection and infrastructure in 2010:
 
@@ -530,8 +530,10 @@ Changes to the packages collection and infrastructure in 2010:
        Updated print/tex-bin-latex to 2008.12778nb5 [minskim 2010-01-30]
        Updated textproc/tex-xmltex to 1.9nb6 [minskim 2010-01-30]
        Updated time/ruby-tzinfo to 0.3.16nb1 [taca 2010-01-30]
-       Added net/irrtoolset5 version pre-5.0.0 rev311 [spz 2010-01-30]
+       Added net/irrtoolset5 version 5.0.0pre311 [spz 2010-01-30]
        Removed print/tex-bin-xmltex successor print/tex-xmltex [minskim 2010-01-30]
        Updated x11/ggiterm to 0.7.1 [tnn 2010-01-30]
        Updated lang/mzscheme to 4.2.4 [asau 2010-01-31]
        Updated net/dhcpcd to 5.1.5 [roy 2010-01-31]
+       Updated archivers/libzip to 0.9.2 [wiz 2010-01-31]
+       Added print/cups-drivers-Magicolor5440DL version 1.2.1 [jym 2010-02-01]
index 458a601..af42fe2 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2010/01/29 19:39:24 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/31 21:24:03 joerg Exp $
 #
 
 DISTNAME=      ex-040103
 PKGNAME=       ex-20040103
+PKGREVISION=   1
 CATEGORIES=    editors
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=ex-vi/files/ex-vi/040103/}
 
@@ -13,4 +14,6 @@ LICENSE=      original-bsd
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+MAKE_DIRS_PERMS+=      ${VARBASE}/tmp/vi.recover ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 1777
+
 .include "../../mk/bsd.pkg.mk"
index e1700ae..a154e75 100644 (file)
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.12 2010/01/29 19:39:24 joerg Exp $
+$NetBSD: distinfo,v 1.13 2010/01/31 21:24:03 joerg Exp $
 
 SHA1 (ex-040103.tar.gz) = 51fa1d613b37a4f3aed1ef2968be691465cdff09
 RMD160 (ex-040103.tar.gz) = 5fc3f222dde5a8d00e1b233281ccf210affdbdf1
 Size (ex-040103.tar.gz) = 284130 bytes
-SHA1 (patch-aa) = be450377abc260617a6dd42bbcb626a5d4ca75a4
+SHA1 (patch-aa) = 8902846a518fbf214725a801293610ebe12c143b
 SHA1 (patch-ab) = 5bac9911e71b7fe787023568a7a46d1e87fb4d0e
 SHA1 (patch-ac) = 0401448724a4aba59b4aeb07a4cb00982bb52d98
 SHA1 (patch-ad) = 31bafb04f553ca286baf90505da450964fea9954
index fff56d5..e842375 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $
+$NetBSD: patch-aa,v 1.7 2010/01/31 21:24:04 joerg Exp $
 
 --- Makefile.orig      2004-01-03 14:22:47.000000000 +0000
 +++ Makefile
@@ -14,7 +14,7 @@ $NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $
 +BINDIR                = ${PREFIX}/bin
 +LIBEXECDIR    = ${PREFIX}/libexec
 +MANDIR                = ${PREFIX}/${PKGMANDIR}
-+PRESERVEDIR   = /var/tmp/vi.recover
++PRESERVEDIR   = ${VARBASE}/tmp/vi.recover
  
  #
  # A BSD-like install program. GNU install will fit well here, too.
@@ -65,3 +65,12 @@ $NetBSD: patch-aa,v 1.6 2010/01/29 19:39:24 joerg Exp $
        test -d $(DESTDIR)/$(LIBEXECDIR) || mkdir $(DESTDIR)/$(LIBEXECDIR)
        $(INSTALL) -c -s exrecover $(DESTDIR)/$(LIBEXECDIR)/exrecover
        $(INSTALL) -c -s expreserve $(DESTDIR)/$(LIBEXECDIR)/expreserve
+@@ -305,8 +305,6 @@ install: all install-man
+       ln -s ex $(DESTDIR)/$(BINDIR)/vedit
+       ln -s ex $(DESTDIR)/$(BINDIR)/vi
+       ln -s ex $(DESTDIR)/$(BINDIR)/view
+-      test -d $(PRESERVEDIR) || mkdir $(PRESERVEDIR)
+-      chmod 1777 $(PRESERVEDIR)
+ ex.o: config.h ex_argv.h ex.h ex_proto.h ex_temp.h ex_tty.h ex_tune.h
+ ex.o: ex_vars.h libterm/libterm.h
index 0954b65..81b08cd 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/01/29 22:54:54 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/31 21:25:05 joerg Exp $
 #
 
 DISTNAME=      handy_sdl-0.5-src
@@ -12,6 +12,7 @@ HOMEPAGE=     http://sdlemu.ngemu.com/handysdl.php
 COMMENT=       Atari Lynx emulator
 
 PKG_DESTDIR_SUPPORT=   user-destdir
+MAKE_JOBS_SAFE=                no
 
 MAKE_FILE=     Makefile-0.95
 USE_TOOLS+=    gmake
index 676ac7d..4e58c76 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:00 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2010/02/01 02:23:45 joerg Exp $
 #
 
 DISTNAME=      p11-2.10i
@@ -9,6 +9,8 @@ EXTRACT_SUFX=   .tar.bz2
 MAINTAINER=    packages@grumpf.hope-2000.org
 COMMENT=       PDP11 emulator
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 GNU_CONFIGURE=         yes
 CONFIGURE_ARGS+=       --with-begemot=${PREFIX:Q}
 USE_LIBTOOL=           yes
@@ -41,7 +43,7 @@ do-build:
        cd ${WRKSRC} && ${GMAKE} ${BUILD_TARGET} MAKEFLAGS=
 
 do-install:
-       cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET} MAKEFLAGS=
+       cd ${WRKSRC} && ${GMAKE} ${INSTALL_TARGET} MAKEFLAGS= DESTDIR=${DESTDIR}
 
 .include "../../devel/libbegemot/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index 16bc49f..715ec4e 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2010/01/29 23:05:34 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2010/01/31 23:45:58 joerg Exp $
 #
 
 DISTNAME=      galaxa.0.1
 PKGNAME=       galaxa-0.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    games x11
 MASTER_SITES=  ftp://ftp.billsgames.com/unix/x/galaxa/
 
@@ -16,9 +16,16 @@ PKG_DESTDIR_SUPPORT= user-destdir
 WRKSRC=                ${WRKDIR}/galaxa
 MAKE_FILE=     makefile
 
-INSTALLATION_DIRS+=    bin share/doc/galaxa
+INSTALLATION_DIRS+=    bin share/doc/galaxa share/examples/galaxa
 INSTALL_MAKE_FLAGS+=   INSTALLROOT=${DESTDIR}${PREFIX}
 
+SETGIDGAME=    yes
+
+SPECIAL_PERMS+=        bin/galaxa ${SETGID_GAMES_PERMS}
+CONF_FILES_PERMS+=     ${PREFIX}/share/examples/galaxa/galaxa-highs.dat \
+                       /var/games/galaxa-highs.dat \
+                       ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
+
 pre-install:
        ${INSTALL_DATA} ${WRKSRC}/README.txt ${DESTDIR}${PREFIX}/share/doc/galaxa
 
index c9d7150..a0e74f6 100644 (file)
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.2 2009/06/14 17:56:45 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2010/01/31 23:45:58 joerg Exp $
 bin/galaxa
 share/doc/galaxa/README.txt
+share/examples/galaxa/galaxa-highs.dat
 share/galaxa/sounds/buzz.au
 share/galaxa/sounds/capture.au
 share/galaxa/sounds/fireworks.au
index 90ce201..a5d86b6 100644 (file)
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 23:11:58 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/01/31 23:45:58 joerg Exp $
 
 SHA1 (galaxa.0.1.tar.gz) = 63927c23783aa4b52a2a0ba9f533a73f43cb9e0b
 RMD160 (galaxa.0.1.tar.gz) = fe5e522a2217eeb263ea0e402959da4496d61cd1
 Size (galaxa.0.1.tar.gz) = 192068 bytes
-SHA1 (patch-aa) = f94baf25ea4bb080252a4eaa2b1124217ddec1e4
+SHA1 (patch-aa) = e610c3708771c21450966c178c2a6142e54ce8b2
 SHA1 (patch-ab) = 1e79b7f423bf8d156c4820b10f05885545c3826a
 SHA1 (patch-ac) = 7a778ec3ea5647c522aa001b5759fa8580b68237
 SHA1 (patch-ad) = 34d91852e9958e458f5de5d58ebcadd778eda15c
index 364e4bf..18d0a71 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.5 1998/09/14 06:38:45 garbled Exp $
+$NetBSD: patch-aa,v 1.6 2010/01/31 23:45:58 joerg Exp $
 --- makefile.orig      Wed Apr 22 22:41:21 1998
 +++ makefile   Sun Sep 13 23:25:17 1998
 @@ -14,16 +14,21 @@
@@ -27,7 +27,7 @@ $NetBSD: patch-aa,v 1.5 1998/09/14 06:38:45 garbled Exp $
  
  
  OBJECTS=galaxa.o hints.o randnum.o setup.o text.o soundmgr.o
-@@ -39,30 +44,26 @@
+@@ -39,30 +44,24 @@
  
  
  galaxa:       $(OBJECTS)
@@ -37,15 +37,13 @@ $NetBSD: patch-aa,v 1.5 1998/09/14 06:38:45 garbled Exp $
        $(POSTPROCESS) galaxa
  
 +install: galaxa
-+      install -g games -o bin -m 2755 galaxa $(INSTALLROOT)/bin
++      ${BSD_INSTALL_PROGRAM} galaxa $(INSTALLROOT)/bin
 +      mkdir -p $(DATA)
 +      mkdir -p $(SOUNDS)
 +      mkdir -p $(IMAGES)
-+      install -g bin -o bin -m 0644 sounds/* $(SOUNDS)
-+      install -g bin -o bin -m 0644 images/* $(IMAGES)
-+      if [ ! -e /var/games/galaxa-highs.dat ]; then \
-+              install -g games -o bin -m 0664 galaxa-highs.dat /var/games ; \
-+      fi
++      ${BSD_INSTALL_DATA} sounds/* $(SOUNDS)
++      ${BSD_INSTALL_DATA} images/* $(IMAGES)
++      ${BSD_INSTALL_DATA} galaxa-highs.dat ${INSTALLROOT}/share/examples/galaxa
  
 -#-- App object--#
 +#-- Dependencies --#
index 9341237..28b79ec 100644 (file)
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2010/01/29 23:08:33 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2010/02/01 00:01:50 joerg Exp $
 #
 
 DISTNAME=      golddigC3.1
 PKGNAME=       golddig-3.1
+PKGREVISION=   1
 CATEGORIES=    games x11
 MASTER_SITES=  http://www.NetBSD.org/~chuck/gz/
 
@@ -17,10 +18,15 @@ INSTALLATION_DIRS=  bin ${PKGMANDIR}/man6
 INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX} \
                        MAN=${DESTDIR}${PREFIX}/${PKGMANDIR}/man6
 
-SCORE_GROUP=    games
+SCORE_GROUP=    ${GAMES_GROUP}
 PKG_GROUPS=     ${SCORE_GROUP}
 
-MAKE_ENV+=              SCORE_GROUP=${SCORE_GROUP:Q}
+SETGIDGAME=    yes
+
+SPECIAL_PERMS+=        bin/goldgid ${SETGID_GAMES_PERMS}
+
+CONF_FILES_PERMS+=     /dev/null /var/games/golddig.scores \
+                       ${GAMES_USER} ${GAMES_GROUP} ${GAMEDATAMODE}
 
 post-build:
        for f in ${WRKSRC}/golddig.6 ${WRKSRC}/gdedit.6; do \
index a7b9f48..0bc8f47 100644 (file)
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/11/25 03:15:32 chuck Exp $
+$NetBSD: distinfo,v 1.5 2010/02/01 00:01:50 joerg Exp $
 
 SHA1 (golddigC3.1.tar.gz) = 07decc85efc680edb7e8dbee12dbb4f85d585bf8
 RMD160 (golddigC3.1.tar.gz) = e4d0122f64f37d95955fa58f212535e0180af148
 Size (golddigC3.1.tar.gz) = 62024 bytes
+SHA1 (patch-aa) = 688566f6059ffd44a416dc9c72c8cd7114a0b294
index cc04e49..8579433 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2010/01/29 23:24:15 joerg Exp $
+$NetBSD: distinfo,v 1.8 2010/01/31 21:35:47 joerg Exp $
 
 SHA1 (imaze-sounds.tar) = 976b1acb2da35f5c69c4d867873f65162ae33ecc
 RMD160 (imaze-sounds.tar) = 6e6ea9313ab9c733486f11f2c6a9e8e09f97401e
@@ -7,7 +7,7 @@ SHA1 (imaze1.3.tar.Z) = 92938b445f649ab72c2e1ac902a9ddc56a273321
 RMD160 (imaze1.3.tar.Z) = f26b891dbfb17b102bfa4a32a408ce68c63a02da
 Size (imaze1.3.tar.Z) = 233695 bytes
 SHA1 (patch-aa) = 381e0059ca036cba8701a77ecad4fc664d196584
-SHA1 (patch-ab) = 432999c50d1b197e77bd3c0f9bf17aa02b8ead31
+SHA1 (patch-ab) = b7ea0a92ee3c855a1fa5fc3fe9e05f410d95c6df
 SHA1 (patch-ac) = dcd117f666f7f5b489e8469ca5e19c9d8464264f
 SHA1 (patch-ad) = df3416e378d17152ffc1dbb8f9b61645d92c015c
 SHA1 (patch-ae) = 9d7dda04317b9ba5d5755dd77a80a932f6499d81
index 058d782..d5eb1e7 100644 (file)
@@ -1,16 +1,15 @@
-$NetBSD: patch-ab,v 1.3 2010/01/29 23:24:15 joerg Exp $
+$NetBSD: patch-ab,v 1.4 2010/01/31 21:35:47 joerg Exp $
 
 --- /dev/null  Thu Jul 30 00:12:10 1998
 +++ Makefile   Thu Jul 30 00:24:00 1998
-@@ -0,0 +1,11 @@
-+INSTALL= /usr/bin/install -c -g bin -o bin -m 0644
+@@ -0,0 +1,10 @@
 +all:
 +      cd source && make netbsd
 +install:
-+      $(INSTALL) man6/* ${DESTDIR}$(PREFIX)/man/man6
++      ${BSD_INSTALL_DATA} man6/* ${DESTDIR}$(PREFIX)/man/man6
 +      mkdir -p ${DESTDIR}$(PREFIX)/share/imaze/sound
 +      mkdir -p ${DESTDIR}$(PREFIX)/share/imaze/labs
-+      $(INSTALL) labs/* ${DESTDIR}$(PREFIX)/share/imaze/labs
-+      $(INSTALL) sounds/* ${DESTDIR}$(PREFIX)/share/imaze/sound
-+      $(INSTALL) IMaze.ad ${DESTDIR}$(PREFIX)/lib/X11/app-defaults/IMaze
++      ${BSD_INSTALL_DATA} labs/* ${DESTDIR}$(PREFIX)/share/imaze/labs
++      ${BSD_INSTALL_DATA} sounds/* ${DESTDIR}$(PREFIX)/share/imaze/sound
++      ${BSD_INSTALL_DATA} IMaze.ad ${DESTDIR}$(PREFIX)/lib/X11/app-defaults/IMaze
 +      cd source && make install
index f58ffd3..3d259cf 100644 (file)
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.3 2005/02/23 23:11:59 agc Exp $
+$NetBSD: distinfo,v 1.4 2010/01/31 21:45:30 joerg Exp $
 
 SHA1 (jetpack.tar.Z) = 7898a971eed7a03e9e390c83d0365584f74dabc7
 RMD160 (jetpack.tar.Z) = 2454cef72849f8f644ac6600ad84b3bebd39f8cf
 Size (jetpack.tar.Z) = 70621 bytes
 SHA1 (patch-aa) = f601182dd4e08eeacddc1a25775de0a3c5e264f1
 SHA1 (patch-ab) = 206f2b078e4539950bb497e378e121f8692fec2a
-SHA1 (patch-ac) = 9a71f168173b5eba9fd9a46f0329ad89e7f278a2
+SHA1 (patch-ac) = ea31ff1e6a8f3e8162178a1f2f156bc06550873e
 SHA1 (patch-ad) = f64494ec70fade9d203ab8dbc2795b94f9ecb7e7
 SHA1 (patch-ae) = ab6e97d8115912bbf58dbcc9aa1a7f3b4c8e61ae
 SHA1 (patch-af) = 18001768aed8d316622041ccce2bb07fca7b0e29
index 974f073..5f39330 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-ac,v 1.2 1998/09/13 22:31:33 garbled Exp $
+$NetBSD: patch-ac,v 1.3 2010/01/31 21:45:30 joerg Exp $
 --- Imakefile.orig     Sun Mar 29 12:41:25 1992
 +++ Imakefile  Sun Sep 13 15:08:51 1998
 @@ -1,54 +1,53 @@
@@ -70,7 +70,7 @@ $NetBSD: patch-ac,v 1.2 1998/09/13 22:31:33 garbled Exp $
  
 -InstallNonExec(levels/000,$(LEVELFILE)000)
 +install::
-+      MakeDir($(LIBDIR))
++      MakeDir(${DESTDIR}$(LIBDIR))
  
 -# oops, I can't figure how to override the template default to install the
 -# man page as jetpack.1, so I install both and remove the bad one.
index d15538a..4129a82 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2010/01/18 09:58:52 wiz Exp $
+# $NetBSD: Makefile,v 1.48 2010/01/31 22:09:06 joerg Exp $
 
 DISTNAME=      kdetoys-${_KDE_VERSION}
 PKGREVISION=   4
@@ -6,6 +6,7 @@ CATEGORIES=     games
 COMMENT=       Toys for the KDE integrated X11 desktop
 
 PKG_DESTDIR_SUPPORT=   user-destdir
+MAKE_JOBS_SAFE=                no
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
index 20eb3b9..ccf588c 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2009/06/30 00:07:16 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2010/02/01 02:31:28 joerg Exp $
 #
 
 DISTNAME=              xrmap-2.29
@@ -8,6 +8,8 @@ CATEGORIES=             geography
 MASTER_SITES=          ftp://ftp.ac-grenoble.fr/ge/geosciences/xrmap/
 EXTRACT_SUFX=          .tar.bz2
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 MAINTAINER=            pkgsrc-users@NetBSD.org
 HOMEPAGE=              http://frmas.free.fr/li_1.htm
 COMMENT=               Earth map viewer - base program
@@ -17,9 +19,7 @@ MAKE_JOBS_SAFE=               no
 USE_IMAKE=             yes
 MAKE_FLAGS+=           MANPATH=${PREFIX}/${PKGMANDIR}
 
-# directory shared by factbook_text and factbook_html
-post-install:
-       ${INSTALL_DATA_DIR} ${PREFIX}/share/rmap/factbook
+INSTALLATION_DIRS+=    share/rmap/factbook
 
 .include "../../x11/libX11/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
index d6785c9..8a96033 100644 (file)
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2009/07/07 05:46:52 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2010/02/01 02:28:52 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/3DKit/GLXKit/}
index 7c10a7b..fd70023 100644 (file)
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/07/07 05:46:52 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 02:28:52 joerg Exp $
 
 SHA1 (3DKit/3DKit-0.3.1r2.tar.gz) = 780e7dc975cb2ac0b96f8f605aa6ad0b3af596b9
 RMD160 (3DKit/3DKit-0.3.1r2.tar.gz) = bc6f154479156a10fb336fcf6a142b1474df4c61
 Size (3DKit/3DKit-0.3.1r2.tar.gz) = 216093 bytes
 SHA1 (patch-aa) = 9d9b4cc29571141909c13edbd2f7c19d0d81a8d7
-SHA1 (patch-ab) = 9e58df600d1c3f337fb703e58913d7f28059fa84
+SHA1 (patch-ab) = 7bf83ecc8da98b8c90634fb049cef5bae19eb610
index 540c590..2e27439 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2009/07/07 05:46:52 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/01 02:28:52 joerg Exp $
 
 --- GNUmakefile.orig   2010-05-31 23:36:23.000000000 +0200
 +++ GNUmakefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2009/07/07 05:46:52 joerg Exp $
  #
  
 +# Install into the system root by default
-+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
++GNUSTEP_INSTALLATION_DIR = ${DESTDIR}$(GNUSTEP_SYSTEM_ROOT)
 +
  include $(GNUSTEP_MAKEFILES)/common.make
  include Version
index 47b529d..e790e53 100644 (file)
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.22 2010/01/01 17:47:05 joerg Exp $
+# $NetBSD: Makefile,v 1.23 2010/02/01 02:29:55 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/3DKit/GeometryKit/}
index 1d9eaaa..b47af4e 100644 (file)
@@ -1,6 +1,8 @@
-# $NetBSD: Makefile,v 1.20 2009/07/07 05:40:51 joerg Exp $
+# $NetBSD: Makefile,v 1.21 2010/02/01 02:32:34 joerg Exp $
 #
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../graphics/3DKit/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/3DKit/GlutKit/}
index 94e166d..2326bd7 100644 (file)
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.3 2009/07/07 05:40:51 joerg Exp $
+$NetBSD: distinfo,v 1.4 2010/02/01 02:32:34 joerg Exp $
 
 SHA1 (3DKit/3DKit-0.3.1r2.tar.gz) = 780e7dc975cb2ac0b96f8f605aa6ad0b3af596b9
 RMD160 (3DKit/3DKit-0.3.1r2.tar.gz) = bc6f154479156a10fb336fcf6a142b1474df4c61
 Size (3DKit/3DKit-0.3.1r2.tar.gz) = 216093 bytes
 SHA1 (patch-aa) = a12e85937d5b5eb23111749985cdf4099b9d26b4
-SHA1 (patch-ab) = be0d82a2f00ca77642785fe59ff38160fc94f7c8
+SHA1 (patch-ab) = 7c3e7c4cce76f58669fd70e8e8c58cc4285b5504
index 0bb5f7f..0daa150 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-ab,v 1.1 2009/07/07 05:40:51 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2010/02/01 02:32:34 joerg Exp $
 
 --- GNUmakefile.orig   2010-05-31 23:24:27.000000000 +0200
 +++ GNUmakefile
@@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.1 2009/07/07 05:40:51 joerg Exp $
  #
  
 +# Install into the system root by default
-+GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
++GNUSTEP_INSTALLATION_DIR = ${DESTDIR}$(GNUSTEP_SYSTEM_ROOT)
 +
  include $(GNUSTEP_MAKEFILES)/common.make
  include Version
index 0af4129..fc53f25 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2009/02/17 13:02:20 joerg Exp $
+# $NetBSD: Makefile,v 1.22 2010/02/01 02:37:56 joerg Exp $
 #
 
 DISTNAME=      Ngraph-6.3.30-src
@@ -14,15 +14,19 @@ MAINTAINER= pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://www2e.biglobe.ne.jp/~isizaka/
 COMMENT=       The 2D graph and data analysis program
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 EXTRACT_ONLY=  ${DISTNAME}${EXTRACT_SUFX}
 
 USE_TOOLS+=            gmake gtar
 
+INSTALLATION_DIRS+=    bin
+
 post-extract:
        ${GTAR} -C ${WRKSRC}/combo -xzf ${DISTDIR}/ileaf-widgets.tar.Z
 
 post-install:
-       ${GTAR} -C ${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3.30-doc.tar.gz
+       ${GTAR} -C ${DESTDIR}${PREFIX}/libexec/Ngraph -xzf ${DISTDIR}/Ngraph-6.3.30-doc.tar.gz
 
 .include "../../mk/motif.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index d055e7f..aacdc13 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 08:45:02 agc Exp $
+$NetBSD: distinfo,v 1.9 2010/02/01 02:37:56 joerg Exp $
 
 SHA1 (Ngraph-6.3.30-src.tar.gz) = 81574241f35258bb14139c6ae57b28789f0d297c
 RMD160 (Ngraph-6.3.30-src.tar.gz) = 60de19f14d672cddcdb9452d7e40196f9b9b588c
@@ -9,5 +9,5 @@ Size (Ngraph-6.3.30-doc.tar.gz) = 557066 bytes
 SHA1 (ileaf-widgets.tar.Z) = db0f6425f77bc3013b7aae163be558683661560e
 RMD160 (ileaf-widgets.tar.Z) = cf3f260ce294ef839da74f19d327257978b12b3f
 Size (ileaf-widgets.tar.Z) = 70223 bytes
-SHA1 (patch-aa) = 5b1f01b6a5e75489a8782d89ddfeeb60bc1c29fa
+SHA1 (patch-aa) = ad4ad58145a1d5523111c7e60a72c6c217f32bdf
 SHA1 (patch-ab) = f2e9df51aeed77ebd6670abf0e34650f006b8c28
index f16e134..c018d70 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.6 2004/11/29 20:31:44 wiz Exp $
+$NetBSD: patch-aa,v 1.7 2010/02/01 02:37:56 joerg Exp $
 --- Makefile.orig      Sat Aug  7 19:57:39 2004
 +++ Makefile   Tue Aug 31 20:40:29 2004
 @@ -1,26 +1,42 @@
@@ -9,8 +9,8 @@ $NetBSD: patch-aa,v 1.6 2004/11/29 20:31:44 wiz Exp $
 -INSTALLDIR = /usr/local/lib/Ngraph
 -BINDIR = /usr/local/bin
 +LIBDIR = '"${PREFIX}/libexec/Ngraph"'
-+INSTALLDIR =${PREFIX}/libexec/Ngraph
-+BINDIR = ${PREFIX}/bin
++INSTALLDIR =${DESTDIR}${PREFIX}/libexec/Ngraph
++BINDIR = ${DESTDIR}${PREFIX}/bin
  #
  #
  ###############################################################################
index ba999c1..09106c5 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2010/01/15 20:48:08 zafer Exp $
+# $NetBSD: Makefile,v 1.100 2010/01/31 21:06:29 heinz Exp $
 
 DISTNAME=      exim-4.71
 PKGREVISION=   1
@@ -10,11 +10,11 @@ EXTRACT_SUFX=       .tar.bz2
 MAINTAINER=    abs@NetBSD.org
 HOMEPAGE=      http://www.exim.org/
 COMMENT=       The Exim mail transfer agent, a replacement for sendmail
+LICENSE=       gnu-gpl-v2
 
 CONFLICTS+=    exim-exiscan-[0-9]*
 
 USE_TOOLS+=    perl:run
-INSTALLATION_DIRS+=    ${PKGMANDIR}/man8
 BUILD_DEFS+=   VARBASE
 
 MAKE_ENV+=     SSLBASE=${SSLBASE:Q}
@@ -22,7 +22,7 @@ MAKE_ENV+=    INST_CHOWN=${CHOWN:Q}
 MAKE_FLAGS+=   FULLECHO=''
 MAKE_JOBS_SAFE=        no
 
-PKG_DESTDIR_SUPPORT =  destdir
+PKG_DESTDIR_SUPPORT =  user-destdir
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -49,6 +49,7 @@ RCD_SCRIPTS=          exim
 
 OWN_DIRS_PERMS=                ${VARBASE}/log/exim ${EXIM_USER} ${EXIM_GROUP} 0750
 OWN_DIRS_PERMS+=       ${VARBASE}/spool/exim ${EXIM_USER} ${EXIM_GROUP} 0750
+SPECIAL_PERMS+=                sbin/${PKGSRC_EXIM_VERSION} ${SETUID_ROOT_PERMS}
 
 # XXX: The following will be handled by buildlink3 at some point.
 CFLAGS+=               ${_STRIPFLAG_CC}
@@ -56,6 +57,16 @@ CFLAGS+=             ${_STRIPFLAG_CC}
 # pay attention to CPPFLAGS as well
 CFLAGS+=               ${CPPFLAGS}
 
+PKGSRC_EXIM_VERSION=   ${DISTNAME}-1
+SUBST_CLASSES+=                exim
+SUBST_STAGE.exim=      pre-configure
+SUBST_MESSAGE.exim=    Faking exim version information in exim_install
+SUBST_FILES.exim=      scripts/exim_install
+SUBST_VARS.exim=       PKGSRC_EXIM_VERSION
+
+INSTALL_ARG=           INSTALL_ARG=-no_chown
+INSTALL_ENV+=          ${INSTALL_ARG:Q}
+
 .include "options.mk"
 
 post-extract:
index 24a9971..527fce2 100644 (file)
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.43 2009/12/07 14:29:09 adam Exp $
+$NetBSD: distinfo,v 1.44 2010/01/31 21:06:29 heinz Exp $
 
 SHA1 (exim-4.71.tar.bz2) = 4b8f853843edcfa4f3bfbb4bef45d8dcff2fc990
 RMD160 (exim-4.71.tar.bz2) = 22e4ad1d43693d61fa1f2f2de40dda647599a087
 Size (exim-4.71.tar.bz2) = 1560170 bytes
 SHA1 (patch-aa) = cf514f31626cde31747342a2d50edd1dbf7f195f
 SHA1 (patch-ab) = f5be62c134b1a2d0870a14546ec0bb62090d498a
-SHA1 (patch-ae) = 33573e3d02edbca0c44ed54d1aadd2db50fa1fe6
+SHA1 (patch-ae) = 4a9d2fde403cfd6386742b31f062e7801ef081b9
 SHA1 (patch-ag) = 8512795060ad913f4699c277867fd24e7a785519
index ef485e4..8ef6eeb 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: patch-ae,v 1.10 2009/02/13 15:28:03 abs Exp $
+$NetBSD: patch-ae,v 1.11 2010/01/31 21:06:29 heinz Exp $
 
---- scripts/exim_install.orig  2006-04-28 11:32:21.000000000 +0100
+--- scripts/exim_install.orig  2009-10-30 16:14:04.000000000 +0100
 +++ scripts/exim_install
 @@ -84,6 +84,8 @@ if [ "${SYSTEM_ALIASES_FILE}" = "" ] ; t
    SYSTEM_ALIASES_FILE=/etc/aliases
@@ -11,7 +11,17 @@ $NetBSD: patch-ae,v 1.10 2009/02/13 15:28:03 abs Exp $
  # Allow INST_xx to over-ride xx
  case "$INST_BIN_DIRECTORY"       in ?*) BIN_DIRECTORY="$INST_BIN_DIRECTORY";; esac
  case "$INST_CONFIGURE_FILE"      in ?*) CONFIGURE_FILE="$INST_CONFIGURE_FILE";; esac
-@@ -415,15 +417,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
+@@ -220,6 +222,9 @@ while [ $# -gt 0 ]; do
+   if [ $name = exim${EXE} ]; then
+     version=exim-`./exim -bV -C /dev/null | \
+       awk '/Exim version/ { OFS=""; print $3,"-",substr($4,2,length($4)-1) }'`${EXE}
++    # only for pkgsrc: ./exim cannot run during install to DESTDIR because 
++    # EXIM_USER may not exist at this time, so we fake the version information
++    version=@PKGSRC_EXIM_VERSION@${EXE}
+     if [ "${version}" = "exim-${EXE}" ]; then
+       echo $com ""
+@@ -415,15 +420,8 @@ elif [ ! -f ${CONFIGURE_FILE} ]; then
      echo $com "*** Exim installation ${ver}failed ***"
      exit 1
    fi
index 1725107..2c7279a 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build-vars.mk,v 1.5 2007/08/13 12:03:10 rillig Exp $
+# $NetBSD: bsd.build-vars.mk,v 1.6 2010/02/01 00:16:54 joerg Exp $
 #
 # Package-settable variables:
 #
@@ -39,6 +39,7 @@ MAKE_ENV+=    WHOLE_ARCHIVE_FLAG=${WHOLE_ARCHIVE_FLAG:Q}
 MAKE_ENV+=     X11BASE=${X11BASE:Q}
 MAKE_ENV+=     X11PREFIX=${X11PREFIX:Q}
 MAKE_ENV+=     PKGMANDIR=${PKGMANDIR:Q}
+MAKE_ENV+=     PKGINFODIR=${PKGINFODIR:Q}
 
 # Provide a consistent environment for packages using (Net)BSD-style
 # Makefiles.
index 525dcbc..247c58e 100644 (file)
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/01/30 16:14:16 spz Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/31 21:49:16 spz Exp $
 #
 
 DISTNAME=              irrtoolset-5.0.0pre311
 CATEGORIES=            net
 MASTER_SITES=          ${MASTER_SITE_LOCAL}
+PKGREVISION=           1
 
 OWNER=                 spz@NetBSD.org
 HOMEPAGE=              http://irrtoolset.isc.org/
@@ -12,6 +13,10 @@ LICENSE=             no-commercial-use
 
 CONFLICTS=             IRRToolSet-4.*
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
+.include "../../mk/bsd.prefs.mk"
+
 INSTALLATION_DIRS=     ${PKGBINDIR} ${PKGMANDIR}/man1
 
 USE_LIBTOOL=           yes
@@ -23,6 +28,10 @@ GCC_REQD+=           3.0
 CONFIG_GUESS_OVERRIDE= config.guess
 CONFIG_SUB_OVERRIDE=   config.sub
 
-PKG_DESTDIR_SUPPORT=user-destdir
+.if !empty(MACHINE_PLATFORM:MNetBSD-[1-4].*) || !empty(MACHINE_PLATFORM:MNetBSD-5\.[0-9][\._]*)
+CONFIGURE_ENV+=                LEX="${PREFIX}/bin/flex"
+.include "../../devel/flex/buildlink3.mk"
+.endif
 
+.include "../../devel/readline/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index 3c025ba..4db2e13 100644 (file)
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:37 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2010/01/31 20:41:14 roy Exp $
 #
 
-DISTNAME=      wpa_supplicant-0.6.9
-PKGREVISION=   1
+DISTNAME=      wpa_supplicant-0.7.1
 CATEGORIES=    net
 MASTER_SITES=  http://hostap.epitest.fi/releases/
 
index a5d68f9..f7f5a35 100644 (file)
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.3 2009/05/11 22:47:04 roy Exp $
+$NetBSD: distinfo,v 1.4 2010/01/31 20:41:14 roy Exp $
 
-SHA1 (wpa_supplicant-0.6.9.tar.gz) = 3764f7bda4e5c87caac2b9e134cb59996f073f09
-RMD160 (wpa_supplicant-0.6.9.tar.gz) = e8427935b17c354c2654250501236dcd3f239307
-Size (wpa_supplicant-0.6.9.tar.gz) = 1178238 bytes
+SHA1 (wpa_supplicant-0.7.1.tar.gz) = ea641b046a04876827b76cda246689d0de0ed94e
+RMD160 (wpa_supplicant-0.7.1.tar.gz) = 03e3adecc1754c3a6b0ecdeac13fd1a03131dd5b
+Size (wpa_supplicant-0.7.1.tar.gz) = 1604885 bytes
index b27f074..93be6a4 100644 (file)
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.16 2008/07/14 12:56:11 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2010/01/31 21:24:33 zafer Exp $
 
 DISTNAME=      ytalk-3.3.0
 CATEGORIES=    net
-MASTER_SITES=  http://www.impul.se/ytalk/
+MASTER_SITES=  http://www.sfr-fresh.com/unix/misc/
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://www.impul.se/ytalk/index.php
index b77211d..4fa315b 100644 (file)
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.5 2008/07/28 16:27:42 cube Exp $
+# $NetBSD: Makefile,v 1.6 2010/01/31 21:14:28 zafer Exp $
 #
 
 DISTNAME=      newsx-1.6
 PKGREVISION=   2
 CATEGORIES=    news
-MASTER_SITES=  ftp://ftp.kvaleberg.com/pub/
+MASTER_SITES=  http://www.sfr-fresh.com/unix/misc/
 
 MAINTAINER=    cube@NetBSD.org
 HOMEPAGE=      http://www.kvaleberg.com/newsx.html
index 4018642..29bc2a5 100644 (file)
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2009/05/19 08:59:29 wiz Exp $
+# $NetBSD: Makefile,v 1.35 2010/01/31 21:12:20 zafer Exp $
 
 DISTNAME=      nntpclnt-1.6.1
 PKGREVISION=   6
 CATEGORIES=    news
-MASTER_SITES=  ftp://ftp.uu.net/networking/news/nntp/
+MASTER_SITES=  http://ftp.sunet.se/pub/news/nntp/
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
 COMMENT=       NNTP client library and inews client posting program
index ca06bc3..25f91dc 100644 (file)
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2009/12/10 21:19:16 asau Exp $
+# $NetBSD: Makefile,v 1.11 2010/01/31 21:08:58 zafer Exp $
 #
 
 DISTNAME=      DQS-3.3.2
 PKGNAME=       dqs-3.3.2
 PKGREVISION=   2
 CATEGORIES=    parallel
-MASTER_SITES=  http://www.go.dlr.de/fresh/unix/src/misc/
+MASTER_SITES=  http://www.sfr-fresh.com/unix/misc/old/
 EXTRACT_SUFX=  .tgz
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
index 32435ff..cb404cc 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.325 2010/01/30 00:30:04 minskim Exp $
+# $NetBSD: Makefile,v 1.326 2010/02/01 00:41:58 jym Exp $
 #
 
 COMMENT=       Desktop publishing
@@ -25,6 +25,7 @@ SUBDIR+=      chktex
 SUBDIR+=       cjk-lyx
 SUBDIR+=       cnprint
 SUBDIR+=       cups
+SUBDIR+=       cups-drivers-Magicolor5440DL
 SUBDIR+=       dvidvi
 SUBDIR+=       dviljk
 SUBDIR+=       dvipdfm
similarity index 91%
rename from wip/cups-driver-Magicolor5440DL/MESSAGE
rename to print/cups-drivers-Magicolor5440DL/MESSAGE
index dffba8c..3736df8 100644 (file)
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD$
+$NetBSD: MESSAGE,v 1.1.1.1 2010/02/01 00:38:36 jym Exp $
 
 The CUPS driver for the Konica Minolta Magicolor 5440DL requires
 ghostscript to be compiled with cups support (which is off by default).
similarity index 73%
rename from wip/cups-driver-Magicolor5440DL/Makefile
rename to print/cups-drivers-Magicolor5440DL/Makefile
index 303bacb..ac9ca52 100644 (file)
@@ -1,18 +1,17 @@
-# $NetBSD$
+# $NetBSD: Makefile,v 1.1.1.1 2010/02/01 00:38:36 jym Exp $
 #
 
 DISTNAME=      5440DL_lin64bit_1_2_1
-PKGNAME=       cups-driver-Magicolor5440DL-1.2.1
-PKGREVISION=   2
+PKGNAME=       cups-drivers-Magicolor5440DL-1.2.1
 CATEGORIES=    print
 MASTER_SITES=  http://printer.konicaminolta.net/drivers/linux/
 EXTRACT_SUFX=  .zip
 
 MAINTAINER=    pkgsrc-users@NetBSD.org
 HOMEPAGE=      http://printer.konicaminolta.com/support/current_printers/mc5440dl_sup.htm
-COMMENT=       CUPS driver for printer Konica Minolta Magicolor 5440DL
+COMMENT=       CUPS drivers for printer Konica Minolta Magicolor 5440DL
 
-BUILD_DEPENDS+=        jbigkit>=1.6:../../wip/jbigkit
+BUILD_DEPENDS+=        jbigkit>=1.6:../../graphics/jbigkit
 DEPENDS+=      cups>=1.1.14:../../print/cups
 DEPENDS+=      ghostscript>=8.0:../../print/ghostscript
 
@@ -30,6 +29,6 @@ post-extract:
                extract_file=src/magicolor5440DL-1.2.1.tar.gz; ${EXTRACT_CMD}
 
 .include "../../graphics/lcms/buildlink3.mk"
-.include "../../wip/jbigkit/buildlink3.mk"
+.include "../../graphics/jbigkit/buildlink3.mk"
 .include "../../print/cups/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
similarity index 93%
rename from wip/cups-driver-Magicolor5440DL/PLIST
rename to print/cups-drivers-Magicolor5440DL/PLIST
index 30e0ec9..ebfc9d3 100644 (file)
@@ -1,4 +1,4 @@
-@comment $NetBSD$
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/01 00:38:36 jym Exp $
 libexec/cups/filter/rastertokm5440dl
 share/KONICA_MINOLTA/mc5440DL/COPYING
 share/KONICA_MINOLTA/mc5440DL/Halftones/km_ht_00.bmp
similarity index 81%
rename from wip/cups-driver-Magicolor5440DL/distinfo
rename to print/cups-drivers-Magicolor5440DL/distinfo
index 0d6bc04..069a377 100644 (file)
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: distinfo,v 1.1.1.1 2010/02/01 00:38:36 jym Exp $
 
 SHA1 (5440DL_lin64bit_1_2_1.zip) = 130092a9345ec32a2681bacafaeadcc85563f1fa
 RMD160 (5440DL_lin64bit_1_2_1.zip) = a0a5a51eef1a7798d0f8b8d07873bd60ac2cba9b
@@ -1,4 +1,4 @@
-$NetBSD$
+$NetBSD: patch-aa,v 1.1.1.1 2010/02/01 00:38:36 jym Exp $
 
 --- configure.orig     2007-02-28 23:33:11.000000000 +0100
 +++ configure
index 7961403..0f754e3 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2010/01/16 03:49:02 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2010/02/01 00:57:07 minskim Exp $
 # TeX Live Revision 15878
 
 DISTNAME=      pkfix.doc
@@ -9,5 +9,7 @@ COMMENT=        Documentation for tex-pkfix
 
 CONFLICTS+=    tex-bin-dvipsk<=2008.12898
 
+TEX_TEXMF_DIRS+=       ${PREFIX}/share/texmf-dist
+
 .include "../../print/texlive/package.mk"
 .include "../../mk/bsd.pkg.mk"
index ed75022..c2e5d1c 100644 (file)
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2009/12/14 08:00:05 agc Exp $
+# $NetBSD: Makefile,v 1.2 2010/01/31 23:24:24 joerg Exp $
 
 DISTNAME=      seccure-0.4
+PKGREVISION=   1
 CATEGORIES=    security
 MASTER_SITES=  http://point-at-infinity.org/seccure/
 
@@ -12,6 +13,9 @@ LICENSE=      gnu-gpl-v2
 PKG_DESTDIR_SUPPORT=   user-destdir
 INSTALLATION_DIRS=     bin ${PKGMANDIR}/man1
 
-.include "../../security/libgcrypt/buildlink3.mk"
+.include "../../mk/bsd.prefs.mk"
+
+LDFLAGS+=      -Wl,-rpath,${PREFIX}/lib
 
+.include "../../security/libgcrypt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index bf8c806..53922f9 100644 (file)
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2009/12/14 08:00:05 agc Exp $
+$NetBSD: distinfo,v 1.2 2010/01/31 23:24:24 joerg Exp $
 
 SHA1 (seccure-0.4.tar.gz) = 883e335f58cc36279c33493ab219f4940a46dab8
 RMD160 (seccure-0.4.tar.gz) = fc35fdf69372c39b20a67c5341b1e36ce6bf8e9f
 Size (seccure-0.4.tar.gz) = 31881 bytes
-SHA1 (patch-aa) = 1a83424f90b94e38ccbb4c1d0fa210032c4aab65
+SHA1 (patch-aa) = 4813ab5c58779c490a0e96314333b90397df97cd
index 8bfee10..3830bb3 100644 (file)
@@ -1,7 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2009/12/14 08:00:05 agc Exp $
+$NetBSD: patch-aa,v 1.2 2010/01/31 23:24:24 joerg Exp $
 
---- Makefile   2009/12/07 22:32:10     1.1
-+++ Makefile   2009/12/07 22:37:20
+--- Makefile.orig      2009-04-09 12:42:50.000000000 +0000
++++ Makefile
 @@ -1,6 +1,9 @@
  CFLAGS = -O2 -Wall # -D NOBEEP
  
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/12/14 08:00:05 agc Exp $
  
  binaries: seccure-key seccure-encrypt seccure-decrypt seccure-sign \
        seccure-verify seccure-signcrypt seccure-veridec seccure-dh
-@@ -8,15 +11,13 @@
+@@ -8,15 +11,13 @@ binaries: seccure-key seccure-encrypt se
  doc: seccure.1 seccure.1.html
  
  install: default
@@ -36,3 +36,14 @@ $NetBSD: patch-aa,v 1.1.1.1 2009/12/14 08:00:05 agc Exp $
  
  clean:
        rm -f *.o *~ seccure-key seccure-encrypt seccure-decrypt seccure-sign \
+@@ -28,9 +29,8 @@ rebuild: clean default
+ seccure-key: seccure.o numtheory.o ecc.o serialize.o protocol.o curves.o aes256ctr.o
+-      $(CC) $(CFLAGS) -o seccure-key -lgcrypt seccure.o numtheory.o ecc.o \
++      $(CC) $(LDFLAGS) $(CFLAGS) -o seccure-key -lgcrypt seccure.o numtheory.o ecc.o \
+       curves.o serialize.o protocol.o aes256ctr.o
+-      strip seccure-key
+ seccure-encrypt: seccure-key
+       ln -f seccure-key seccure-encrypt
index 9af6cb5..fed538d 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2010/01/27 21:21:03 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/01/31 23:13:24 joerg Exp $
 
 DISTNAME=              tacshell-0.91
 PKGREVISION=           1
@@ -16,9 +16,9 @@ CONF_FILES+=          $(PREFIX)/share/examples/tacshell/tacshell.conf \
                        ${PKG_SYSCONFDIR}/tacshell.conf
 
 INSTALLATION_DIRS+=    bin share/examples/tacshell
-INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX}
 
-post-install:
+do-install:
+       ${INSTALL_PROGRAM} ${WRKSRC}/tacshell ${DESTDIR}${PREFIX}/bin
        ${INSTALL_DATA} ${WRKSRC}/tacshell.conf-example \
            ${DESTDIR}${PREFIX}/share/examples/tacshell/tacshell.conf
 
index 6e4fe7e..53b0b90 100644 (file)
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2006/02/20 23:05:27 wiz Exp $
+$NetBSD: distinfo,v 1.4 2010/01/31 23:13:24 joerg Exp $
 
 SHA1 (tacshell-0.91.tar.gz) = cddbdfd0bacd197d0783270898d3935026c9e54d
 RMD160 (tacshell-0.91.tar.gz) = ac436ecb10c1a50852ec63b66f786bcbe0b24eb6
 Size (tacshell-0.91.tar.gz) = 56453 bytes
-SHA1 (patch-aa) = 901014cd45cc8e3dc693bc8f3fc0fe548b24aef3
diff --git a/security/tacshell/patches/patch-aa b/security/tacshell/patches/patch-aa
deleted file mode 100644 (file)
index 552a694..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1 2006/02/20 23:05:27 wiz Exp $
-
---- Makefile.in.orig   2004-05-26 11:48:36.000000000 +0000
-+++ Makefile.in
-@@ -21,8 +21,6 @@ tacshell: tacshell.o $(SHARED_OBJS)
- install: all
-       $(INSTALL) -o root -m 555 tacshell $(PREFIX)/bin/tacshell
--      mkdir -p -m 755 $(PREFIX)/etc
--      $(INSTALL_DATA) -o root tacshell.conf-example $(PREFIX)/etc/tacshell.conf-example
- pam_tacplus.so.1: pam.o $(SHARED_OBJS)
-       $(CC) $(LDFLAGS) -shared -o pam_tacplus.so.1 pam.o $(SHARED_OBJS) $(LIBS)
index cba80d0..5b2201e 100644 (file)
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/01/19 08:23:43 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2010/01/31 22:47:34 joerg Exp $
 #
 
 DISTNAME=              wmzcalock-0.1
@@ -31,4 +31,5 @@ do-install:
 
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../x11/libXpm/buildlink3.mk"
+.include "../../x11/xextproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
index 8ede422..671b84b 100644 (file)
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3784 2010/01/31 17:31:20 rhialto Exp $
+# $Id: Makefile,v 1.3785 2010/02/01 02:01:19 jym-netbsd Exp $
 #
 
 COMMENT=       WIP pkgsrc packages
@@ -253,7 +253,6 @@ SUBDIR+=    csp2b
 SUBDIR+=       cspchecker
 SUBDIR+=       css-mode
 SUBDIR+=       csstidy
-SUBDIR+=       cups-driver-Magicolor5440DL
 SUBDIR+=       cvs-syncmail
 SUBDIR+=       cvs20hg
 SUBDIR+=       cvs2darcs
index 942ac19..cea5a0d 100644 (file)
@@ -9,7 +9,6 @@ MAINTAINER=     tnn@NetBSD.org
 HOMEPAGE=      http://www.mozilla.com/en-US/firefox/
 COMMENT=       Web browser with support for extensions
 
-WRKSRC=                ${WRKDIR}/mozilla-1.9.2
 MOZILLA_DIR=   # empty
 
 CONFIGURE_ARGS+=       --enable-application=browser
@@ -51,7 +50,9 @@ post-install:
        rm -f ${DESTDIR}${PREFIX}/bin/firefox
        ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
 
-BUILDLINK_API_DEPENDS.xulrunner+=      xulrunner-1.9.2
+BUILDLINK_API_DEPENDS.xulrunner+=      xulrunner>=${MOZ_BRANCH} # .${MOZ_BRANCH_MINOR}
+BUILD_DEPENDS+=                                xulrunner-${MOZ_BRANCH}{,nb*}:../../wip/xulrunner
+#BUILD_DEPENDS+=                               xulrunner-${MOZ_BRANCH}.${MOZ_BRANCH_MINOR}{,nb*}:../../wip/xulrunner
 .include "../../wip/xulrunner/buildlink3.mk"
 PLIST_VARS+=   gnome
 .if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)
index cbdde59..96bf5bc 100644 (file)
@@ -10,20 +10,18 @@ HOMEPAGE=   http://kmymoney2.sourceforge.net/
 COMMENT=       Personal finance manager for KDE 4
 LICENSE=       gnu-gpl-v2
 
+BUILD_DEPENDS+=        automoc4-[0-9]*:../../devel/automoc4
+
 #MAKE_JOBS_SAFE=no
 
 USE_CMAKE=             yes
 USE_TOOLS+=            msgfmt pkg-config perl
-USE_TOOLS+=            automoc4 kconfig_compiler
-USE_TOOLS+=            gpgme-config
 USE_TOOLS+=            gsed
 USE_TOOLS+=            gmake
 USE_LANGUAGES=         c c++
 
 REPLACE_PERL+= contrib/splitup-kde-chunk-online
 
-BUILD_DEPENDS+=        automoc4:../../devel/automoc4
-
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
@@ -32,6 +30,7 @@ BUILD_DEPENDS+=       automoc4:../../devel/automoc4
 .include "../../misc/kdepim4/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxml++/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
index aa6f102..e35a513 100644 (file)
@@ -1,3 +1,4 @@
+@comment $NetBSD$
 bin/kmymoney
 include/kmymoney/importinterface.h
 include/kmymoney/imymoneyserialize.h
index c9cfe1c..0a7a3ba 100644 (file)
@@ -3,4 +3,4 @@ $NetBSD: distinfo,v 1.9 2007/05/23 13:38:23 obache Exp $
 SHA1 (kmymoney-3.95.0.tar.bz2) = 5d5be54426faddfeaff5fa65b9fd5067a9d7ce41
 RMD160 (kmymoney-3.95.0.tar.bz2) = 94c052f48782e328726821d48eb05fbb7a445962
 Size (kmymoney-3.95.0.tar.bz2) = 14214541 bytes
-SHA1 (patch-aa) = e796595c26a439e801ea5f00585be6e3a259e718
+SHA1 (patch-aa) = af38477e2052a4fd509d24fdefa3a0151d4cd8b3
index 07531a0..226321d 100644 (file)
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.2 2008/04/12 22:43:00 jlam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kmymoney2
-PKG_SUPPORTED_OPTIONS= libofx 
+PKG_SUPPORTED_OPTIONS= libofx
 PKG_SUGGESTED_OPTIONS= libofx
 
 .include "../../mk/bsd.options.mk"
index a85f259..ebe5422 100644 (file)
@@ -1,3 +1,5 @@
+$NetBSD$
+
 --- libkdchart/kdablibfakes/src/KDABLibFakes.h.orig    2010-01-12 22:04:51.000000000 -0500
 +++ libkdchart/kdablibfakes/src/KDABLibFakes.h 2010-01-12 22:07:07.000000000 -0500
 @@ -72,7 +72,7 @@
index eeec02c..fa9927a 100644 (file)
@@ -9,6 +9,8 @@ HOMEPAGE=       http://kmymoney2.sourceforge.net/
 COMMENT=       Personal finance manager for KDE 4, Subversion Snapshot
 LICENSE=       gnu-gpl-v2
 
+BUILD_DEPENDS+=        automoc4-[0-9]*:../../devel/automoc4
+
 SVN_REPOSITORIES=      kmymoney
 SVN_ROOT.kmymoney=     svn://anonsvn.kde.org/home/kde/trunk/playground/office/kmymoney
 NO_CHECKSUM=YES
@@ -17,16 +19,12 @@ NO_CHECKSUM=YES
 
 USE_CMAKE=             yes
 USE_TOOLS+=            msgfmt pkg-config perl
-USE_TOOLS+=            automoc4 kconfig_compiler
-USE_TOOLS+=            gpgme-config
 USE_TOOLS+=            gsed
 USE_TOOLS+=            gmake
 USE_LANGUAGES=         c c++
 
 REPLACE_PERL+= contrib/splitup-kde-chunk-online
 
-BUILD_DEPENDS+=        automoc4:../../devel/automoc4
-
 .include "../../meta-pkgs/kde4/kde4.mk"
 .include "../../databases/shared-mime-info/buildlink3.mk"
 .include "../../devel/boost-libs/buildlink3.mk"
@@ -35,6 +33,7 @@ BUILD_DEPENDS+=       automoc4:../../devel/automoc4
 .include "../../misc/kdepim4/buildlink3.mk"
 .include "../../multimedia/phonon/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/libxml++/buildlink3.mk"
 .include "../../time/libical/buildlink3.mk"
index 7fae5be..f9ac964 100644 (file)
@@ -1,3 +1,4 @@
+@comment $NetBSD$
 bin/kmymoney
 include/kmymoney/importinterface.h
 include/kmymoney/imymoneyprocessingcalendar.h
index 07531a0..226321d 100644 (file)
@@ -1,7 +1,7 @@
 # $NetBSD: options.mk,v 1.2 2008/04/12 22:43:00 jlam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.kmymoney2
-PKG_SUPPORTED_OPTIONS= libofx 
+PKG_SUPPORTED_OPTIONS= libofx
 PKG_SUGGESTED_OPTIONS= libofx
 
 .include "../../mk/bsd.options.mk"
index 1927ee6..775b60f 100644 (file)
@@ -6,6 +6,8 @@ CATEGORIES=     databases
 
 COMMENT=       POCO C++ MySQL RDBMS Accessor libraries
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../wip/poco/Makefile.common"
index 4f708be..33a2914 100644 (file)
@@ -9,7 +9,7 @@ include/Poco/Data/MySQL/MySQLStatementImpl.h
 include/Poco/Data/MySQL/SessionHandle.h
 include/Poco/Data/MySQL/SessionImpl.h
 include/Poco/Data/MySQL/StatementExecutor.h
-lib/libPocoMySQLd.so.8
-lib/libPocoMySQL.so.8
+lib/libPocoMySQLd.so.9
+lib/libPocoMySQL.so.9
 lib/libPocoMySQLd.so
 lib/libPocoMySQL.so
index ce7910e..52d3287 100644 (file)
@@ -6,6 +6,8 @@ CATEGORIES=     databases
 
 COMMENT=       POCO C++ SQLite RDBMS Accessor libraries
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../wip/poco/Makefile.common"
index 4ef5af1..a187f85 100644 (file)
@@ -7,7 +7,7 @@ include/Poco/Data/SQLite/Extractor.h
 include/Poco/Data/SQLite/Utility.h
 include/Poco/Data/SQLite/SQLite.h
 include/Poco/Data/SQLite/SQLiteStatementImpl.h
-lib/libPocoSQLited.so.8
-lib/libPocoSQLite.so.8
+lib/libPocoSQLited.so.9
+lib/libPocoSQLite.so.9
 lib/libPocoSQLited.so
 lib/libPocoSQLite.so
index b4d3db1..051f2b4 100644 (file)
@@ -6,6 +6,8 @@ CATEGORIES=     databases
 
 COMMENT=       POCO C++ RDBMS Master Accessor libraries
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../wip/poco/Makefile.common"
index fd7eff0..10d6b92 100644 (file)
@@ -30,7 +30,7 @@ include/Poco/Data/SessionPool.h
 include/Poco/Data/Statement.h
 include/Poco/Data/StatementImpl.h
 include/Poco/Data/TypeHandler.h
-lib/libPocoDatad.so.8
-lib/libPocoData.so.8
+lib/libPocoDatad.so.9
+lib/libPocoData.so.9
 lib/libPocoDatad.so
 lib/libPocoData.so
index d54ff9e..f38edd9 100644 (file)
@@ -6,9 +6,15 @@ CATEGORIES=    devel
 
 COMMENT=       POCO C++ libraries
 
+PKG_DESTDIR_SUPPORT=   user-destdir
+
 .include "../../mk/bsd.prefs.mk"
 
 .include "../../wip/poco/Makefile.common"
 
+.include "../../devel/pcre/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
+.include "../../textproc/expat/buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
index 9e18d89..8b29ed9 100644 (file)
@@ -17,8 +17,6 @@ HOMEPAGE=     http://www.pocoproject.org/
 PATCHDIR=      ${.CURDIR}/../../wip/poco/patches
 DISTINFO_FILE= ${.CURDIR}/../../wip/poco/distinfo
 
-PKG_DESTDIR_SUPPORT=   user-destdir
-
 HAS_CONFIGURE= yes
 USE_LANGUAGES= c c++
 USE_TOOLS+=    gmake
index d268ede..3d2ca57 100644 (file)
@@ -1,4 +1,6 @@
 @comment $NetBSD$
+bin/cpspc
+bin/cpspcd
 include/Poco/ASCIIEncoding.h
 include/Poco/AbstractCache.h
 include/Poco/AbstractDelegate.h
@@ -191,6 +193,7 @@ include/Poco/MD4Engine.h
 include/Poco/MD5Engine.h
 include/Poco/Manifest.h
 include/Poco/MemoryPool.h
+include/Poco/MemoryStream.h
 include/Poco/Message.h
 include/Poco/MetaObject.h
 include/Poco/MetaProgramming.h
@@ -537,30 +540,30 @@ include/Poco/Zip/ZipUtil.h
 include/Poco/zconf.h
 include/Poco/zlib.h
 lib/libPocoCrypto.so
-lib/libPocoCrypto.so.8
+lib/libPocoCrypto.so.9
 lib/libPocoCryptod.so
-lib/libPocoCryptod.so.8
+lib/libPocoCryptod.so.9
 lib/libPocoFoundation.so
-lib/libPocoFoundation.so.8
+lib/libPocoFoundation.so.9
 lib/libPocoFoundationd.so
-lib/libPocoFoundationd.so.8
+lib/libPocoFoundationd.so.9
 lib/libPocoNet.so
-lib/libPocoNet.so.8
+lib/libPocoNet.so.9
 lib/libPocoNetSSL.so
-lib/libPocoNetSSL.so.8
+lib/libPocoNetSSL.so.9
 lib/libPocoNetSSLd.so
-lib/libPocoNetSSLd.so.8
+lib/libPocoNetSSLd.so.9
 lib/libPocoNetd.so
-lib/libPocoNetd.so.8
+lib/libPocoNetd.so.9
 lib/libPocoUtil.so
-lib/libPocoUtil.so.8
+lib/libPocoUtil.so.9
 lib/libPocoUtild.so
-lib/libPocoUtild.so.8
+lib/libPocoUtild.so.9
 lib/libPocoXML.so
-lib/libPocoXML.so.8
+lib/libPocoXML.so.9
 lib/libPocoXMLd.so
-lib/libPocoXMLd.so.8
+lib/libPocoXMLd.so.9
 lib/libPocoZip.so
-lib/libPocoZip.so.8
+lib/libPocoZip.so.9
 lib/libPocoZipd.so
-lib/libPocoZipd.so.8
+lib/libPocoZipd.so.9
index 04a8405..ce9dccc 100644 (file)
@@ -7,7 +7,7 @@ SHA1 (patch-aa) = cc45ce4f9b4c436480118add580ec128a9fe0777
 SHA1 (patch-ab) = f4f3f7f1c6628ad5d6e77e836f6eaa1f9e97bcbd
 SHA1 (patch-ac) = 7e0009dc20e4f2591b1fb3dd13e2f1fa607069fd
 SHA1 (patch-ad) = 1e748455375209135f94f0e5b153b6f2ef246e60
-SHA1 (patch-ae) = 3537d14d8d2955f1d9320967d2605ccbda20dc7c
-SHA1 (patch-af) = e98622ea895a8ea714a7289b7d5785bcd0202809
-SHA1 (patch-ag) = f405cec78d54e8de2fb5a6c7af7d4af010003716
+SHA1 (patch-ae) = 3aa08ed41cbbb940d5608dc9c698afd0f6b78888
+SHA1 (patch-af) = c335cee1d396c44e14b8f0c3f0632a32ee76a807
+SHA1 (patch-ag) = 494570039ce7fb3de3df568ed469f03ede65721f
 SHA1 (patch-ah) = 883125e6d613c8f42463b200eab729e2c15f7070
index fafc34a..ecedb20 100644 (file)
@@ -1,6 +1,6 @@
 $NetBSD$
 
---- build/config/FreeBSD.orig  2009-05-12 13:22:09.000000000 -0500
+--- build/config/FreeBSD.orig  2010-01-15 12:13:34.000000000 +0000
 +++ build/config/FreeBSD
 @@ -20,7 +20,8 @@ CXX     = g++
  LINK    = $(CXX)
@@ -17,7 +17,7 @@ $NetBSD$
  SHAREDOPT_CC    = -fPIC
  SHAREDOPT_CXX   = -fPIC
 -SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH)
-+SHAREDOPT_LINK  = -Wl,-rpath,$(LIBPATH) -L$(POCO_PREFIX)/lib
++SHAREDOPT_LINK  = -Wl,-rpath,$(POCO_PREFIX)/lib -L$(LIBPATH)
  DEBUGOPT_CC     = -g -D_DEBUG
  DEBUGOPT_CXX    = -g -D_DEBUG
  DEBUGOPT_LINK   = -g
index 2aecfe3..f9bc6a2 100644 (file)
@@ -1,8 +1,8 @@
 $NetBSD$
 
---- configure.orig     2009-05-12 13:22:09.000000000 -0500
+--- configure.orig     2010-01-15 12:13:34.000000000 +0000
 +++ configure
-@@ -184,38 +184,40 @@ if [ "$base" != "$build" ] ; then
+@@ -194,45 +194,47 @@ if [ "$base" != "$build" ] ; then
        cp $base/Makefile $build
  fi
  
@@ -34,6 +34,10 @@ $NetBSD$
 -      echo "POCO_ADD_LIBRARY = $librarypath" >>$build/config.make
 +      echo "POCO_ADD_LIBRARY = $librarypath" >>$build/config.build
  fi
+ if [ "$unbundled" != "" ] ; then
+-      echo "POCO_UNBUNDLED = 1" >>$build/config.make
++      echo "POCO_UNBUNDLED = 1" >>$build/config.build
+ fi
 -echo "export POCO_CONFIG" >>$build/config.make
 -echo "export POCO_BASE" >>$build/config.make
 -echo "export POCO_BUILD" >>$build/config.make
@@ -56,9 +60,15 @@ $NetBSD$
 -      echo "export POCO_ADD_LIBRARY" >>$build/config.make
 +      echo "export POCO_ADD_LIBRARY" >>$build/config.build
  fi
+ if [ "$unbundled" != "" ] ; then
+-      echo "export POCO_UNBUNDLED " >>$build/config.make
++      echo "export POCO_UNBUNDLED " >>$build/config.build
+ fi
  
-+echo '# config.make generated by configure script' >$build/config.make
+-echo ".PHONY: poco" >>$build/config.make
++echo '# config.make generated by configure script' > $build/config.make
 +echo 'sinclude config.build' >> $build/config.make
- echo ".PHONY: poco" >>$build/config.make
++echo '.PHONY: poco' >>$build/config.make
  echo "poco: libexecs $tests $samples" >>$build/config.make
  
+ echo "Configured for $config"
index 10e5f56..051fadf 100644 (file)
@@ -1,13 +1,13 @@
 $NetBSD$
 
---- Makefile.orig      2009-05-12 13:22:15.000000000 -0500
+--- Makefile.orig      2010-01-15 12:13:39.000000000 +0000
 +++ Makefile
 @@ -24,7 +24,9 @@ endif
  all: libexecs tests samples
  
  INSTALLDIR = $(DESTDIR)$(POCO_PREFIX)
--COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip
-+Master_COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip
+-COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler
++Master_COMPONENTS = Foundation XML Util Net Crypto NetSSL_OpenSSL Data Data/SQLite Data/ODBC Data/MySQL Zip PageCompiler
 +
 +COMPONENTS = $(filter-out $(foreach f,$(OMIT),$f%),$(Master_COMPONENTS))
  
index 3364873..90ba545 100644 (file)
@@ -2,7 +2,7 @@
 #
 
 .include "dist.mk"
-PKGNAME=       ${DISTNAME:S/firefox/xulrunner/:S/3.6/1.9.2/:S/.source//}
+PKGNAME=       xulrunner-${MOZ_BRANCH} # .${MOZ_BRANCH_MINOR}
 CATEGORIES=    devel www
 
 MAINTAINER=    tnn@NetBSD.org
index e384e47..12475da 100644 (file)
@@ -4,11 +4,13 @@
 # used by wip/firefox/Makefile
 
 DISTNAME=      firefox-${FIREFOX_VER}.source
-FIREFOX_VER=   3.6
+FIREFOX_VER=   3.6     # .${MOZ_BRANCH_MINOR}
+MOZ_BRANCH=    1.9.2
+MOZ_BRANCH_MINOR=      # empty
 MASTER_SITES=  ${MASTER_SITE_MOZILLA:=firefox/releases/${FIREFOX_VER}/source/}
 EXTRACT_SUFX=  .tar.bz2
 
 DISTINFO_FILE= ${.CURDIR}/../../wip/xulrunner/distinfo
 PATCHDIR=      ${.CURDIR}/../../wip/xulrunner/patches
 
-WRKSRC=                ${WRKDIR}/mozilla-1.9.2
+WRKSRC=                ${WRKDIR}/mozilla-${MOZ_BRANCH}
index a0167f5..65d0e4f 100644 (file)
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.68 2010/01/26 16:22:59 tron Exp $
+# $NetBSD: Makefile,v 1.69 2010/01/31 21:02:48 tnn Exp $
 
 .include "../../devel/xulrunner/dist.mk"
 PKGNAME=       firefox-${FIREFOX_VER}
+PKGREVISION=   1
 CATEGORIES=    www
 
 MAINTAINER=    tnn@NetBSD.org
@@ -9,7 +10,6 @@ HOMEPAGE=      http://www.mozilla.com/en-US/firefox/
 COMMENT=       Web browser with support for extensions
 LICENSE=       mpl-1.1
 
-WRKSRC=                ${WRKDIR}/mozilla-1.9.1
 MOZILLA_DIR=   # empty
 
 CONFIGURE_ARGS+=       --enable-application=browser
@@ -51,7 +51,8 @@ post-install:
        rm -f ${DESTDIR}${PREFIX}/bin/firefox
        ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin
 
-BUILDLINK_API_DEPENDS.xulrunner+=      xulrunner-1.9.1.7{,nb*}
+BUILDLINK_API_DEPENDS.xulrunner+=      xulrunner>=${MOZ_BRANCH}.${MOZ_BRANCH_MINOR}
+BUILD_DEPENDS+=                                xulrunner-${MOZ_BRANCH}.${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner
 .include "../../devel/xulrunner/buildlink3.mk"
 PLIST_VARS+=   gnome
 .if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome)