From e2d295865810e9d0be2ff620583ea004f8abdf0e Mon Sep 17 00:00:00 2001 From: Charlie Date: Thu, 11 Feb 2010 18:42:13 -0800 Subject: [PATCH] update Thu Feb 11 18:37:00 PST 2010 --- archivers/file-roller/Makefile | 4 +- archivers/sapcar/Makefile | 6 +- audio/pulseaudio/buildlink3.mk | 3 +- chat/Makefile | 4 +- chat/i2cb/Makefile | 4 +- database/py-cx_Oracle/DESCR | 1 + database/py-cx_Oracle/Makefile | 32 +++ database/py-cx_Oracle/PLIST | 6 + database/py-cx_Oracle/distinfo | 5 + databases/Makefile | 3 +- devel/dmalloc/Makefile | 21 +- devel/dmalloc/PLIST | 3 +- devel/dmalloc/distinfo | 9 +- devel/dmalloc/patches/patch-aa | 40 +++ devel/py-dulwich/Makefile | 9 +- devel/py-dulwich/PLIST | 9 +- devel/py-dulwich/distinfo | 8 +- devel/sapnwrfcsdk/Makefile | 6 +- doc/CHANGES-2010 | 13 +- doc/TODO | 8 +- fonts/tex-metafont/Makefile | 5 +- graphics/extrema/Makefile | 5 +- graphics/extrema/PLIST | 12 +- graphics/extrema/distinfo | 8 +- graphics/veusz/Makefile | 10 +- graphics/veusz/PLIST | 249 ++++++++++++++---- graphics/veusz/distinfo | 8 +- lang/openjdk7/Makefile | 4 +- lang/python26/Makefile | 20 +- lang/python26/PLIST.common | 4 +- lang/python26/distinfo | 4 +- lang/python26/patches/patch-am | 38 ++- lang/swi-prolog-lite/PLIST | 4 +- lang/tcl-itcl-current/Makefile | 7 +- lang/tcl-itcl/Makefile | 5 +- lang/tcl-itcl/distinfo | 6 +- lang/tcl-itcl/patches/patch-ab | 6 +- lang/tcl-itcl/patches/patch-ad | 6 +- lang/yap/Makefile | 17 +- lang/yap/PLIST | 243 ++++++----------- lang/yap/distinfo | 18 +- lang/yap/patches/patch-ab | 16 +- lang/yap/patches/patch-ac | 12 +- lang/yap/patches/patch-ad | 16 ++ lang/yap/patches/patch-ae | 14 + lang/yap/patches/patch-af | 15 ++ lang/yap/patches/patch-ag | 56 ++++ lang/yap/patches/patch-ah | 15 ++ lang/yap/patches/patch-ai | 15 ++ mail/gmime/Makefile | 3 +- mail/gmime/distinfo | 3 +- mail/gmime/patches/patch-aa | 16 ++ mail/jchkmail/Makefile | 9 +- mail/jchkmail/distinfo | 4 +- mail/jchkmail/patches/patch-ad | 19 +- mail/smtpfeed/Makefile | 9 +- math/octave/Makefile | 5 +- math/octave/distinfo | 14 +- math/octave/patches/patch-ad | 4 +- math/octave/patches/patch-af | 4 +- math/octave/patches/patch-ag | 4 +- mbone/Makefile | 8 +- misc/chord/Makefile | 6 +- misc/chord/distinfo | 4 +- misc/chord/patches/patch-aa | 10 +- misc/dirdiff/Makefile | 10 +- misc/dotfile/Makefile | 11 +- misc/dync/Makefile | 10 +- misc/elizatalk/Makefile | 6 +- misc/elizatalk/distinfo | 4 +- misc/elizatalk/patches/patch-aa | 6 +- misc/iselect/Makefile | 10 +- misc/kanjipad/Makefile | 10 +- misc/kchm/Makefile | 8 +- misc/kp/Makefile | 7 +- misc/lile/Makefile | 10 +- misc/nxtvepg/Makefile | 5 +- misc/nxtvepg/distinfo | 4 +- misc/nxtvepg/patches/patch-aa | 4 +- multimedia/dvdview/Makefile | 9 +- multimedia/flashplayer/Makefile | 6 +- multimedia/goggles/Makefile | 8 +- multimedia/libflash/Makefile | 6 +- multimedia/libflash/distinfo | 6 +- multimedia/libflash/patches/patch-ab | 8 +- multimedia/libflash/patches/patch-af | 4 +- multimedia/mpeg-lib/Makefile | 10 +- multimedia/openquicktime/Makefile | 7 +- multimedia/xfmedia/Makefile | 6 +- net/IglooFTP/Makefile | 6 +- net/IglooFTP/distinfo | 4 +- net/IglooFTP/patches/patch-aa | 18 +- net/Makefile | 3 +- net/airportbasestationconfig/Makefile | 19 +- net/airportmodemutility/Makefile | 17 +- net/bounce/Makefile | 11 +- net/cia/Makefile | 15 +- net/cidr/Makefile | 6 +- net/dcsharp/Makefile | 8 +- net/driftnet/Makefile | 8 +- net/dtcp/Makefile | 7 +- net/dtcp/distinfo | 4 +- net/dtcp/patches/patch-aa | 6 +- net/dynipclient/Makefile | 15 +- net/edonkey2k/Makefile | 6 +- net/entropy/Makefile | 27 +- net/fair-identd/Makefile | 6 +- net/fpdns/Makefile | 8 +- net/freenet-tools/Makefile | 8 +- net/ftpproxy/Makefile | 8 +- net/gnet1/Makefile | 4 +- net/gnet1/distinfo | 3 +- net/gnet1/patches/patch-af | 17 ++ net/gt-itm/Makefile | 8 +- net/gtk_wicontrol/Makefile | 4 +- net/gtk_wicontrol/distinfo | 3 +- net/gtk_wicontrol/patches/patch-af | 25 ++ net/hf6to4/Makefile | 12 +- net/ipcheck/Makefile | 6 +- net/iperf/Makefile | 6 +- net/iplog/Makefile | 9 +- net/ipv6calc/Makefile | 4 +- net/isc-dhcp/Makefile.common | 56 ---- net/isc-dhcp/buildlink3.mk | 12 - net/isc-dhcp/files/isc_dhclient.sh | 33 --- net/isc-dhcp/files/isc_dhcpd.sh | 36 --- net/isc-dhcp/files/isc_dhcrelay.sh | 33 --- net/isc-dhcp/files/site.conf | 25 -- net/isc-dhcp/files/site.h | 8 - net/isc-dhcp/patches/patch-aa | 13 - net/isc-dhcp/patches/patch-ab | 22 -- net/isc-dhcp/patches/patch-ad | 18 -- net/ishell/Makefile | 4 +- net/ishell/distinfo | 4 +- net/ishell/patches/patch-aa | 6 +- net/jumpgate/Makefile | 10 +- net/jwhois/Makefile | 9 +- net/kismet/Makefile | 17 +- net/lambdamoo-core/Makefile | 11 +- net/lambdamoo-doc/Makefile | 13 +- net/lambdamoo/Makefile | 23 +- net/latd/Makefile | 4 +- net/latd/distinfo | 4 +- net/latd/patches/patch-ac | 6 +- net/lft/Makefile | 10 +- net/libnipper/Makefile | 9 +- net/llnlxdir/Makefile | 8 +- net/llnlxftp/Makefile | 8 +- net/mcast-tools/Makefile | 12 +- net/mirror/Makefile | 8 +- net/mirror/distinfo | 4 +- net/mirror/patches/patch-aa | 8 +- net/mrtg/Makefile | 29 +- net/mtftpd/Makefile | 9 +- net/mydns-mysql/Makefile | 4 +- net/mydns-pgsql/Makefile | 4 +- net/mydns-pgsql/Makefile.common | 9 +- net/netgroup/Makefile | 7 +- net/netname/Makefile | 4 +- net/netname/distinfo | 4 +- net/netname/patches/patch-aa | 4 +- net/netpipes/Makefile | 4 +- net/netpipes/distinfo | 4 +- net/netpipes/patches/patch-aa | 4 +- net/nfdump/Makefile | 4 +- net/nidentd/Makefile | 10 +- net/nipper/Makefile | 4 +- net/nprobe/Makefile | 6 +- net/nstx/Makefile | 13 +- net/ntop/Makefile | 4 +- net/ocamlnet/distinfo | 4 +- net/ocamlnet/patches/patch-ab | 4 +- net/oinkmaster/Makefile | 31 +-- net/openag/Makefile | 9 +- net/openh323/Makefile | 22 +- net/openntpd/Makefile | 13 +- net/openwbem/Makefile | 4 +- net/openwbem/distinfo | 4 +- net/openwbem/patches/patch-ad | 4 +- net/overnet/Makefile | 14 +- net/pear-Net_LDAP2/DESCR | 12 + net/pear-Net_LDAP2/Makefile | 13 + net/pear-Net_LDAP2/distinfo | 5 + net/queryperf/Makefile | 16 +- net/ra-rtsp-proxy/Makefile | 15 +- net/radiusd-cistron/Makefile | 16 +- net/radiusd-cistron/distinfo | 6 +- net/radiusd-cistron/patches/patch-aa | 10 +- net/radiusd-cistron/patches/patch-ab | 4 +- net/rinetd/Makefile | 8 +- net/rootprobe/Makefile | 8 +- net/scamper/Makefile | 6 +- net/sdig/Makefile | 14 +- net/sdig/distinfo | 4 +- net/sdig/patches/patch-aa | 8 +- net/sitescooper/Makefile | 24 +- net/slurm/Makefile | 16 +- net/sniffit/Makefile | 10 +- net/speedtouch/Makefile | 6 +- net/stripes/Makefile | 8 +- net/sup/Makefile | 6 +- net/sup/distinfo | 4 +- net/sup/patches/patch-aa | 8 +- net/tcpdmerge/Makefile | 9 +- net/tcpdstat/Makefile | 10 +- net/tcpillust/Makefile | 12 +- net/tcptrace/Makefile | 13 +- net/tcptraceroute/Makefile | 16 +- net/ttt/Makefile | 8 +- net/ucarp/Makefile | 12 +- net/udptunnel/Makefile | 6 +- net/upclient/Makefile | 24 +- net/wimon/Makefile | 7 +- net/wistumbler/Makefile | 10 +- net/wmget/Makefile | 10 +- net/wminet/Makefile | 10 +- net/wu-ftpd/Makefile | 4 +- net/xipdump/Makefile | 14 +- net/xipdump/distinfo | 4 +- net/xipdump/patches/patch-ae | 4 +- net/xmftp/Makefile | 9 +- net/xnap/Makefile | 15 +- net/xrmftp/Makefile | 6 +- net/xtraceroute/Makefile | 11 +- net/xtraceroute/distinfo | 3 +- net/xtraceroute/patches/patch-ad | 25 ++ net/youtube-dl/Makefile | 7 +- net/youtube-dl/distinfo | 8 +- net/ywho/Makefile | 8 +- news/cleanscore/Makefile | 11 +- news/nget/Makefile | 10 +- news/suck/Makefile | 12 +- news/xrn/Makefile | 9 +- pkgtools/pkg_rolling-replace/Makefile | 5 +- .../files/pkg_rolling-replace.sh | 66 +++-- print/LPRng-core/Makefile | 20 +- print/Makefile | 5 +- print/chktex/Makefile | 7 +- print/cjk-lyx/Makefile | 4 +- print/cnprint/Makefile | 21 +- print/dvidvi/Makefile | 8 +- print/flpsed/Makefile | 9 +- print/foomatic-filters/Makefile | 8 +- print/foomatic-ppds/Makefile | 10 +- print/ja-jsclasses/Makefile | 11 +- print/magicfilter/Makefile | 12 +- print/mpage/Makefile | 7 +- print/rlpr/Makefile | 4 +- print/rtf2latex/Makefile | 6 +- print/rtf2latex/files/Makefile | 12 +- print/rtf2latex2e/Makefile | 14 +- print/stylewriter/Makefile | 22 +- print/tex-anonchap/DESCR | 4 + print/tex-anonchap/Makefile | 11 + print/tex-anonchap/PLIST | 2 + print/tex-anonchap/distinfo | 5 + print/tex-ifluatex-doc/Makefile | 6 +- print/tex-ifluatex-doc/distinfo | 8 +- print/tex-ifluatex/Makefile | 5 +- print/tex-ifluatex/distinfo | 8 +- print/tex-ifxetex-doc/Makefile | 6 +- print/tex-ifxetex-doc/distinfo | 8 +- print/tex-luatex/Makefile | 11 +- print/tex-luatex/PLIST | 5 +- print/tex-luatex/distinfo | 8 +- shells/es/Makefile | 6 +- shells/es/distinfo | 4 +- shells/es/patches/patch-aa | 8 +- shells/esh/Makefile | 20 +- shells/rssh/Makefile | 6 +- shells/rssh/distinfo | 4 +- shells/rssh/patches/patch-aa | 14 +- sysutils/munin-doc/Makefile | 7 +- textproc/Makefile | 3 +- textproc/py-creole/DESCR | 4 + textproc/py-creole/Makefile | 20 ++ textproc/py-creole/PLIST | 45 ++++ textproc/py-creole/distinfo | 5 + textproc/py-pygments/Makefile | 4 +- textproc/py-pygments/PLIST | 12 +- textproc/py-pygments/distinfo | 8 +- time/ocaml-calendar/Makefile | 6 +- time/ocaml-calendar/distinfo | 3 +- time/ocaml-calendar/patches/patch-aa | 20 ++ time/wmfishtime/Makefile | 6 +- time/wmfishtime/distinfo | 4 +- time/wmfishtime/patches/patch-aa | 6 +- time/wmmoonclock/Makefile | 6 +- time/wmmoonclock/distinfo | 4 +- time/wmmoonclock/patches/patch-aa | 6 +- wip/cabocha/Makefile | 12 +- wip/cabocha/options.mk | 19 ++ wip/classic-mac-font-pack/Makefile | 6 +- wip/classic-mac-font-pack/distinfo | 3 + wip/couchdb-glib/Makefile | 13 +- wip/couchdb-glib/PLIST | 31 +++ wip/couchdb-glib/distinfo | 6 +- wip/deforaos-panel/PLIST | 2 + wip/evolution-couchdb/Makefile | 7 +- wip/evolution-couchdb/PLIST | 2 + wip/evolution-couchdb/distinfo | 6 +- wip/flvmeta/Makefile | 2 +- wip/flvmeta/distinfo | 6 +- wip/trac-plugins-AccountManager/Makefile | 2 +- wip/trac-plugins-AccountManager/distinfo | 7 +- .../patches/patch-aa | 70 ----- wm/metacity/Makefile | 5 +- wm/metacity/PLIST | 6 +- wm/metacity/distinfo | 9 +- wm/metacity/patches/patch-ac | 12 + www/Makefile | 3 +- www/py-django/Makefile | 4 +- www/py-django/PLIST | 20 +- www/py-django/options.mk | 9 +- x11/gnome-screensaver/Makefile | 5 +- x11/gnome-screensaver/PLIST | 4 +- x11/gnome-screensaver/distinfo | 11 +- x11/gnome-screensaver/patches/patch-ac | 50 ---- x11/gnome-screensaver/patches/patch-ad | 73 ----- x11/gnome-screensaver/patches/patch-ae | 13 + x11/xscreensaver/Makefile | 4 +- x11/xscreensaver/Makefile.common | 4 +- x11/xscreensaver/PLIST | 17 +- x11/xscreensaver/distinfo | 10 +- x11/xscreensaver/patches/patch-ac | 22 +- 325 files changed, 2273 insertions(+), 1615 deletions(-) create mode 100644 database/py-cx_Oracle/DESCR create mode 100644 database/py-cx_Oracle/Makefile create mode 100644 database/py-cx_Oracle/PLIST create mode 100644 database/py-cx_Oracle/distinfo create mode 100644 devel/dmalloc/patches/patch-aa create mode 100644 lang/yap/patches/patch-ad create mode 100644 lang/yap/patches/patch-ae create mode 100644 lang/yap/patches/patch-af create mode 100644 lang/yap/patches/patch-ag create mode 100644 lang/yap/patches/patch-ah create mode 100644 lang/yap/patches/patch-ai create mode 100644 mail/gmime/patches/patch-aa create mode 100644 net/gnet1/patches/patch-af create mode 100644 net/gtk_wicontrol/patches/patch-af delete mode 100644 net/isc-dhcp/Makefile.common delete mode 100644 net/isc-dhcp/buildlink3.mk delete mode 100755 net/isc-dhcp/files/isc_dhclient.sh delete mode 100755 net/isc-dhcp/files/isc_dhcpd.sh delete mode 100755 net/isc-dhcp/files/isc_dhcrelay.sh delete mode 100644 net/isc-dhcp/files/site.conf delete mode 100644 net/isc-dhcp/files/site.h delete mode 100644 net/isc-dhcp/patches/patch-aa delete mode 100644 net/isc-dhcp/patches/patch-ab delete mode 100644 net/isc-dhcp/patches/patch-ad create mode 100644 net/pear-Net_LDAP2/DESCR create mode 100644 net/pear-Net_LDAP2/Makefile create mode 100644 net/pear-Net_LDAP2/distinfo create mode 100644 net/xtraceroute/patches/patch-ad create mode 100644 print/tex-anonchap/DESCR create mode 100644 print/tex-anonchap/Makefile create mode 100644 print/tex-anonchap/PLIST create mode 100644 print/tex-anonchap/distinfo create mode 100644 textproc/py-creole/DESCR create mode 100644 textproc/py-creole/Makefile create mode 100644 textproc/py-creole/PLIST create mode 100644 textproc/py-creole/distinfo create mode 100644 time/ocaml-calendar/patches/patch-aa create mode 100644 wip/cabocha/options.mk delete mode 100644 wip/trac-plugins-AccountManager/patches/patch-aa create mode 100644 wm/metacity/patches/patch-ac delete mode 100644 x11/gnome-screensaver/patches/patch-ac delete mode 100644 x11/gnome-screensaver/patches/patch-ad create mode 100644 x11/gnome-screensaver/patches/patch-ae diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile index 1a380c4eb870..90f9a9bca598 100644 --- a/archivers/file-roller/Makefile +++ b/archivers/file-roller/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2009/12/16 17:22:19 drochner Exp $ +# $NetBSD: Makefile,v 1.100 2010/02/11 17:50:40 drochner Exp $ # DISTNAME= file-roller-2.28.2 @@ -25,9 +25,7 @@ USE_PKGLOCALEDIR= yes GCONF_SCHEMAS= file-roller.schemas BUILDLINK_API_DEPENDS.glib2+= glib2>=2.12.0 -BUILDLINK_API_DEPENDS.gnome-vfs+= gnome-vfs>=2.10.0 BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.10.0 -BUILDLINK_API_DEPENDS.libglade+= libglade>=2.4.0 # Force to use unzip from pkgsrc as other installed versions in path # may be incompatible. (For example NetBSD 6.0's unzip) diff --git a/archivers/sapcar/Makefile b/archivers/sapcar/Makefile index 2465a14bce69..d2cffa626a56 100644 --- a/archivers/sapcar/Makefile +++ b/archivers/sapcar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/10/11 15:33:41 sno Exp $ +# $NetBSD: Makefile,v 1.4 2010/02/11 15:16:18 joerg Exp $ PKGNAME= sapcar-7.00 CATEGORIES= archivers @@ -62,6 +62,10 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= SAP archiver LICENSE= sap-license +.if !exists(DOWNLOADED_DISTFILE) && make(pbulk-index) +PKG_FAIL_REASON+= "Missing distfile" +.endif + RESTRICTED= Only unmodified original package can be distributed NO_BIN_ON_CDROM= ${RESTRICTED} NO_BIN_ON_FTP= ${RESTRICTED} diff --git a/audio/pulseaudio/buildlink3.mk b/audio/pulseaudio/buildlink3.mk index 3366baeeb0fd..566209df831a 100644 --- a/audio/pulseaudio/buildlink3.mk +++ b/audio/pulseaudio/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2010/02/07 12:46:29 obache Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2010/02/11 17:52:10 drochner Exp $ BUILDLINK_TREE+= pulseaudio @@ -17,6 +17,7 @@ BUILDLINK_PKGSRCDIR.pulseaudio?= ../../audio/pulseaudio .include "../../audio/libsndfile/buildlink3.mk" .include "../../databases/gdbm/buildlink3.mk" .include "../../devel/glib2/buildlink3.mk" +.include "../../sysutils/dbus/buildlink3.mk" .include "../../x11/libICE/buildlink3.mk" .include "../../x11/libSM/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" diff --git a/chat/Makefile b/chat/Makefile index 9d540772bb7e..bc2a9519fad9 100644 --- a/chat/Makefile +++ b/chat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.149 2009/08/17 21:16:18 wiz Exp $ +# $NetBSD: Makefile,v 1.150 2010/02/11 12:33:35 joerg Exp $ # COMMENT= Communication programs @@ -35,7 +35,7 @@ SUBDIR+= gnomeicu SUBDIR+= goofey SUBDIR+= gossip SUBDIR+= gtmess -SUBDIR+= i2cb +#SUBDIR+= i2cb SUBDIR+= i2cbd SUBDIR+= icb SUBDIR+= icbirc diff --git a/chat/i2cb/Makefile b/chat/i2cb/Makefile index e25a67fa145f..389c12f905b4 100644 --- a/chat/i2cb/Makefile +++ b/chat/i2cb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2009/08/20 15:24:58 jwise Exp $ +# $NetBSD: Makefile,v 1.21 2010/02/11 12:33:35 joerg Exp $ # DISTNAME= i2cb-6.0_ALPHA @@ -12,6 +12,8 @@ COMMENT= Next generation Internet Citicen's Band chat client PKG_DESTDIR_SUPPORT= user-destdir +BROKEN= Depends on TCL 8.3 + WRKSRC= ${WRKDIR}/icb USE_GNU_READLINE= yes diff --git a/database/py-cx_Oracle/DESCR b/database/py-cx_Oracle/DESCR new file mode 100644 index 000000000000..c9b3aea77af0 --- /dev/null +++ b/database/py-cx_Oracle/DESCR @@ -0,0 +1 @@ +Oracle binding for Python diff --git a/database/py-cx_Oracle/Makefile b/database/py-cx_Oracle/Makefile new file mode 100644 index 000000000000..79d130570701 --- /dev/null +++ b/database/py-cx_Oracle/Makefile @@ -0,0 +1,32 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/02/11 13:13:24 joerg Exp $ +# + +DISTNAME= cx_Oracle-5.0.2 +PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +CATEGORIES= www python +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cx-oracle/} + +MAINTAINER= joerg@NetBSD.org +HOMEPAGE= http://cx-oracle.sourceforge.net +COMMENT= Oracle binding for Python + +PKG_DESTDIR_SUPPORT= user-destdir + +PYDISTUTILSPKG= yes + +.include "../../mk/bsd.prefs.mk" + +.if !defined(ORACLE_HOME) +PKG_FAIL_REASON+= "You must set ORACLE_HOME to the location of your Oracle installation" +.elif !exists(${ORACLE_HOME}) +PKG_FAIL_REASON+= "The location of ORACLE_HOME does not exist" +.endif + +BUILDLINK_PASSTHRU_DIRS+= ${ORACLE_HOME} +BUILDLINK_PASSTHRU_RPATHDIRS+= ${ORACLE_HOME} +LDFLAGS+= -Wl,-rpath,${ORACLE_HOME}/lib + +ALL_ENV+= ORACLE_HOME=${ORACLE_HOME:Q} + +.include "../../lang/python/egg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/database/py-cx_Oracle/PLIST b/database/py-cx_Oracle/PLIST new file mode 100644 index 000000000000..9e0bb5865005 --- /dev/null +++ b/database/py-cx_Oracle/PLIST @@ -0,0 +1,6 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/11 13:13:24 joerg Exp $ +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/cx_Oracle.so diff --git a/database/py-cx_Oracle/distinfo b/database/py-cx_Oracle/distinfo new file mode 100644 index 000000000000..a254bbec5113 --- /dev/null +++ b/database/py-cx_Oracle/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/02/11 13:13:24 joerg Exp $ + +SHA1 (cx_Oracle-5.0.2.tar.gz) = a875795fb04b6d6c27d2735b28b32fae3c642d6c +RMD160 (cx_Oracle-5.0.2.tar.gz) = b165c5c877c9de25940b1527ffff561029563d0e +Size (cx_Oracle-5.0.2.tar.gz) = 183536 bytes diff --git a/databases/Makefile b/databases/Makefile index 85b8eaea236f..14d72abce496 100644 --- a/databases/Makefile +++ b/databases/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.317 2010/02/10 18:01:40 joerg Exp $ +# $NetBSD: Makefile,v 1.318 2010/02/11 13:14:46 joerg Exp $ # COMMENT= Databases @@ -218,6 +218,7 @@ SUBDIR+= pxtools SUBDIR+= py-PgSQL SUBDIR+= py-bdb-xml SUBDIR+= py-bsddb3 +SUBDIR+= py-cx_Oracle SUBDIR+= py-elixir SUBDIR+= py-gdbm SUBDIR+= py-ldap diff --git a/devel/dmalloc/Makefile b/devel/dmalloc/Makefile index 7e4bfadb22f9..6f92ae90542c 100644 --- a/devel/dmalloc/Makefile +++ b/devel/dmalloc/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.20 2009/12/09 20:35:53 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2010/02/11 18:35:07 drochner Exp $ -DISTNAME= dmalloc-5.4.2 +DISTNAME= dmalloc-5.5.2 CATEGORIES= devel -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dmalloc/} +#MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=dmalloc/} +MASTER_SITES= http://dmalloc.com/releases/ EXTRACT_SUFX= .tgz MAINTAINER= pkgsrc-users@NetBSD.org @@ -18,19 +19,11 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-shlib CFLAGS+= -fPIC -DPIC CONFIGURE_ARGS+= --enable-threads -INFO_FILES= # PLIST - -INSTALLATION_DIRS= ${PKGINFODIR} +CONFIGURE_ARGS+= --enable-cxx INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} - -# XXX the "installinfo" target is broken -#INSTALL_TARGET= install installinfo -post-install: - cd ${WRKSRC}/docs; for f in *.info *.info-[0-9]*; do \ - ${TEST} ! -f "$$f" || \ - ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \ - done +INSTALL_TARGET= install installcxx +TEST_TARGET= heavy .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/dmalloc/PLIST b/devel/dmalloc/PLIST index 91feec8ab1b7..bdfcce56a529 100644 --- a/devel/dmalloc/PLIST +++ b/devel/dmalloc/PLIST @@ -1,7 +1,6 @@ -@comment $NetBSD: PLIST,v 1.7 2006/03/20 18:15:38 jlam Exp $ +@comment $NetBSD: PLIST,v 1.8 2010/02/11 18:35:07 drochner Exp $ bin/dmalloc include/dmalloc.h -info/dmalloc.info lib/libdmalloc.a lib/libdmalloc.so lib/libdmallocth.a diff --git a/devel/dmalloc/distinfo b/devel/dmalloc/distinfo index 0f2e8ccc5ede..eaa77b6fdd69 100644 --- a/devel/dmalloc/distinfo +++ b/devel/dmalloc/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.6 2006/03/02 19:35:11 drochner Exp $ +$NetBSD: distinfo,v 1.7 2010/02/11 18:35:07 drochner Exp $ -SHA1 (dmalloc-5.4.2.tgz) = ecb53b6db7e4d6b6d16ab8e95d87ae79b5c771c7 -RMD160 (dmalloc-5.4.2.tgz) = b47d8d64f583d8115ef4279964abc229807890fe -Size (dmalloc-5.4.2.tgz) = 371228 bytes +SHA1 (dmalloc-5.5.2.tgz) = 20719de78decbd724bc3ab9d6dce2ea5e5922335 +RMD160 (dmalloc-5.5.2.tgz) = 2cfe4daa453337e0fae0656bdbdaad1214d6243d +Size (dmalloc-5.5.2.tgz) = 666608 bytes +SHA1 (patch-aa) = 04ce2571172eb7ed60aa9d4fa98a5cad0e88aec8 diff --git a/devel/dmalloc/patches/patch-aa b/devel/dmalloc/patches/patch-aa new file mode 100644 index 000000000000..d580e29fb04d --- /dev/null +++ b/devel/dmalloc/patches/patch-aa @@ -0,0 +1,40 @@ +$NetBSD: patch-aa,v 1.3 2010/02/11 18:35:07 drochner Exp $ + +--- Makefile.in.orig 2007-05-14 17:26:14.000000000 +0000 ++++ Makefile.in +@@ -257,7 +257,7 @@ shlib : $(BUILD_SL) + # via: http://256.com/gray/email.html + $(LIB_SL) : $(LIBRARY) + rm -f $@ $@.t +- @shlinkargs@ $(LIBRARY) $(OBJS) $(NORMAL_OBJS) ++ @shlinkargs@ $(OBJS) $(NORMAL_OBJS) + mv $@.t $@ + + $(LIBRARY) : $(OBJS) $(NORMAL_OBJS) +@@ -270,7 +270,7 @@ $(LIB_TH) : $(OBJS) $(THREAD_OBJS) + + $(LIB_TH_SL) : $(LIB_TH) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_TH) $(OBJS) $(THREAD_OBJS) ++ @shlinkargs@ $(OBJS) $(THREAD_OBJS) + mv $@.t $@ + + $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) +@@ -279,7 +279,7 @@ $(LIB_CXX) : $(OBJS) $(NORMAL_OBJS) $(CX + + $(LIB_CXX_SL) : $(LIB_CXX) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_CXX) $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) ++ @shlinkargs@ $(OBJS) $(NORMAL_OBJS) $(CXX_OBJS) + mv $@.t $@ + + $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) +@@ -288,7 +288,7 @@ $(LIB_TH_CXX) : $(OBJS) $(THREAD_OBJS) $ + + $(LIB_TH_CXX_SL) : $(LIB_TH_CXX) + rm -f $@ $@.t +- @shlinkargs@ $(LIB_TH_CXX) $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) ++ @shlinkargs@ $(OBJS) $(THREAD_OBJS) $(CXX_OBJS) + mv $@.t $@ + + threadssl : $(LIB_TH_SL) diff --git a/devel/py-dulwich/Makefile b/devel/py-dulwich/Makefile index 8207960c25b0..473d22cdb6b2 100644 --- a/devel/py-dulwich/Makefile +++ b/devel/py-dulwich/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/11/04 19:49:24 joerg Exp $ +# $NetBSD: Makefile,v 1.2 2010/02/11 15:04:25 joerg Exp $ # -DISTNAME= dulwich-0.4.0 +DISTNAME= dulwich-0.4.1 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} +EGG_NAME= ${DISTNAME} CATEGORIES= devel python MASTER_SITES= http://samba.org/~jelmer/dulwich/ @@ -12,7 +13,5 @@ COMMENT= Python implementation of Git PKG_DESTDIR_SUPPORT= user-destdir -PYDISTUTILSPKG= yes - -.include "../../lang/python/extension.mk" +.include "../../lang/python/egg.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/py-dulwich/PLIST b/devel/py-dulwich/PLIST index a109c1be2499..a3ef5ccc509a 100644 --- a/devel/py-dulwich/PLIST +++ b/devel/py-dulwich/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/11/04 19:49:24 joerg Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/02/11 15:04:25 joerg Exp $ bin/dul-daemon bin/dulwich +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt ${PYSITELIB}/dulwich/__init__.py ${PYSITELIB}/dulwich/__init__.pyc ${PYSITELIB}/dulwich/__init__.pyo @@ -30,6 +34,9 @@ ${PYSITELIB}/dulwich/objects.pyo ${PYSITELIB}/dulwich/pack.py ${PYSITELIB}/dulwich/pack.pyc ${PYSITELIB}/dulwich/pack.pyo +${PYSITELIB}/dulwich/patch.py +${PYSITELIB}/dulwich/patch.pyc +${PYSITELIB}/dulwich/patch.pyo ${PYSITELIB}/dulwich/protocol.py ${PYSITELIB}/dulwich/protocol.pyc ${PYSITELIB}/dulwich/protocol.pyo diff --git a/devel/py-dulwich/distinfo b/devel/py-dulwich/distinfo index f8bf1a2936ed..e2539dd7e828 100644 --- a/devel/py-dulwich/distinfo +++ b/devel/py-dulwich/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/11/04 19:49:24 joerg Exp $ +$NetBSD: distinfo,v 1.2 2010/02/11 15:04:25 joerg Exp $ -SHA1 (dulwich-0.4.0.tar.gz) = c8b2dcd11284a5eb80646c8705fd070ea981acb9 -RMD160 (dulwich-0.4.0.tar.gz) = d8e1bc1fd4d0ae924becbf9c8047a81f419eed1a -Size (dulwich-0.4.0.tar.gz) = 73140 bytes +SHA1 (dulwich-0.4.1.tar.gz) = 2c19314ff010579102d55d82326aa4e399ac6dfa +RMD160 (dulwich-0.4.1.tar.gz) = f6a62acd0f7e91fbb03a115443975e3095f3854e +Size (dulwich-0.4.1.tar.gz) = 75577 bytes diff --git a/devel/sapnwrfcsdk/Makefile b/devel/sapnwrfcsdk/Makefile index fbac87689b79..5c323b1a383a 100644 --- a/devel/sapnwrfcsdk/Makefile +++ b/devel/sapnwrfcsdk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/10/11 15:33:27 sno Exp $ +# $NetBSD: Makefile,v 1.4 2010/02/11 15:16:18 joerg Exp $ PKGNAME= sapnwrfcsdk-7.11 CATEGORIES= devel @@ -61,6 +61,10 @@ BROKEN= Architecture ${MACHINE_ARCH} on platform ${OPSYS} not supported BROKEN= Platform ${OPSYS} not supported .endif +.if !exists(DOWNLOADED_DISTFILE) && make(pbulk-index) +PKG_FAIL_REASON+= "Missing distfile" +.endif + EXTRACT_CMD= SAPCAR -xvf ${DOWNLOADED_DISTFILE} MAINTAINER= pkgsrc-users@NetBSD.org diff --git a/doc/CHANGES-2010 b/doc/CHANGES-2010 index 1e6873272c6d..38563da642f8 100644 --- a/doc/CHANGES-2010 +++ b/doc/CHANGES-2010 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2010,v 1.672 2010/02/11 08:27:36 obache Exp $ +$NetBSD: CHANGES-2010,v 1.683 2010/02/12 01:02:31 minskim Exp $ Changes to the packages collection and infrastructure in 2010: @@ -801,3 +801,14 @@ Changes to the packages collection and infrastructure in 2010: Updated print/tex-hyph-utf8-doc to 2009 [minskim 2010-02-11] Updated graphics/GraphicsMagick to 1.3.10 [obache 2010-02-11] Added mail/cyrus-imapd23 version 2.3.16 [obache 2010-02-11] + Added net/pear-Net_LDAP2 version 2.0.7 [obache 2010-02-11] + Added textproc/py-creole version 0.2.5 [joerg 2010-02-11] + Added databases/py-cx_Oracle version 5.0.2 [joerg 2010-02-11] + Updated devel/py-dulwich to 0.4.1 [joerg 2010-02-11] + Updated mail/gmime to 2.2.25nb1 [wiz 2010-02-11] + Updated print/tex-ifluatex-doc to 1.2.16936 [minskim 2010-02-11] + Updated lang/yap to 5.1.3 [asau 2010-02-11] + Updated print/tex-luatex to 0.2nb1 [minskim 2010-02-11] + Added print/tex-anonchap version 1.1a [minskim 2010-02-12] + Updated math/octave to 3.2.4 [asau 2010-02-12] + Updated fonts/tex-metafont to 2009nb1 [minskim 2010-02-12] diff --git a/doc/TODO b/doc/TODO index 3d8cf484b588..53a329597100 100644 --- a/doc/TODO +++ b/doc/TODO @@ -1,4 +1,4 @@ -$NetBSD: TODO,v 1.9010 2010/02/11 08:27:36 obache Exp $ +$NetBSD: TODO,v 1.9015 2010/02/12 01:10:43 asau Exp $ Suggested new packages ====================== @@ -593,7 +593,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o fbreader-0.12.2 o fcitx-3.6.2 o fd-3.00d - o fdgw-20040609 o festival-1.96 o felt-3.07 o fetchmail-6.3.13 @@ -654,7 +653,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o gap-4r4p9 o gated-3.6 o gcc-4.3.2 - o gcc-ssp-3.4.4 o gcc44-4.4.3 o gcdmaster-1.2.3 o gcin-1.4.1 @@ -1011,7 +1009,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o ocamlnet-2.2.4 o ocrad-0.19 o ocsigen-1.1.0 [pkg/40761] - o octave-3.2.4 o odbc-postgresql-8.2.3 o offlineimap-6.2.0 o olvwm-4.5 @@ -1263,7 +1260,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o subversion-1.6.9 o subversion-base-1.6.9 o suse_base-11.0 - o swi-prolog-5.6.31 o sysinfo-4.2.2 o system-tools-backends-2.8.3 [needs polkit>=1.0?|GNOME 2.28] o systrace-1.6e @@ -1271,7 +1267,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o tacacs-4.0.4.14 o tads-3.0.16 o tcl-8.5.8 - o tcl83-8.3.5 o tcpdpriv-0.9 o tcpdstat-0.9 o tcpillust-1.00b @@ -1293,7 +1288,6 @@ For possible perl packages updates, see http://www.pkgbox.org/p2c/ o tinc-1.0.12 o tinyproxy-1.8.0 o tk-8.5.8 - o tk83-8.3.5 o tkcvs-8.2.1 o tkgate-1.8.7 o tkhylafax-3.2 diff --git a/fonts/tex-metafont/Makefile b/fonts/tex-metafont/Makefile index 5f1de0713665..e364f103bc73 100644 --- a/fonts/tex-metafont/Makefile +++ b/fonts/tex-metafont/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.2 2010/02/08 05:02:47 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/12 01:02:05 minskim Exp $ # TeX Live Revision 16044 DISTNAME= metafont PKGNAME= tex-${DISTNAME}-2009 +PKGREVISION= 1 CATEGORIES= fonts MAINTAINER= minskim@NetBSD.org @@ -14,7 +15,7 @@ CONFLICTS+= tex-bin-metapost-[0-9]* DEPENDS+= tex-kpathsea-[0-9]*:../../print/tex-kpathsea DEPENDS+= web2c-[0-9]*:../../print/web2c -TEX_FORMATS= "mf mf-nowin -translate-file=cp227.tcx mf.ini" +TEX_FORMATS= "mf mf-nowin -translate-file=cp227.tcx mf.ini\\n" TEX_TEXMF_DIRS= ${PREFIX}/share/texmf-dist .include "../../print/texlive/package.mk" diff --git a/graphics/extrema/Makefile b/graphics/extrema/Makefile index 50809e45816b..ec9d67a31572 100644 --- a/graphics/extrema/Makefile +++ b/graphics/extrema/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.2 2010/01/18 09:58:59 wiz Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/11 18:28:07 drochner Exp $ # -DISTNAME= extrema-4.4.2 -PKGREVISION= 1 +DISTNAME= extrema-4.4.3 CATEGORIES= graphics MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=extrema/} diff --git a/graphics/extrema/PLIST b/graphics/extrema/PLIST index df56baf7579b..a3d37d807938 100644 --- a/graphics/extrema/PLIST +++ b/graphics/extrema/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2009/12/11 12:51:40 drochner Exp $ +@comment $NetBSD: PLIST,v 1.2 2010/02/11 18:28:07 drochner Exp $ bin/extrema lib/libextrema.la share/extrema/Help/BasicTasks/BasicTasks.htm @@ -994,6 +994,7 @@ share/extrema/Help/extrema.hhp share/extrema/Help/extremaMain.htm share/extrema/Help/shadow_left.gif share/extrema/Help/shadow_right.gif +share/extrema/Images/3dplot.bmp share/extrema/Images/arrow1.bmp share/extrema/Images/arrow11.bmp share/extrema/Images/arrow12.bmp @@ -1009,6 +1010,7 @@ share/extrema/Images/arrow33.bmp share/extrema/Images/aspectRatio.GIF share/extrema/Images/clear.GIF share/extrema/Images/constants.GIF +share/extrema/Images/downarrow.bmp share/extrema/Images/drawfigure.GIF share/extrema/Images/drawgraph.GIF share/extrema/Images/drawtext.GIF @@ -1016,6 +1018,7 @@ share/extrema/Images/execute.GIF share/extrema/Images/executeClearList.GIF share/extrema/Images/executeRemoveFilename.GIF share/extrema/Images/exit.GIF +share/extrema/Images/figures.bmp share/extrema/Images/fillcolor.GIF share/extrema/Images/fillcolors.bmp share/extrema/Images/fit.GIF @@ -1023,6 +1026,7 @@ share/extrema/Images/generate.GIF share/extrema/Images/help.GIF share/extrema/Images/importdrawing.GIF share/extrema/Images/leftArrow.GIF +share/extrema/Images/leftarrow.bmp share/extrema/Images/linecolor.GIF share/extrema/Images/linecolors.bmp share/extrema/Images/linethickness.bmp @@ -1032,9 +1036,12 @@ share/extrema/Images/peakfind.GIF share/extrema/Images/print.GIF share/extrema/Images/rectangle.bmp share/extrema/Images/rectangle1.bmp +share/extrema/Images/regularPolygon.bmp +share/extrema/Images/regularPolygon1.bmp share/extrema/Images/removePage.GIF share/extrema/Images/restore.GIF share/extrema/Images/rightArrow.GIF +share/extrema/Images/rightarrow.bmp share/extrema/Images/save.GIF share/extrema/Images/show.GIF share/extrema/Images/square.bmp @@ -1042,3 +1049,6 @@ share/extrema/Images/square1.bmp share/extrema/Images/stack.GIF share/extrema/Images/star.bmp share/extrema/Images/star1.bmp +share/extrema/Images/uparrow.bmp +share/extrema/Images/zoomin.bmp +share/extrema/Images/zoomout.bmp diff --git a/graphics/extrema/distinfo b/graphics/extrema/distinfo index d30aaa8d2f71..76b91461cf6c 100644 --- a/graphics/extrema/distinfo +++ b/graphics/extrema/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/12/11 12:51:40 drochner Exp $ +$NetBSD: distinfo,v 1.2 2010/02/11 18:28:07 drochner Exp $ -SHA1 (extrema-4.4.2.tar.gz) = 19e0e340d622dd1cc29d6d0677f9afa3144bebd1 -RMD160 (extrema-4.4.2.tar.gz) = 2121cf3f3229929556d367ba91f0e8d5db8212bf -Size (extrema-4.4.2.tar.gz) = 6296570 bytes +SHA1 (extrema-4.4.3.tar.gz) = adc66b7383f170ae7f2c02f11ffb12a908b240c8 +RMD160 (extrema-4.4.3.tar.gz) = 5d0c7a5637a478931d9e8fcc58d223a315790e51 +Size (extrema-4.4.3.tar.gz) = 6314563 bytes diff --git a/graphics/veusz/Makefile b/graphics/veusz/Makefile index 9d0d76c35f88..d0fbc61e90cb 100644 --- a/graphics/veusz/Makefile +++ b/graphics/veusz/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.13 2010/02/10 19:17:40 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/11 18:58:35 drochner Exp $ # -DISTNAME= veusz-0.10 -PKGREVISION= 4 +DISTNAME= veusz-1.6 CATEGORIES= graphics MASTER_SITES= http://download.gna.org/veusz/ @@ -16,7 +15,6 @@ PYDISTUTILSPKG= yes .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" -.include "../../x11/py-qt3-base/buildlink3.mk" -.include "../../x11/py-qt3-modules/buildlink3.mk" -.include "../../math/py-numarray/buildlink3.mk" +.include "../../x11/py-qt4/buildlink3.mk" +.include "../../math/py-numpy/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/graphics/veusz/PLIST b/graphics/veusz/PLIST index cb455063904e..13de7fa4a482 100644 --- a/graphics/veusz/PLIST +++ b/graphics/veusz/PLIST @@ -1,37 +1,89 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:59:30 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2010/02/11 18:58:35 drochner Exp $ bin/veusz bin/veusz_listen ${PYSITELIB}/veusz/VERSION ${PYSITELIB}/veusz/__init__.py ${PYSITELIB}/veusz/__init__.pyc ${PYSITELIB}/veusz/__init__.pyo -${PYSITELIB}/veusz/application.py -${PYSITELIB}/veusz/application.pyc -${PYSITELIB}/veusz/application.pyo ${PYSITELIB}/veusz/dialogs/__init__.py ${PYSITELIB}/veusz/dialogs/__init__.pyc ${PYSITELIB}/veusz/dialogs/__init__.pyo +${PYSITELIB}/veusz/dialogs/about.ui ${PYSITELIB}/veusz/dialogs/aboutdialog.py ${PYSITELIB}/veusz/dialogs/aboutdialog.pyc ${PYSITELIB}/veusz/dialogs/aboutdialog.pyo +${PYSITELIB}/veusz/dialogs/capture.ui +${PYSITELIB}/veusz/dialogs/capturedialog.py +${PYSITELIB}/veusz/dialogs/capturedialog.pyc +${PYSITELIB}/veusz/dialogs/capturedialog.pyo +${PYSITELIB}/veusz/dialogs/capturing.ui +${PYSITELIB}/veusz/dialogs/custom.py +${PYSITELIB}/veusz/dialogs/custom.pyc +${PYSITELIB}/veusz/dialogs/custom.pyo +${PYSITELIB}/veusz/dialogs/custom.ui +${PYSITELIB}/veusz/dialogs/customimport.ui +${PYSITELIB}/veusz/dialogs/datacreate.py +${PYSITELIB}/veusz/dialogs/datacreate.pyc +${PYSITELIB}/veusz/dialogs/datacreate.pyo +${PYSITELIB}/veusz/dialogs/datacreate.ui +${PYSITELIB}/veusz/dialogs/datacreate2d.py +${PYSITELIB}/veusz/dialogs/datacreate2d.pyc +${PYSITELIB}/veusz/dialogs/datacreate2d.pyo +${PYSITELIB}/veusz/dialogs/datacreate2d.ui +${PYSITELIB}/veusz/dialogs/dataedit.ui ${PYSITELIB}/veusz/dialogs/dataeditdialog.py ${PYSITELIB}/veusz/dialogs/dataeditdialog.pyc ${PYSITELIB}/veusz/dialogs/dataeditdialog.pyo +${PYSITELIB}/veusz/dialogs/errorloading.py +${PYSITELIB}/veusz/dialogs/errorloading.pyc +${PYSITELIB}/veusz/dialogs/errorloading.pyo +${PYSITELIB}/veusz/dialogs/errorloading.ui ${PYSITELIB}/veusz/dialogs/exceptiondialog.py ${PYSITELIB}/veusz/dialogs/exceptiondialog.pyc ${PYSITELIB}/veusz/dialogs/exceptiondialog.pyo +${PYSITELIB}/veusz/dialogs/exceptionlist.ui +${PYSITELIB}/veusz/dialogs/exceptionsend.ui +${PYSITELIB}/veusz/dialogs/historycheck.py +${PYSITELIB}/veusz/dialogs/historycheck.pyc +${PYSITELIB}/veusz/dialogs/historycheck.pyo +${PYSITELIB}/veusz/dialogs/historycombo.py +${PYSITELIB}/veusz/dialogs/historycombo.pyc +${PYSITELIB}/veusz/dialogs/historycombo.pyo +${PYSITELIB}/veusz/dialogs/historyvaluecombo.py +${PYSITELIB}/veusz/dialogs/historyvaluecombo.pyc +${PYSITELIB}/veusz/dialogs/historyvaluecombo.pyo +${PYSITELIB}/veusz/dialogs/import.ui ${PYSITELIB}/veusz/dialogs/importdialog.py ${PYSITELIB}/veusz/dialogs/importdialog.pyc ${PYSITELIB}/veusz/dialogs/importdialog.pyo -${PYSITELIB}/veusz/dialogs/importfits.py -${PYSITELIB}/veusz/dialogs/importfits.pyc -${PYSITELIB}/veusz/dialogs/importfits.pyo +${PYSITELIB}/veusz/dialogs/importhelp.ui +${PYSITELIB}/veusz/dialogs/importhelpcsv.ui +${PYSITELIB}/veusz/dialogs/license.ui +${PYSITELIB}/veusz/dialogs/preferences.py +${PYSITELIB}/veusz/dialogs/preferences.pyc +${PYSITELIB}/veusz/dialogs/preferences.pyo +${PYSITELIB}/veusz/dialogs/preferences.ui +${PYSITELIB}/veusz/dialogs/recentfilesbutton.py +${PYSITELIB}/veusz/dialogs/recentfilesbutton.pyc +${PYSITELIB}/veusz/dialogs/recentfilesbutton.pyo ${PYSITELIB}/veusz/dialogs/reloaddata.py ${PYSITELIB}/veusz/dialogs/reloaddata.pyc ${PYSITELIB}/veusz/dialogs/reloaddata.pyo +${PYSITELIB}/veusz/dialogs/reloaddata.ui +${PYSITELIB}/veusz/dialogs/safetyimport.py +${PYSITELIB}/veusz/dialogs/safetyimport.pyc +${PYSITELIB}/veusz/dialogs/safetyimport.pyo +${PYSITELIB}/veusz/dialogs/stylesheet.py +${PYSITELIB}/veusz/dialogs/stylesheet.pyc +${PYSITELIB}/veusz/dialogs/stylesheet.pyo +${PYSITELIB}/veusz/dialogs/stylesheet.ui +${PYSITELIB}/veusz/dialogs/test.ui ${PYSITELIB}/veusz/document/__init__.py ${PYSITELIB}/veusz/document/__init__.pyc ${PYSITELIB}/veusz/document/__init__.pyo +${PYSITELIB}/veusz/document/capture.py +${PYSITELIB}/veusz/document/capture.pyc +${PYSITELIB}/veusz/document/capture.pyo ${PYSITELIB}/veusz/document/commandinterface.py ${PYSITELIB}/veusz/document/commandinterface.pyc ${PYSITELIB}/veusz/document/commandinterface.pyo @@ -44,6 +96,9 @@ ${PYSITELIB}/veusz/document/datasets.pyo ${PYSITELIB}/veusz/document/doc.py ${PYSITELIB}/veusz/document/doc.pyc ${PYSITELIB}/veusz/document/doc.pyo +${PYSITELIB}/veusz/document/emf_export.py +${PYSITELIB}/veusz/document/emf_export.pyc +${PYSITELIB}/veusz/document/emf_export.pyo ${PYSITELIB}/veusz/document/operations.py ${PYSITELIB}/veusz/document/operations.pyc ${PYSITELIB}/veusz/document/operations.pyo @@ -53,16 +108,25 @@ ${PYSITELIB}/veusz/document/readcsv.pyo ${PYSITELIB}/veusz/document/simpleread.py ${PYSITELIB}/veusz/document/simpleread.pyc ${PYSITELIB}/veusz/document/simpleread.pyo +${PYSITELIB}/veusz/document/svg_export.py +${PYSITELIB}/veusz/document/svg_export.pyc +${PYSITELIB}/veusz/document/svg_export.pyo ${PYSITELIB}/veusz/document/widgetfactory.py ${PYSITELIB}/veusz/document/widgetfactory.pyc ${PYSITELIB}/veusz/document/widgetfactory.pyo ${PYSITELIB}/veusz/embed.py ${PYSITELIB}/veusz/embed.pyc ${PYSITELIB}/veusz/embed.pyo +${PYSITELIB}/veusz/embed_remote.py +${PYSITELIB}/veusz/embed_remote.pyc +${PYSITELIB}/veusz/embed_remote.pyo ${PYSITELIB}/veusz/helpers/__init__.py ${PYSITELIB}/veusz/helpers/__init__.pyc ${PYSITELIB}/veusz/helpers/__init__.pyo -${PYSITELIB}/veusz/helpers/_na_cntr.so +${PYSITELIB}/veusz/helpers/_nc_cntr.so +${PYSITELIB}/veusz/qtall.py +${PYSITELIB}/veusz/qtall.pyc +${PYSITELIB}/veusz/qtall.pyo ${PYSITELIB}/veusz/setting/__init__.py ${PYSITELIB}/veusz/setting/__init__.pyc ${PYSITELIB}/veusz/setting/__init__.pyo @@ -72,6 +136,9 @@ ${PYSITELIB}/veusz/setting/collections.pyo ${PYSITELIB}/veusz/setting/controls.py ${PYSITELIB}/veusz/setting/controls.pyc ${PYSITELIB}/veusz/setting/controls.pyo +${PYSITELIB}/veusz/setting/reference.py +${PYSITELIB}/veusz/setting/reference.pyc +${PYSITELIB}/veusz/setting/reference.pyo ${PYSITELIB}/veusz/setting/setting.py ${PYSITELIB}/veusz/setting/setting.pyc ${PYSITELIB}/veusz/setting/setting.pyo @@ -87,12 +154,24 @@ ${PYSITELIB}/veusz/setting/stylesheet.pyo ${PYSITELIB}/veusz/utils/__init__.py ${PYSITELIB}/veusz/utils/__init__.pyc ${PYSITELIB}/veusz/utils/__init__.pyo +${PYSITELIB}/veusz/utils/action.py +${PYSITELIB}/veusz/utils/action.pyc +${PYSITELIB}/veusz/utils/action.pyo +${PYSITELIB}/veusz/utils/dates.py +${PYSITELIB}/veusz/utils/dates.pyc +${PYSITELIB}/veusz/utils/dates.pyo ${PYSITELIB}/veusz/utils/fitlm.py ${PYSITELIB}/veusz/utils/fitlm.pyc ${PYSITELIB}/veusz/utils/fitlm.pyo +${PYSITELIB}/veusz/utils/pdf.py +${PYSITELIB}/veusz/utils/pdf.pyc +${PYSITELIB}/veusz/utils/pdf.pyo ${PYSITELIB}/veusz/utils/points.py ${PYSITELIB}/veusz/utils/points.pyc ${PYSITELIB}/veusz/utils/points.pyo +${PYSITELIB}/veusz/utils/safe_eval.py +${PYSITELIB}/veusz/utils/safe_eval.pyc +${PYSITELIB}/veusz/utils/safe_eval.pyo ${PYSITELIB}/veusz/utils/textrender.py ${PYSITELIB}/veusz/utils/textrender.pyc ${PYSITELIB}/veusz/utils/textrender.pyo @@ -117,16 +196,28 @@ ${PYSITELIB}/veusz/widgets/axis.pyo ${PYSITELIB}/veusz/widgets/axisticks.py ${PYSITELIB}/veusz/widgets/axisticks.pyc ${PYSITELIB}/veusz/widgets/axisticks.pyo +${PYSITELIB}/veusz/widgets/bar.py +${PYSITELIB}/veusz/widgets/bar.pyc +${PYSITELIB}/veusz/widgets/bar.pyo +${PYSITELIB}/veusz/widgets/colorbar.py +${PYSITELIB}/veusz/widgets/colorbar.pyc +${PYSITELIB}/veusz/widgets/colorbar.pyo ${PYSITELIB}/veusz/widgets/containers.py ${PYSITELIB}/veusz/widgets/containers.pyc ${PYSITELIB}/veusz/widgets/containers.pyo ${PYSITELIB}/veusz/widgets/contour.py ${PYSITELIB}/veusz/widgets/contour.pyc ${PYSITELIB}/veusz/widgets/contour.pyo +${PYSITELIB}/veusz/widgets/controlgraph.py +${PYSITELIB}/veusz/widgets/controlgraph.pyc +${PYSITELIB}/veusz/widgets/controlgraph.pyo ${PYSITELIB}/veusz/widgets/data/colormaps.dat ${PYSITELIB}/veusz/widgets/fit.py ${PYSITELIB}/veusz/widgets/fit.pyc ${PYSITELIB}/veusz/widgets/fit.pyo +${PYSITELIB}/veusz/widgets/function.py +${PYSITELIB}/veusz/widgets/function.pyc +${PYSITELIB}/veusz/widgets/function.pyo ${PYSITELIB}/veusz/widgets/graph.py ${PYSITELIB}/veusz/widgets/graph.pyc ${PYSITELIB}/veusz/widgets/graph.pyo @@ -136,42 +227,111 @@ ${PYSITELIB}/veusz/widgets/image.pyo ${PYSITELIB}/veusz/widgets/key.py ${PYSITELIB}/veusz/widgets/key.pyc ${PYSITELIB}/veusz/widgets/key.pyo +${PYSITELIB}/veusz/widgets/line.py +${PYSITELIB}/veusz/widgets/line.pyc +${PYSITELIB}/veusz/widgets/line.pyo ${PYSITELIB}/veusz/widgets/page.py ${PYSITELIB}/veusz/widgets/page.pyc ${PYSITELIB}/veusz/widgets/page.pyo ${PYSITELIB}/veusz/widgets/plotters.py ${PYSITELIB}/veusz/widgets/plotters.pyc ${PYSITELIB}/veusz/widgets/plotters.pyo +${PYSITELIB}/veusz/widgets/point.py +${PYSITELIB}/veusz/widgets/point.pyc +${PYSITELIB}/veusz/widgets/point.pyo +${PYSITELIB}/veusz/widgets/polygon.py +${PYSITELIB}/veusz/widgets/polygon.pyc +${PYSITELIB}/veusz/widgets/polygon.pyo ${PYSITELIB}/veusz/widgets/root.py ${PYSITELIB}/veusz/widgets/root.pyc ${PYSITELIB}/veusz/widgets/root.pyo +${PYSITELIB}/veusz/widgets/shape.py +${PYSITELIB}/veusz/widgets/shape.pyc +${PYSITELIB}/veusz/widgets/shape.pyo +${PYSITELIB}/veusz/widgets/textlabel.py +${PYSITELIB}/veusz/widgets/textlabel.pyc +${PYSITELIB}/veusz/widgets/textlabel.pyo ${PYSITELIB}/veusz/widgets/widget.py ${PYSITELIB}/veusz/widgets/widget.pyc ${PYSITELIB}/veusz/widgets/widget.pyo ${PYSITELIB}/veusz/windows/__init__.py ${PYSITELIB}/veusz/windows/__init__.pyc ${PYSITELIB}/veusz/windows/__init__.pyo -${PYSITELIB}/veusz/windows/action.py -${PYSITELIB}/veusz/windows/action.pyc -${PYSITELIB}/veusz/windows/action.pyo ${PYSITELIB}/veusz/windows/consolewindow.py ${PYSITELIB}/veusz/windows/consolewindow.pyc ${PYSITELIB}/veusz/windows/consolewindow.pyo -${PYSITELIB}/veusz/windows/icons/button_axis.png -${PYSITELIB}/veusz/windows/icons/button_contour.png -${PYSITELIB}/veusz/windows/icons/button_fit.png -${PYSITELIB}/veusz/windows/icons/button_function.png -${PYSITELIB}/veusz/windows/icons/button_graph.png -${PYSITELIB}/veusz/windows/icons/button_grid.png -${PYSITELIB}/veusz/windows/icons/button_image.png -${PYSITELIB}/veusz/windows/icons/button_key.png -${PYSITELIB}/veusz/windows/icons/button_label.png -${PYSITELIB}/veusz/windows/icons/button_page.png -${PYSITELIB}/veusz/windows/icons/button_xy.png -${PYSITELIB}/veusz/windows/icons/icon-rename.png +${PYSITELIB}/veusz/windows/icons/button_axis.svg +${PYSITELIB}/veusz/windows/icons/button_bar.svg +${PYSITELIB}/veusz/windows/icons/button_colorbar.svg +${PYSITELIB}/veusz/windows/icons/button_contour.svg +${PYSITELIB}/veusz/windows/icons/button_ellipse.svg +${PYSITELIB}/veusz/windows/icons/button_fit.svg +${PYSITELIB}/veusz/windows/icons/button_function.svg +${PYSITELIB}/veusz/windows/icons/button_graph.svg +${PYSITELIB}/veusz/windows/icons/button_grid.svg +${PYSITELIB}/veusz/windows/icons/button_image.svg +${PYSITELIB}/veusz/windows/icons/button_imagefile.svg +${PYSITELIB}/veusz/windows/icons/button_key.svg +${PYSITELIB}/veusz/windows/icons/button_label.svg +${PYSITELIB}/veusz/windows/icons/button_line.svg +${PYSITELIB}/veusz/windows/icons/button_page.svg +${PYSITELIB}/veusz/windows/icons/button_polygon.svg +${PYSITELIB}/veusz/windows/icons/button_rect.svg +${PYSITELIB}/veusz/windows/icons/button_xy.svg +${PYSITELIB}/veusz/windows/icons/downarrow.png +${PYSITELIB}/veusz/windows/icons/downarrow2.svg +${PYSITELIB}/veusz/windows/icons/downarrow_blank.png +${PYSITELIB}/veusz/windows/icons/error_bar.svg +${PYSITELIB}/veusz/windows/icons/error_barbox.svg +${PYSITELIB}/veusz/windows/icons/error_barcurve.svg +${PYSITELIB}/veusz/windows/icons/error_bardiamond.svg +${PYSITELIB}/veusz/windows/icons/error_barends.svg +${PYSITELIB}/veusz/windows/icons/error_box.svg +${PYSITELIB}/veusz/windows/icons/error_boxfill.svg +${PYSITELIB}/veusz/windows/icons/error_curve.svg +${PYSITELIB}/veusz/windows/icons/error_diamond.svg +${PYSITELIB}/veusz/windows/icons/error_fillhorz.svg +${PYSITELIB}/veusz/windows/icons/error_fillvert.svg +${PYSITELIB}/veusz/windows/icons/error_linehorz.svg +${PYSITELIB}/veusz/windows/icons/error_linevert.svg +${PYSITELIB}/veusz/windows/icons/error_none.svg +${PYSITELIB}/veusz/windows/icons/kde-application-exit.svg +${PYSITELIB}/veusz/windows/icons/kde-dataset-new-veuszedit.svg +${PYSITELIB}/veusz/windows/icons/kde-dataset2d-new-veuszedit.svg +${PYSITELIB}/veusz/windows/icons/kde-document-export.svg +${PYSITELIB}/veusz/windows/icons/kde-document-import.svg +${PYSITELIB}/veusz/windows/icons/kde-document-new.svg +${PYSITELIB}/veusz/windows/icons/kde-document-open.svg +${PYSITELIB}/veusz/windows/icons/kde-document-print.svg +${PYSITELIB}/veusz/windows/icons/kde-document-save-as.svg +${PYSITELIB}/veusz/windows/icons/kde-document-save.svg +${PYSITELIB}/veusz/windows/icons/kde-edit-copy.svg +${PYSITELIB}/veusz/windows/icons/kde-edit-delete.svg +${PYSITELIB}/veusz/windows/icons/kde-edit-paste.svg +${PYSITELIB}/veusz/windows/icons/kde-edit-redo.svg +${PYSITELIB}/veusz/windows/icons/kde-edit-rename.svg +${PYSITELIB}/veusz/windows/icons/kde-edit-undo.svg +${PYSITELIB}/veusz/windows/icons/kde-edit-veuszedit.svg +${PYSITELIB}/veusz/windows/icons/kde-edit.svg +${PYSITELIB}/veusz/windows/icons/kde-go-down.svg +${PYSITELIB}/veusz/windows/icons/kde-go-next.svg +${PYSITELIB}/veusz/windows/icons/kde-go-previous.svg +${PYSITELIB}/veusz/windows/icons/kde-go-up.svg +${PYSITELIB}/veusz/windows/icons/kde-mouse-pointer.svg +${PYSITELIB}/veusz/windows/icons/kde-view-refresh.svg +${PYSITELIB}/veusz/windows/icons/kde-vzdata-import.svg +${PYSITELIB}/veusz/windows/icons/kde-window-close.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-1-veuszedit.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-height-veuszedit.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-in.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-original.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-out.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-page-veuszedit.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-veuszedit.svg +${PYSITELIB}/veusz/windows/icons/kde-zoom-width-veuszedit.svg ${PYSITELIB}/veusz/windows/icons/link.png ${PYSITELIB}/veusz/windows/icons/logo.png -${PYSITELIB}/veusz/windows/icons/pointer.png +${PYSITELIB}/veusz/windows/icons/logo.svg ${PYSITELIB}/veusz/windows/icons/settings_axisgridlines.png ${PYSITELIB}/veusz/windows/icons/settings_axislabel.png ${PYSITELIB}/veusz/windows/icons/settings_axisline.png @@ -180,6 +340,7 @@ ${PYSITELIB}/veusz/windows/icons/settings_axisminorticks.png ${PYSITELIB}/veusz/windows/icons/settings_axisticklabels.png ${PYSITELIB}/veusz/windows/icons/settings_bgfill.png ${PYSITELIB}/veusz/windows/icons/settings_border.png +${PYSITELIB}/veusz/windows/icons/settings_main.png ${PYSITELIB}/veusz/windows/icons/settings_ploterrorline.png ${PYSITELIB}/veusz/windows/icons/settings_plotfillabove.png ${PYSITELIB}/veusz/windows/icons/settings_plotfillbelow.png @@ -187,35 +348,19 @@ ${PYSITELIB}/veusz/windows/icons/settings_plotline.png ${PYSITELIB}/veusz/windows/icons/settings_plotmarkerfill.png ${PYSITELIB}/veusz/windows/icons/settings_plotmarkerline.png ${PYSITELIB}/veusz/windows/icons/settings_stylesheet.png -${PYSITELIB}/veusz/windows/icons/stock-copy.png -${PYSITELIB}/veusz/windows/icons/stock-cut.png -${PYSITELIB}/veusz/windows/icons/stock-delete.png -${PYSITELIB}/veusz/windows/icons/stock-edit.png -${PYSITELIB}/veusz/windows/icons/stock-export.png -${PYSITELIB}/veusz/windows/icons/stock-go-down.png -${PYSITELIB}/veusz/windows/icons/stock-go-up.png -${PYSITELIB}/veusz/windows/icons/stock-import.png -${PYSITELIB}/veusz/windows/icons/stock-new.png -${PYSITELIB}/veusz/windows/icons/stock-open.png -${PYSITELIB}/veusz/windows/icons/stock-paste.png -${PYSITELIB}/veusz/windows/icons/stock-print.png -${PYSITELIB}/veusz/windows/icons/stock-quit.png -${PYSITELIB}/veusz/windows/icons/stock-refresh.png -${PYSITELIB}/veusz/windows/icons/stock-save-as.png -${PYSITELIB}/veusz/windows/icons/stock-save.png -${PYSITELIB}/veusz/windows/icons/stock-zoom-100.png -${PYSITELIB}/veusz/windows/icons/stock-zoom-fit.png -${PYSITELIB}/veusz/windows/icons/stock-zoom-in.png -${PYSITELIB}/veusz/windows/icons/stock-zoom-out.png -${PYSITELIB}/veusz/windows/icons/stock_draw-selection.png -${PYSITELIB}/veusz/windows/icons/stock_next-page.png -${PYSITELIB}/veusz/windows/icons/stock_previous-page.png -${PYSITELIB}/veusz/windows/icons/stock_zoom-page-height.png -${PYSITELIB}/veusz/windows/icons/stock_zoom-page-width.png -${PYSITELIB}/veusz/windows/icons/stock_zoom-page.png +${PYSITELIB}/veusz/windows/icons/veusz-capture-data.svg +${PYSITELIB}/veusz/windows/icons/veusz-edit-custom.svg +${PYSITELIB}/veusz/windows/icons/veusz-edit-cut.svg +${PYSITELIB}/veusz/windows/icons/veusz-edit-prefs.svg +${PYSITELIB}/veusz/windows/icons/veusz-shape-menu.svg +${PYSITELIB}/veusz/windows/icons/veusz-zoom-graph.svg ${PYSITELIB}/veusz/windows/icons/veusz.png -${PYSITELIB}/veusz/windows/icons/zoom-options.png -${PYSITELIB}/veusz/windows/icons/zoom_graph.png +${PYSITELIB}/veusz/windows/icons/veusz.svg +${PYSITELIB}/veusz/windows/icons/veusz_128.png +${PYSITELIB}/veusz/windows/icons/veusz_16.png +${PYSITELIB}/veusz/windows/icons/veusz_32.png +${PYSITELIB}/veusz/windows/icons/veusz_48.png +${PYSITELIB}/veusz/windows/icons/veusz_64.png ${PYSITELIB}/veusz/windows/mainwindow.py ${PYSITELIB}/veusz/windows/mainwindow.pyc ${PYSITELIB}/veusz/windows/mainwindow.pyo diff --git a/graphics/veusz/distinfo b/graphics/veusz/distinfo index c89b4ba0154c..2fb9e0cf3c0b 100644 --- a/graphics/veusz/distinfo +++ b/graphics/veusz/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2006/07/04 16:15:01 drochner Exp $ +$NetBSD: distinfo,v 1.4 2010/02/11 18:58:35 drochner Exp $ -SHA1 (veusz-0.10.tar.gz) = 7caa17a21b93082ae11ffbd973c5e6bbbe55cf33 -RMD160 (veusz-0.10.tar.gz) = 4a7b78954ec4acb0d8666980ee26050d9eb53494 -Size (veusz-0.10.tar.gz) = 639448 bytes +SHA1 (veusz-1.6.tar.gz) = 2d4749dc82e6d7e29f429f9fc7ce4850c6f356c4 +RMD160 (veusz-1.6.tar.gz) = 37ec62570c201ebeb79fdd55dd008e55ef48a100 +Size (veusz-1.6.tar.gz) = 1135563 bytes diff --git a/lang/openjdk7/Makefile b/lang/openjdk7/Makefile index 19746961d004..6fc19dab33db 100644 --- a/lang/openjdk7/Makefile +++ b/lang/openjdk7/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/02/02 23:12:53 jmcneill Exp $ +# $NetBSD: Makefile,v 1.17 2010/02/11 09:44:26 tnn Exp $ DISTNAME= openjdk-7-ea-src-b78-17_dec_2009 PKGNAME= openjdk7-1.7.0.78.20100102 @@ -7,7 +7,7 @@ CATEGORIES= lang MASTER_SITES= ${MASTER_SITE_LOCAL:=openjdk7/} EXTRACT_SUFX= .tar.bz2 -MAINTAINER= tnn@NetBSD.org +OWNER= tnn@NetBSD.org HOMEPAGE= http://openjdk.java.net/ COMMENT= Open-source implementation of the Java Platform, Standard Edition diff --git a/lang/python26/Makefile b/lang/python26/Makefile index 039714c5cf3d..9b3f7da62fee 100644 --- a/lang/python26/Makefile +++ b/lang/python26/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2010/01/26 12:15:26 tron Exp $ +# $NetBSD: Makefile,v 1.21 2010/02/11 21:21:49 tnn Exp $ DISTNAME= Python-2.6.4 PKGNAME= ${DISTNAME:S/Python/python26/} @@ -115,7 +115,7 @@ PLIST.nav= yes . endif .endif -PLIST_VARS+= bsddb dll nis no-nis +PLIST_VARS+= dll nis no-nis .if ${OPSYS} == "IRIX" . if ${ABI} == "64" PLIST.no-nis= yes @@ -123,15 +123,6 @@ PLIST.no-nis= yes PLIST.nis= yes . endif .else -. include "../../mk/bdb.buildlink3.mk" -MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} -MAKE_ENV+= PY_BDB_INCDIRS=${BUILDLINK_INCDIRS.${BDB_TYPE}:S,^,${BDBBASE}/,:Q} -MAKE_ENV+= PY_BDB_LIBDIRS=${BDBBASE}/lib -.if empty(BDB_LIBS) -BUILDLINK_TRANSFORM+= rm:-ldb -.endif -CFLAGS+= -DHAVE_DB_185_H -PLIST.bsddb= yes PLIST.dll= yes . if ${OPSYS} != "NetBSD" || exists(/usr/bin/ypcat) PLIST.nis= yes @@ -140,6 +131,13 @@ PLIST.no-nis= yes . endif .endif +.include "../../mk/bdb.buildlink3.mk" +MAKE_ENV+= PY_BDB_TYPE=${BDB_TYPE} +.if empty(BDB_LIBS) +BUILDLINK_TRANSFORM+= rm:-ldb +.endif +CFLAGS+= -DHAVE_DB_185_H + .if ${OPSYS} == "OSF1" # configure complains about buggy getaddrinfo() CONFIGURE_ARGS+= --disable-ipv6 diff --git a/lang/python26/PLIST.common b/lang/python26/PLIST.common index 02efb1c8f6aa..93bb5f49721a 100644 --- a/lang/python26/PLIST.common +++ b/lang/python26/PLIST.common @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST.common,v 1.8 2010/01/26 12:15:26 tron Exp $ +@comment $NetBSD: PLIST.common,v 1.9 2010/02/11 21:21:49 tnn Exp $ bin/2to3 bin/pydoc${PY_VER_SUFFIX} bin/python${PY_VER_SUFFIX} @@ -1708,7 +1708,7 @@ lib/python${PY_VER_SUFFIX}/lib-dynload/_weakref.so lib/python${PY_VER_SUFFIX}/lib-dynload/array.so lib/python${PY_VER_SUFFIX}/lib-dynload/audioop.so lib/python${PY_VER_SUFFIX}/lib-dynload/binascii.so -${PLIST.bsddb}lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so +lib/python${PY_VER_SUFFIX}/lib-dynload/bsddb185.so lib/python${PY_VER_SUFFIX}/lib-dynload/bz2.so lib/python${PY_VER_SUFFIX}/lib-dynload/cPickle.so lib/python${PY_VER_SUFFIX}/lib-dynload/cStringIO.so diff --git a/lang/python26/distinfo b/lang/python26/distinfo index 2648f0126d44..1af6db766742 100644 --- a/lang/python26/distinfo +++ b/lang/python26/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.18 2010/01/26 12:15:26 tron Exp $ +$NetBSD: distinfo,v 1.20 2010/02/11 21:09:50 tnn Exp $ SHA1 (Python-2.6.4.tar.bz2) = bee572680d1966501247cb2b26e0e51f94d1cd13 RMD160 (Python-2.6.4.tar.bz2) = fd33853842110fa3636dd296f2f27646fd2b151a @@ -10,7 +10,7 @@ SHA1 (patch-ad) = a997e39d16a8f0023125362b180d19ee97ab519b SHA1 (patch-ae) = 5425515c6bf130eee204ca2749386f6447eaa35b SHA1 (patch-ah) = 98e9fa55c2af38d8032398cae693492c199dc5fa SHA1 (patch-al) = c39144cfa4a540900fac879b5faa990628fcee3e -SHA1 (patch-am) = 952cadccc4cef28da7f297f35a5073dcce38033b +SHA1 (patch-am) = 6ca7c1c2360e30807d06ecb62b794604d1ad951a SHA1 (patch-an) = 17b4e17b3b562c29a050e9bb20447084ce82b8ab SHA1 (patch-ao) = 9bbd5561c010e0a1ab8e0a70d27a5f77fd2089d2 SHA1 (patch-ap) = 39d81b01fa9e1b894be9ae0922881337bb4d17da diff --git a/lang/python26/patches/patch-am b/lang/python26/patches/patch-am index ba26c937a625..121d25f2c81c 100644 --- a/lang/python26/patches/patch-am +++ b/lang/python26/patches/patch-am @@ -1,18 +1,18 @@ -$NetBSD: patch-am,v 1.8 2010/01/26 12:15:26 tron Exp $ +$NetBSD: patch-am,v 1.10 2010/02/11 21:09:50 tnn Exp $ Disabled modules for normal build: bsdddb curses curses_panel elementtree -Those have separate packages. +Those have separate packages. Only check the BUILDLINK_DIR for libraries etc, do not pick up random headers and libraries from the system. Build the 1.85 compat module all the time against the BDB version of choice. ---- setup.py.orig 2009-09-20 12:37:33.000000000 +0200 +--- setup.py.orig 2009-10-08 09:48:32.000000000 +0000 +++ setup.py @@ -17,7 +17,7 @@ from distutils.command.install import in from distutils.command.install_lib import install_lib @@ -226,7 +226,7 @@ Build the 1.85 compat module all the time against the BDB version of choice. - exts.append(Extension('bsddb185', ['bsddbmodule.c'])) - else: - missing.append('bsddb185') -+ libraries = os.getenv("PY_BDB_TYPE", "") ++ libraries = os.getenv("PY_BDB_TYPE", "") + if libraries: + exts.append(Extension('bsddb185', ['bsddbmodule.c'], + libraries=["db"])) @@ -236,7 +236,33 @@ Build the 1.85 compat module all the time against the BDB version of choice. # The standard Unix dbm module: if platform not in ['cygwin']: -@@ -1300,6 +1146,14 @@ class PyBuildExt(build_ext): +@@ -1020,7 +866,7 @@ class PyBuildExt(build_ext): + exts.append( Extension('dbm', ['dbmmodule.c'], + define_macros=[('HAVE_NDBM_H',None)], + libraries = ndbm_libs ) ) +- elif self.compiler.find_library_file(lib_dirs, 'gdbm'): ++ elif 1==0 and self.compiler.find_library_file(lib_dirs, 'gdbm'): + gdbm_libs = ['gdbm'] + if self.compiler.find_library_file(lib_dirs, 'gdbm_compat'): + gdbm_libs.append('gdbm_compat') +@@ -1036,14 +882,11 @@ class PyBuildExt(build_ext): + libraries = gdbm_libs ) ) + else: + missing.append('dbm') +- elif db_incs is not None: ++ elif 1==1: + exts.append( Extension('dbm', ['dbmmodule.c'], +- library_dirs=dblib_dir, +- runtime_library_dirs=dblib_dir, +- include_dirs=db_incs, + define_macros=[('HAVE_BERKDB_H',None), + ('DB_DBM_HSEARCH',None)], +- libraries=dblibs)) ++ libraries=["db"])) + else: + missing.append('dbm') + +@@ -1300,6 +1143,14 @@ class PyBuildExt(build_ext): ) libraries = [] @@ -251,7 +277,7 @@ Build the 1.85 compat module all the time against the BDB version of choice. else: # Linux and other unices macros = dict( HAVE_SEM_OPEN=1, -@@ -1900,9 +1754,9 @@ def main(): +@@ -1900,9 +1751,9 @@ def main(): ext_modules=[Extension('_struct', ['_struct.c'])], # Scripts to install diff --git a/lang/swi-prolog-lite/PLIST b/lang/swi-prolog-lite/PLIST index 140e1ff1d3e1..d39afe74f16e 100644 --- a/lang/swi-prolog-lite/PLIST +++ b/lang/swi-prolog-lite/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.6 2010/02/10 21:56:41 asau Exp $ +@comment $NetBSD: PLIST,v 1.7 2010/02/11 19:00:18 asau Exp $ bin/plld bin/plrc bin/swi-prolog @@ -26,7 +26,7 @@ lib/swi-prolog-${PKGVERSION}/boot/syspred.pl lib/swi-prolog-${PKGVERSION}/boot/toplevel.pl lib/swi-prolog-${PKGVERSION}/boot/topvars.pl lib/swi-prolog-${PKGVERSION}/boot/writef.pl -lib/swi-prolog-${PKGVERSION}/boot32.prc +lib/swi-prolog-${PKGVERSION}/boot${BITS}.prc lib/swi-prolog-${PKGVERSION}/demo/README lib/swi-prolog-${PKGVERSION}/demo/likes.pl lib/swi-prolog-${PKGVERSION}/doc/Manual/64bits.html diff --git a/lang/tcl-itcl-current/Makefile b/lang/tcl-itcl-current/Makefile index b565ccf73109..2b1d3fca7d4e 100644 --- a/lang/tcl-itcl-current/Makefile +++ b/lang/tcl-itcl-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2010/02/04 01:32:00 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/11 13:58:05 joerg Exp $ DISTNAME= tcl-itcl-20040920 PKGNAME= ${DISTNAME:S/itcl/itcl-current/} @@ -35,9 +35,8 @@ SUBST_SED.tcl-itcl+= -e s\|${WRKSRC:Q}/itcl\|${PREFIX:Q}/lib/tcl/itcl${ITCL_VERS SUBST_SED.tcl-itcl+= -e s\|${PREFIX:Q}/lib/itcl${ITCL_VERS:Q}\|${PREFIX:Q}/lib/tcl/itcl${ITCL_VERS:Q}\| SUBST_SED.tcl-itcl+= -e s\|${WRKDIR:Q}/${DISTNAME:C/-src//:Q}\|${PREFIX:Q}\| -INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ - exec_prefix=${DESTDIR}${PREFIX} \ - mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} +INSTALLATION_DIRS+= lib +INSTALL_MAKE_FLAGS+= INSTALL_ROOT=${DESTDIR} BUILDLINK_DEPMETHOD.libXt?= build diff --git a/lang/tcl-itcl/Makefile b/lang/tcl-itcl/Makefile index 1ace19c7c2fd..ce607e68f885 100644 --- a/lang/tcl-itcl/Makefile +++ b/lang/tcl-itcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2010/02/04 01:28:59 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2010/02/11 13:44:02 joerg Exp $ DISTNAME= itcl3.2.1_src PKGNAME= tcl-itcl-3.2.1 @@ -28,8 +28,7 @@ CONFIGURE_ENV+= AR=${AR:Q} MAKE_ENV+= TCL_HEADER_DIR=${BUILDLINK_PREFIX.tcl}/include/tcl INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} \ - prefix=${DESTDIR}${PREFIX} \ - exec_prefix=${DESTDIR}${PREFIX} + includedir=${DESTDIR}${PREFIX}/include .include "../../lang/tcl/buildlink3.mk" .include "../../x11/tk/buildlink3.mk" diff --git a/lang/tcl-itcl/distinfo b/lang/tcl-itcl/distinfo index 7e3f9ab27ec3..d7c5d12cad27 100644 --- a/lang/tcl-itcl/distinfo +++ b/lang/tcl-itcl/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.8 2005/11/17 23:43:04 rillig Exp $ +$NetBSD: distinfo,v 1.9 2010/02/11 13:44:02 joerg Exp $ SHA1 (itcl3.2.1_src.tgz) = 890f56e61826a9c3522fb24bf3c08f73cea8a1dd RMD160 (itcl3.2.1_src.tgz) = 6a6bbc5596e3c7b8bfd6783533d26d07b1c3a7c1 Size (itcl3.2.1_src.tgz) = 427026 bytes SHA1 (patch-aa) = 5357555498f874a5d90de6451847e50df167ab9f -SHA1 (patch-ab) = f78dd17f2da70187a1b8aca0f484a6813876625c +SHA1 (patch-ab) = 7d27e16f77fd4723d6bb639cf5be6cdb35149509 SHA1 (patch-ac) = 7885a8d126449068f3af7e748193b2cdf3051fce -SHA1 (patch-ad) = 9131b2aa318410100f5477a70a7ce5221133f49b +SHA1 (patch-ad) = 4f21f77b68fa3c406f9e3d24d01c7158f6a7825a SHA1 (patch-ag) = 3d12b3a2cf0cd35c39f622cf8f9b4872772c12c6 SHA1 (patch-ah) = 759946f4f066b5e6d41a4120c983b1a169dff3df diff --git a/lang/tcl-itcl/patches/patch-ab b/lang/tcl-itcl/patches/patch-ab index 8d237e905412..661b9fac089b 100644 --- a/lang/tcl-itcl/patches/patch-ab +++ b/lang/tcl-itcl/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.3 2005/10/26 04:22:38 minskim Exp $ +$NetBSD: patch-ab,v 1.4 2010/02/11 13:44:02 joerg Exp $ --- itcl/Makefile.in.orig Tue Aug 29 03:58:00 2000 +++ itcl/Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.3 2005/10/26 04:22:38 minskim Exp $ SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@ -ITCL_LIBRARY = $(prefix)/lib/itcl$(VERSION) -+ITCL_LIBRARY = $(prefix)/lib/tcl/itcl$(VERSION) ++ITCL_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itcl$(VERSION) ITCL_GENERIC_DIR_NATIVE = @ITCL_GENERIC_DIR_NATIVE@ ITCL_UNIX_DIR_NATIVE = @ITCL_UNIX_DIR_NATIVE@ @@ -16,7 +16,7 @@ $NetBSD: patch-ab,v 1.3 2005/10/26 04:22:38 minskim Exp $ pkgdatadir = $(datadir)/@PACKAGE@@VERSION@ -pkglibdir = $(libdir)/@PACKAGE@@VERSION@ -+pkglibdir = $(libdir)/tcl/@PACKAGE@@VERSION@ ++pkglibdir = ${DESTDIR}$(libdir)/tcl/@PACKAGE@@VERSION@ pkgincludedir = $(includedir)/@PACKAGE@@VERSION@ top_builddir = . diff --git a/lang/tcl-itcl/patches/patch-ad b/lang/tcl-itcl/patches/patch-ad index 87a91782b4cc..e933ae8f058a 100644 --- a/lang/tcl-itcl/patches/patch-ad +++ b/lang/tcl-itcl/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $ +$NetBSD: patch-ad,v 1.4 2010/02/11 13:44:02 joerg Exp $ --- itk/Makefile.in.orig Tue Aug 29 03:58:00 2000 +++ itk/Makefile.in @@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $ SAMPLE_NEW_VAR=@SAMPLE_NEW_VAR@ -ITK_LIBRARY = $(prefix)/lib/itk$(VERSION) -+ITK_LIBRARY = $(prefix)/lib/tcl/itk$(VERSION) ++ITK_LIBRARY = ${DESTDIR}$(prefix)/lib/tcl/itk$(VERSION) ITK_GENERIC_DIR_NATIVE = @ITK_GENERIC_DIR_NATIVE@ ITK_UNIX_DIR_NATIVE = @ITK_UNIX_DIR_NATIVE@ @@ -16,7 +16,7 @@ $NetBSD: patch-ad,v 1.3 2005/10/26 04:22:38 minskim Exp $ pkgdatadir = $(datadir)/@PACKAGE@@VERSION@ -pkglibdir = $(libdir)/@PACKAGE@@VERSION@ -+pkglibdir = $(libdir)/tcl/@PACKAGE@@VERSION@ ++pkglibdir = ${DESTDIR}$(libdir)/tcl/@PACKAGE@@VERSION@ pkgincludedir = $(includedir)/@PACKAGE@@VERSION@ top_builddir = . diff --git a/lang/yap/Makefile b/lang/yap/Makefile index 44b29f562ef4..e6625d322ef9 100644 --- a/lang/yap/Makefile +++ b/lang/yap/Makefile @@ -1,11 +1,10 @@ -# $NetBSD: Makefile,v 1.6 2008/06/12 02:14:33 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 20:43:49 asau Exp $ # -DISTNAME= Yap-5.0.0 -PKGREVISION= 1 +DISTNAME= Yap-5.1.3 CATEGORIES= lang -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yap/} -DIST_SUBDIR= ${PKGNAME_NOREV}-1 +# MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=yap/} +MASTER_SITES= http://www.dcc.fc.up.pt/~vsc/Yap/current/ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ncc.up.pt/~vsc/Yap/ @@ -16,6 +15,14 @@ PKG_DESTDIR_SUPPORT= user-destdir USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +# Don't enable system malloc, it dumps core otherwise: +#CONFIGURE_ARGS= --enable-use-malloc CONFIGURE_ENV+= INDENT=${TRUE:Q} +# debug option: +#CONFIGURE_ARGS+= --enable-debug-yap + +.include "../../devel/ncurses/buildlink3.mk" +.include "../../devel/readline/buildlink3.mk" +.include "../../devel/gmp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/lang/yap/PLIST b/lang/yap/PLIST index f65b16957718..69144e942e8c 100644 --- a/lang/yap/PLIST +++ b/lang/yap/PLIST @@ -1,8 +1,12 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/14 18:03:45 joerg Exp $ +@comment $NetBSD: PLIST,v 1.4 2010/02/11 20:43:49 asau Exp $ bin/yap +include/Yap/SWI-Prolog.h +include/Yap/SWI-Stream.h include/Yap/YapInterface.h include/Yap/c_interface.h include/Yap/yap_structs.h +lib/Yap/itries.so +lib/Yap/matrix.so lib/Yap/random.so lib/Yap/regcomp.so lib/Yap/regerror.so @@ -11,208 +15,118 @@ lib/Yap/regexp.so lib/Yap/regfree.so lib/Yap/startup lib/Yap/sys.so -lib/Yap/yap2swi.so -lib/Yap/yap_tries.so +lib/Yap/tries.so +lib/Yap/yap_rl.so lib/libYap.a -share/Yap/CHR.LICENSE -share/Yap/CLPQR.LICENSE +share/Yap/aggregate.pl +share/Yap/apply.pl +share/Yap/apply.yap share/Yap/apply_macros.yap +share/Yap/arg.yap share/Yap/assoc.yap share/Yap/atts.yap share/Yap/avl.yap share/Yap/charsio.yap -share/Yap/chr.yap -share/Yap/chr/chrcmp.pl -share/Yap/chr/compenv.pl -share/Yap/chr/concat.pl -share/Yap/chr/examples/allentable.pl -share/Yap/chr/examples/arc.pl -share/Yap/chr/examples/bool.pl -share/Yap/chr/examples/cft.pl -share/Yap/chr/examples/domain.pl -share/Yap/chr/examples/examples-adder.bool -share/Yap/chr/examples/examples-benchmark.math -share/Yap/chr/examples/examples-deussen.bool -share/Yap/chr/examples/examples-diaz.bool -share/Yap/chr/examples/examples-fourier.math -share/Yap/chr/examples/examples-holzbaur.math -share/Yap/chr/examples/examples-lim1.math -share/Yap/chr/examples/examples-lim2.math -share/Yap/chr/examples/examples-lim3.math -share/Yap/chr/examples/examples-puzzle.bool -share/Yap/chr/examples/examples-queens.bool -share/Yap/chr/examples/examples-queens.domain -share/Yap/chr/examples/examples-stuckey.math -share/Yap/chr/examples/examples-thom.math -share/Yap/chr/examples/gcd.pl -share/Yap/chr/examples/interval.pl -share/Yap/chr/examples/kl-one.pl -share/Yap/chr/examples/leq.pl -share/Yap/chr/examples/list.pl -share/Yap/chr/examples/listdom.pl -share/Yap/chr/examples/math-elim.pl -share/Yap/chr/examples/math-fougau.pl -share/Yap/chr/examples/math-fourier.pl -share/Yap/chr/examples/math-gauss.pl -share/Yap/chr/examples/math-utilities.pl -share/Yap/chr/examples/minmax.pl -share/Yap/chr/examples/modelgenerator.pl -share/Yap/chr/examples/osf.pl -share/Yap/chr/examples/oztype.pl -share/Yap/chr/examples/path.pl -share/Yap/chr/examples/pathc.pl -share/Yap/chr/examples/primes.pl -share/Yap/chr/examples/scheduling.pl -share/Yap/chr/examples/tarski.pl -share/Yap/chr/examples/term.pl -share/Yap/chr/examples/time-pc.pl -share/Yap/chr/examples/time-point.pl -share/Yap/chr/examples/time-rnd.pl -share/Yap/chr/examples/time.pl -share/Yap/chr/examples/tree.pl -share/Yap/chr/examples/type.pl -share/Yap/chr/getval.pl -share/Yap/chr/matching.pl -share/Yap/chr/operator.pl -share/Yap/chr/ordering.pl -share/Yap/chr/sbag.pl -share/Yap/chr/sbag_a.pl -share/Yap/chr/sbag_l.pl -share/Yap/chr/trace.yap share/Yap/cleanup.yap +share/Yap/clp/clp_events.pl share/Yap/clpbn.yap share/Yap/clpbn/aggregates.yap share/Yap/clpbn/bnt.yap share/Yap/clpbn/discrete_utils.yap +share/Yap/clpbn/display.yap +share/Yap/clpbn/dists.yap share/Yap/clpbn/evidence.yap +share/Yap/clpbn/examples/School/README +share/Yap/clpbn/examples/School/evidence_128.yap +share/Yap/clpbn/examples/School/schema.yap +share/Yap/clpbn/examples/School/school_128.yap +share/Yap/clpbn/examples/School/school_32.yap +share/Yap/clpbn/examples/School/school_64.yap +share/Yap/clpbn/examples/School/tables.yap +share/Yap/clpbn/examples/cg.yap +share/Yap/clpbn/examples/sprinkler.yap share/Yap/clpbn/gibbs.yap share/Yap/clpbn/graphs.yap share/Yap/clpbn/graphviz.yap +share/Yap/clpbn/hmm.yap +share/Yap/clpbn/jt.yap +share/Yap/clpbn/learning/bnt_parms.yap +share/Yap/clpbn/learning/learn_utils.yap +share/Yap/clpbn/learning/mle.yap +share/Yap/clpbn/matrix_cpt_utils.yap share/Yap/clpbn/topsort.yap share/Yap/clpbn/utils.yap share/Yap/clpbn/vel.yap share/Yap/clpbn/viterbi.yap share/Yap/clpbn/xbif.yap -share/Yap/clpq.yap -share/Yap/clpq/arith_q.yap -share/Yap/clpq/class.yap -share/Yap/clpq/geler.yap -share/Yap/clpq/nf.yap -share/Yap/clpq/nfq.yap -share/Yap/clpqr/arith.pl -share/Yap/clpqr/bb.yap -share/Yap/clpqr/bv.yap -share/Yap/clpqr/compenv.pl +share/Yap/clpfd.pl +share/Yap/clpq.pl +share/Yap/clpq/bb_q.pl +share/Yap/clpq/bv_q.pl +share/Yap/clpq/fourmotz_q.pl +share/Yap/clpq/ineq_q.pl +share/Yap/clpq/itf_q.pl +share/Yap/clpq/nf_q.pl +share/Yap/clpq/store_q.pl +share/Yap/clpqr/README +share/Yap/clpqr/class.pl share/Yap/clpqr/dump.pl -share/Yap/clpqr/examples/README -share/Yap/clpqr/examples/SESSION/010 -share/Yap/clpqr/examples/SESSION/011 -share/Yap/clpqr/examples/SESSION/012 -share/Yap/clpqr/examples/SESSION/013 -share/Yap/clpqr/examples/SESSION/014 -share/Yap/clpqr/examples/SESSION/015 -share/Yap/clpqr/examples/SESSION/016 -share/Yap/clpqr/examples/SESSION/017 -share/Yap/clpqr/examples/SESSION/018 -share/Yap/clpqr/examples/SESSION/019 -share/Yap/clpqr/examples/SESSION/020 -share/Yap/clpqr/examples/SESSION/021 -share/Yap/clpqr/examples/SESSION/022 -share/Yap/clpqr/examples/SESSION/023 -share/Yap/clpqr/examples/SESSION/024 -share/Yap/clpqr/examples/SESSION/030 -share/Yap/clpqr/examples/SESSION/031 -share/Yap/clpqr/examples/SESSION/032 -share/Yap/clpqr/examples/SESSION/033 -share/Yap/clpqr/examples/SESSION/034 -share/Yap/clpqr/examples/SESSION/035 -share/Yap/clpqr/examples/SESSION/110 -share/Yap/clpqr/examples/SESSION/111 -share/Yap/clpqr/examples/SESSION/112 -share/Yap/clpqr/examples/SESSION/113 -share/Yap/clpqr/examples/SESSION/114 -share/Yap/clpqr/examples/SESSION/115 -share/Yap/clpqr/examples/SESSION/116 -share/Yap/clpqr/examples/SESSION/117 -share/Yap/clpqr/examples/SESSION/118 -share/Yap/clpqr/examples/SESSION/119 -share/Yap/clpqr/examples/SESSION/120 -share/Yap/clpqr/examples/SESSION/122 -share/Yap/clpqr/examples/SESSION/123 -share/Yap/clpqr/examples/SESSION/124 -share/Yap/clpqr/examples/SESSION/130 -share/Yap/clpqr/examples/SESSION/131 -share/Yap/clpqr/examples/SESSION/132 -share/Yap/clpqr/examples/SESSION/133 -share/Yap/clpqr/examples/SESSION/134 -share/Yap/clpqr/examples/SESSION/135 -share/Yap/clpqr/examples/caneghem.pl -share/Yap/clpqr/examples/eliminat.pl -share/Yap/clpqr/examples/matmul.pl -share/Yap/clpqr/examples/mg.pl -share/Yap/clpqr/examples/mip.pl -share/Yap/clpqr/examples/monash/README -share/Yap/clpqr/examples/monash/air -share/Yap/clpqr/examples/monash/amplif -share/Yap/clpqr/examples/monash/complex -share/Yap/clpqr/examples/monash/critical -share/Yap/clpqr/examples/monash/dnf -share/Yap/clpqr/examples/monash/fib -share/Yap/clpqr/examples/monash/findroot -share/Yap/clpqr/examples/monash/invert -share/Yap/clpqr/examples/monash/laplace -share/Yap/clpqr/examples/monash/mortgage -share/Yap/clpqr/examples/monash/nrev -share/Yap/clpqr/examples/monash/option -share/Yap/clpqr/examples/monash/pictures -share/Yap/clpqr/examples/monash/rkf45 -share/Yap/clpqr/examples/monash/rlc -share/Yap/clpqr/examples/monash/smm -share/Yap/clpqr/examples/monash/toolpath -share/Yap/clpqr/examples/monash/zebra -share/Yap/clpqr/examples/root.pl -share/Yap/clpqr/examples/simplex.pl -share/Yap/clpqr/examples/squares.pl -share/Yap/clpqr/expand.yap -share/Yap/clpqr/fourmotz.pl -share/Yap/clpqr/ineq.yap -share/Yap/clpqr/itf3.pl -share/Yap/clpqr/monash.pl -share/Yap/clpqr/ordering.yap -share/Yap/clpqr/printf.pl +share/Yap/clpqr/geler.pl +share/Yap/clpqr/itf.pl +share/Yap/clpqr/ordering.pl share/Yap/clpqr/project.pl share/Yap/clpqr/redund.pl -share/Yap/clpqr/store.yap -share/Yap/clpr.yap -share/Yap/clpr/arith_r.yap -share/Yap/clpr/class.yap -share/Yap/clpr/geler.yap -share/Yap/clpr/nf.yap -share/Yap/clpr/nfr.yap +share/Yap/clpr.pl +share/Yap/clpr/bb_r.pl +share/Yap/clpr/bv_r.pl +share/Yap/clpr/fourmotz_r.pl +share/Yap/clpr/ineq_r.pl +share/Yap/clpr/itf_r.pl +share/Yap/clpr/nf_r.pl +share/Yap/clpr/store_r.pl +share/Yap/dbqueues.yap +share/Yap/debug.pl +share/Yap/dgraphs.yap +share/Yap/error.pl +share/Yap/gensym.yap +share/Yap/hacks.yap share/Yap/heaps.yap share/Yap/icon_address.pl +share/Yap/itries.yap +share/Yap/lam_mpi.yap +share/Yap/lineutils.yap +share/Yap/listing.yap share/Yap/lists.yap -share/Yap/logtalk.yap -share/Yap/logtalk/logtalk.pl -share/Yap/logtalk/yap.config +share/Yap/maplist.pl +share/Yap/matlab.yap +share/Yap/matrix.yap +share/Yap/nb.yap +share/Yap/occurs.yap +share/Yap/operators.pl +share/Yap/option.pl share/Yap/ordsets.yap +share/Yap/pairs.pl share/Yap/pillow.pl share/Yap/pl/arith.yap share/Yap/pl/arrays.yap share/Yap/pl/boot.yap share/Yap/pl/callcount.yap share/Yap/pl/checker.yap +share/Yap/pl/chtypes.yap share/Yap/pl/consult.yap share/Yap/pl/corout.yap share/Yap/pl/debug.yap share/Yap/pl/depth_bound.yap share/Yap/pl/directives.yap +share/Yap/pl/eam.yap share/Yap/pl/errors.yap share/Yap/pl/grammar.yap share/Yap/pl/ground.yap +share/Yap/pl/hacks.yap share/Yap/pl/init.yap share/Yap/pl/listing.yap share/Yap/pl/load_foreign.yap +share/Yap/pl/messages.yap share/Yap/pl/modules.yap share/Yap/pl/preds.yap share/Yap/pl/profile.yap @@ -229,16 +143,27 @@ share/Yap/pl/utils.yap share/Yap/pl/yapor.yap share/Yap/pl/yio.yap share/Yap/prandom.yap +share/Yap/prolog_source.pl +share/Yap/prolog_xref.pl share/Yap/queues.yap share/Yap/random.yap share/Yap/rbtrees.yap +share/Yap/readutil.yap share/Yap/regexp.yap +share/Yap/rltree.yap share/Yap/splay.yap +share/Yap/stringutils.yap share/Yap/swi.yap +share/Yap/swi/apply_macros.pl share/Yap/system.yap share/Yap/terms.yap share/Yap/timeout.yap share/Yap/trees.yap share/Yap/tries.yap share/Yap/ugraphs.yap +share/Yap/undgraphs.yap +share/Yap/varnumbers.yap +share/Yap/wdgraphs.yap +share/Yap/wgraphs.yap +share/Yap/wundgraphs.yap share/Yap/ypp.yap diff --git a/lang/yap/distinfo b/lang/yap/distinfo index 99c1e62970c9..62868699d7e0 100644 --- a/lang/yap/distinfo +++ b/lang/yap/distinfo @@ -1,8 +1,14 @@ -$NetBSD: distinfo,v 1.5 2006/01/11 18:35:19 joerg Exp $ +$NetBSD: distinfo,v 1.6 2010/02/11 20:43:49 asau Exp $ -SHA1 (Yap-5.0.0-1/Yap-5.0.0.tar.gz) = 56c6ddc976208f66f49c59f2a6787590d1512732 -RMD160 (Yap-5.0.0-1/Yap-5.0.0.tar.gz) = e63d5ecf66dda0fced26afe9dc9afb892a02762b -Size (Yap-5.0.0-1/Yap-5.0.0.tar.gz) = 3102749 bytes +SHA1 (Yap-5.1.3.tar.gz) = 76c84b32ad8fbe8324a1db370f8440be11398c34 +RMD160 (Yap-5.1.3.tar.gz) = b2e1153c7a6853a4814a672992d2b8b3834796bc +Size (Yap-5.1.3.tar.gz) = 3266063 bytes SHA1 (patch-aa) = dca2acac805aabd8e2815b509ad516294484ad0f -SHA1 (patch-ab) = fc4e742886129fac5cbb2195e8aec072c7a3e9ac -SHA1 (patch-ac) = 4ebf6b8c6c7a9d4cecd2d0d59ee708168c4de60a +SHA1 (patch-ab) = 76e1a2b4a183215c37ede5c8cbec624e901fe427 +SHA1 (patch-ac) = c0d382127f9bc3a962d01a0da34c99968f7388ab +SHA1 (patch-ad) = e3765c0d6729b4d531cdea59dc8e442055091d10 +SHA1 (patch-ae) = cf4a79ccd0c34e42ca3d8a108619a9974288cde6 +SHA1 (patch-af) = e49296d42247aec7ead7f65d67a42f93b400ca0f +SHA1 (patch-ag) = a9f2bfc921f5c2aaf2a92e6659c54047e5c13321 +SHA1 (patch-ah) = 572e29729d97d5e9942a3d2c22e121d4e756d648 +SHA1 (patch-ai) = a702088735520c36ada438e752b1852d9567e5e2 diff --git a/lang/yap/patches/patch-ab b/lang/yap/patches/patch-ab index a0696dd7bf6d..522fb39775b7 100644 --- a/lang/yap/patches/patch-ab +++ b/lang/yap/patches/patch-ab @@ -1,22 +1,22 @@ -$NetBSD: patch-ab,v 1.1 2006/01/11 18:35:19 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2010/02/11 20:43:49 asau Exp $ ---- H/Yap.h.orig 2006-01-11 18:06:46.000000000 +0000 -+++ H/Yap.h -@@ -237,7 +237,7 @@ extern char Yap_Option[20]; +--- H/Yap.h.orig 2008-05-23 14:02:13.000000000 +0400 ++++ H/Yap.h 2009-02-06 21:36:00.000000000 +0300 +@@ -231,7 +231,7 @@ #endif - #if !IN_SECOND_QUADRANT + #if !defined(IN_SECOND_QUADRANT) -#if __linux__ || __FreeBSD__ || __NetBSD__ || mips || __APPLE__ +#if defined(__linux__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(mips) || defined(__APPLE__) || defined(__DragonFly__) #if defined(YAPOR) && defined(__alpha) #define MMAP_ADDR 0x40000000 -@@ -641,7 +641,7 @@ typedef enum +@@ -650,7 +650,7 @@ if you place things in the lower addresses (power to the libc people). */ --#if (defined(_AIX) || defined(_WIN32) || defined(__APPLE__) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) -+#if (defined(_AIX) || defined(_WIN32) || defined(__APPLE__) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(_POWER) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) +-#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(_POWER) || defined(__POWERPC__) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) ++#if (defined(_AIX) || (defined(__APPLE__) && !defined(__LP64__)) || defined(_WIN32) || defined(sparc) || defined(__sparc) || defined(mips) || defined(__FreeBSD__) || defined(__DragonFly__) || defined(_POWER) || defined(__linux__) || defined(IN_SECOND_QUADRANT) || defined(__CYGWIN__)) #define USE_LOW32_TAGS 1 #endif diff --git a/lang/yap/patches/patch-ac b/lang/yap/patches/patch-ac index b5a3f15ef394..d65137dc2b13 100644 --- a/lang/yap/patches/patch-ac +++ b/lang/yap/patches/patch-ac @@ -1,10 +1,10 @@ -$NetBSD: patch-ac,v 1.1 2006/01/11 18:35:19 joerg Exp $ +$NetBSD: patch-ac,v 1.2 2010/02/11 20:43:49 asau Exp $ ---- configure.orig 2006-01-11 18:15:45.000000000 +0000 -+++ configure -@@ -6058,7 +6058,7 @@ fi - INSTALL_DLLS="" - CC="cc -no-cpp-precomp" +--- configure.orig 2008-05-24 02:29:49.000000000 +0400 ++++ configure 2009-02-06 21:25:15.000000000 +0300 +@@ -7002,7 +7002,7 @@ + JAVALIBPATH="-L/System/Library/Frameworks/JavaVM.framework/Libraries" + JAVAINCPATH="-I/System/Library/Frameworks/JavaVM.framework/Headers" ;; - *netbsd*|*freebsd*) + *netbsd*|*freebsd*|*dragonfly*) diff --git a/lang/yap/patches/patch-ad b/lang/yap/patches/patch-ad new file mode 100644 index 000000000000..0bd35e88a234 --- /dev/null +++ b/lang/yap/patches/patch-ad @@ -0,0 +1,16 @@ +$NetBSD: patch-ad,v 1.1 2010/02/11 20:43:49 asau Exp $ + +--- C/dlmalloc.c.orig 2008-01-24 03:11:59.000000000 +0300 ++++ C/dlmalloc.c 2009-02-06 22:25:05.000000000 +0300 +@@ -2508,7 +2508,11 @@ + ------------------------------ mallinfo ------------------------------ + */ + ++#if __STD_C ++struct mallinfo mALLINFo(void) ++#else + struct mallinfo mALLINFo() ++#endif + { + mstate av = get_malloc_state(); + struct mallinfo mi; diff --git a/lang/yap/patches/patch-ae b/lang/yap/patches/patch-ae new file mode 100644 index 000000000000..7c902d7f44d6 --- /dev/null +++ b/lang/yap/patches/patch-ae @@ -0,0 +1,14 @@ +$NetBSD: patch-ae,v 1.1 2010/02/11 20:43:49 asau Exp $ + +--- C/c_interface.c.orig 2008-06-17 17:37:48.000000000 +0400 ++++ C/c_interface.c 2009-02-06 22:53:50.000000000 +0300 +@@ -326,6 +326,9 @@ + #if HAVE_STDARG_H + #include + #endif ++#if USE_SYSTEM_MALLOC ++#include ++#endif + #if HAVE_STRING_H + #include + #endif diff --git a/lang/yap/patches/patch-af b/lang/yap/patches/patch-af new file mode 100644 index 000000000000..fd712efd7967 --- /dev/null +++ b/lang/yap/patches/patch-af @@ -0,0 +1,15 @@ +$NetBSD: patch-af,v 1.1 2010/02/11 20:43:49 asau Exp $ + +No "struct mallinfo" on NetBSD (?) + +--- H/dlmalloc.h.orig 2005-11-23 06:01:33.000000000 +0300 ++++ H/dlmalloc.h 2009-04-19 05:14:25.000000000 +0400 +@@ -489,7 +489,7 @@ + HAVE_USR_INCLUDE_MALLOC_H. + */ + +-#if HAVE_MALLOC_H && !defined(_WIN32) ++#if HAVE_MALLOC_H && !defined(__NetBSD__) && !defined(_WIN32) + #define HAVE_USR_INCLUDE_MALLOC_H 1 + #endif + diff --git a/lang/yap/patches/patch-ag b/lang/yap/patches/patch-ag new file mode 100644 index 000000000000..d89c1f4d7c05 --- /dev/null +++ b/lang/yap/patches/patch-ag @@ -0,0 +1,56 @@ +$NetBSD: patch-ag,v 1.1 2010/02/11 20:43:49 asau Exp $ + +--- LGPL/chr/Makefile.in.orig 2008-04-03 17:26:38.000000000 +0400 ++++ LGPL/chr/Makefile.in 2009-04-19 05:42:22.000000000 +0400 +@@ -48,42 +48,42 @@ + $(srcdir)/Benchmarks/bool.chr $(srcdir)/Benchmarks/family.chr $(srcdir)/Benchmarks/fibonacci.chr $(srcdir)/Benchmarks/leq.chr $(srcdir)/Benchmarks/listdom.chr \ + $(srcdir)/Benchmarks/chrdif.chr + +-all: chr_translate.pl ++all: chr_translate.pl guard_entailment.pl + + chr_translate_bootstrap1.pl: $(srcdir)/chr_translate_bootstrap1.chr + $(PL) -f -l chr_swi_bootstrap.yap \ +- -g "chr_compile_step1('$<','$@'),halt." \ ++ -g "chr_compile_step1('$>','$@'),halt." \ + -z 'halt(1).' + $(PL) -f -l chr_swi_bootstrap.yap \ +- -g "chr_compile_step2('$<','$@'),halt." \ ++ -g "chr_compile_step2('$>','$@'),halt." \ + -z 'halt(1).' + + chr_translate_bootstrap2.pl: $(srcdir)/chr_translate_bootstrap2.chr chr_translate_bootstrap1.pl + $(PL) -f -l chr_swi_bootstrap.yap \ +- -g "chr_compile_step2('$<','$@'),halt." \ ++ -g "chr_compile_step2('$>','$@'),halt." \ + -z 'halt(1).' + $(PL) -f -l chr_swi_bootstrap.yap \ +- -g "chr_compile_step3('$<','$@'),halt." \ ++ -g "chr_compile_step3('$>','$@'),halt." \ + -z 'halt(1).' + + guard_entailment.pl: $(srcdir)/guard_entailment.chr chr_translate_bootstrap2.pl + $(PL) -f -l chr_swi_bootstrap.yap \ +- -g "chr_compile_step3('$<','$@'),halt." \ ++ -g "chr_compile_step3('$>','$@'),halt." \ + -z 'halt(1).' + + chr_translate.pl: $(srcdir)/chr_translate.chr chr_translate_bootstrap2.pl guard_entailment.pl + $(PL) -f -l chr_swi_bootstrap.yap \ +- -g "chr_compile_step3('$<','$@'),halt." \ ++ -g "chr_compile_step3('$>','$@'),halt." \ + -z 'halt(1).' + $(PL) -f -p chr=. -l chr_swi_bootstrap.yap \ + -g "chr_compile_step4('guard_entailment.chr','guard_entailment.pl'),halt." \ + -z 'halt(1).' + $(PL) -f -p chr=. -l chr_swi_bootstrap.yap \ +- -g "chr_compile_step4('$<','$@'),halt." \ ++ -g "chr_compile_step4('$>','$@'),halt." \ + -z 'halt(1).' + + chr.pl: chr_swi.pl +- cp $< $@ ++ cp $> $@ + + install: chr_translate.pl guard_entailment.pl + mkdir -p $(DESTDIR)$(CHRDIR) diff --git a/lang/yap/patches/patch-ah b/lang/yap/patches/patch-ah new file mode 100644 index 000000000000..0cb42b7e8013 --- /dev/null +++ b/lang/yap/patches/patch-ah @@ -0,0 +1,15 @@ +$NetBSD: patch-ah,v 1.1 2010/02/11 20:43:49 asau Exp $ + +--- library/system/sys.c.orig 2008-05-23 17:16:13.000000000 +0400 ++++ library/system/sys.c 2009-04-20 13:00:04.000000000 +0400 +@@ -97,6 +97,10 @@ + #if HAVE_TIME_H + #include + #endif ++#if !HAVE_DAYLIGHT ++time_t _daylight_() { time_t t = time(NULL); return localtime(&t)->tm_gmtoff; } ++#define daylight _daylight_() ++#endif + #if HAVE_SYS_TYPES_H + #include + #endif diff --git a/lang/yap/patches/patch-ai b/lang/yap/patches/patch-ai new file mode 100644 index 000000000000..e75e8c5a26f0 --- /dev/null +++ b/lang/yap/patches/patch-ai @@ -0,0 +1,15 @@ +$NetBSD: patch-ai,v 1.1 2010/02/11 20:43:49 asau Exp $ + +Disable parts to avoid breakage. + +--- Makefile.in.orig 2008-06-04 18:47:18.000000000 +0400 ++++ Makefile.in 2009-12-11 05:30:54.000000000 +0300 +@@ -659,7 +659,7 @@ + @INSTALLCLP@(cd LGPL/clp ; make install) + @INSTALLCLP@(cd GPL/clpqr ; make install) + # (cd CHR ; make install) +- @INSTALLCLP@(cd LGPL/chr ; make install) ++# @INSTALLCLP@(cd LGPL/chr ; make install) + @INSTALLCLP@(cd CLPBN ; make install) + + diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile index d02598c7b698..11fcb9d3404d 100644 --- a/mail/gmime/Makefile +++ b/mail/gmime/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.24 2010/02/05 12:41:44 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2010/02/11 15:44:29 wiz Exp $ # DISTNAME= gmime-2.2.25 +PKGREVISION= 1 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gmime/2.2/} diff --git a/mail/gmime/distinfo b/mail/gmime/distinfo index de54f7362b01..b86033be03f9 100644 --- a/mail/gmime/distinfo +++ b/mail/gmime/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.19 2010/02/05 12:41:44 wiz Exp $ +$NetBSD: distinfo,v 1.20 2010/02/11 15:44:29 wiz Exp $ SHA1 (gmime-2.2.25.tar.gz) = 4087d72ca61af2fd8823cb47de7d6fdfbd3c7168 RMD160 (gmime-2.2.25.tar.gz) = 29f111fc428d55263d53e795e2bcc7cdfd62ca2e Size (gmime-2.2.25.tar.gz) = 1038414 bytes +SHA1 (patch-aa) = ac810bb85a8cfebf2588862a2f8f220bbaa26277 diff --git a/mail/gmime/patches/patch-aa b/mail/gmime/patches/patch-aa new file mode 100644 index 000000000000..dfedbe5f0a3e --- /dev/null +++ b/mail/gmime/patches/patch-aa @@ -0,0 +1,16 @@ +$NetBSD: patch-aa,v 1.6 2010/02/11 15:44:29 wiz Exp $ + +Fix for http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2010-0409 +from Fedora. + +--- gmime/gmime-utils.h.orig 2009-08-12 22:42:55.000000000 +0000 ++++ gmime/gmime-utils.h +@@ -106,7 +106,7 @@ struct _GMimeReferences { + * Returns the number of output bytes needed to uuencode an input + * buffer of size @x. + **/ +-#define GMIME_UUENCODE_LEN(x) ((size_t) (((((x) + 2) / 45) * 62) + 62)) ++#define GMIME_UUENCODE_LEN(x) ((size_t) (((((x) + 2) / 45) * 62) + 64)) + + + /** diff --git a/mail/jchkmail/Makefile b/mail/jchkmail/Makefile index cc125286b96e..4b07c9d7fc1f 100644 --- a/mail/jchkmail/Makefile +++ b/mail/jchkmail/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.12 2009/03/22 04:53:39 manu Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 19:53:03 joerg Exp $ # DISTNAME= jchkmail-1.3.1a -PKGREVISION= 1 +PKGREVISION= 2 CATEGORIES= mail MASTER_SITES= http://j-chkmail.ensmp.fr/download/ @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://j-chkmail.ensmp.fr/ COMMENT= Behavior-based virus and spam milter for Sendmail +PKG_DESTDIR_SUPPORT= user-destdir + USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes @@ -32,6 +34,9 @@ PTHREAD_AUTO_VARS= yes INSTALLATION_DIRS= share/examples/rc.d +OWN_DIRS_PERMS+= /var/spool/jchkmail smmsp smmsp 750 \ + /var/jchkmail smmsp smmsp 755 + .include "../../mail/libmilter/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/mail/jchkmail/distinfo b/mail/jchkmail/distinfo index 503e1c1af929..c4f014e65eab 100644 --- a/mail/jchkmail/distinfo +++ b/mail/jchkmail/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2007/09/04 20:40:43 joerg Exp $ +$NetBSD: distinfo,v 1.6 2010/02/11 19:53:03 joerg Exp $ SHA1 (jchkmail-1.3.1a.tar.gz) = 6cade163151a2c08d42082b971b55a11c33f47c6 RMD160 (jchkmail-1.3.1a.tar.gz) = b707514f3a04d871f32db660be8b975577e1dbf3 @@ -6,4 +6,4 @@ Size (jchkmail-1.3.1a.tar.gz) = 420432 bytes SHA1 (patch-aa) = 19acb161de38b297d000ae4cc9a96106ff7b3a20 SHA1 (patch-ab) = c629836b5dbab9282104a3c2731e379c56c5ea81 SHA1 (patch-ac) = 8be29408b4fb665d3374fb6232b596d028d69e28 -SHA1 (patch-ad) = 2702900d14582a926370b31e88a05e0cbd3d4105 +SHA1 (patch-ad) = 18b8504670010da4d7e75cc3164e74d560d7eba0 diff --git a/mail/jchkmail/patches/patch-ad b/mail/jchkmail/patches/patch-ad index 7a8762200a62..798a4704f554 100644 --- a/mail/jchkmail/patches/patch-ad +++ b/mail/jchkmail/patches/patch-ad @@ -1,13 +1,12 @@ -$NetBSD: patch-ad,v 1.1 2007/09/04 20:40:43 joerg Exp $ +$NetBSD: patch-ad,v 1.2 2010/02/11 19:53:03 joerg Exp $ --- Makefile.in.orig 2003-07-03 11:54:07.000000000 +0000 +++ Makefile.in -@@ -449,8 +449,6 @@ install-data-hook: - chmod 755 @WORKDIR@ - chown @USER@ @WORKDIR@ - chgrp @GROUP@ @WORKDIR@ -- cp bin/jchkmail.init @RCDIR@/@RCSCRIPT@ -- chmod 755 @RCDIR@/@RCSCRIPT@ - # 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. - .NOEXPORT: +@@ -398,7 +398,6 @@ info-am: + + install-data-am: + @$(NORMAL_INSTALL) +- $(MAKE) $(AM_MAKEFLAGS) install-data-hook + + install-exec-am: + diff --git a/mail/smtpfeed/Makefile b/mail/smtpfeed/Makefile index 7d649d024e12..2c42b025adc8 100644 --- a/mail/smtpfeed/Makefile +++ b/mail/smtpfeed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2008/03/17 11:37:41 obache Exp $ +# $NetBSD: Makefile,v 1.33 2010/02/11 19:39:04 joerg Exp $ DISTNAME= smtpfeed-1.18 PKGREVISION= 1 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://member.wide.ad.jp/wg/smtp/smtpfeed.html COMMENT= SMTP Fast Exploding External Deliverer for Sendmail +PKG_DESTDIR_SUPPORT= user-destdir + # sendmail 8.x with WIDE patch works better with it, than stock 8.x. # require sendmail from pkgsrc. #DEPENDS+= sendmail>=8.9.3:../../mail/sendmail @@ -34,11 +36,12 @@ CONFIGURE_ARGS+= --enable-ipv6 .endif INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 share/doc/smtpfeed +INSTALL_MAKE_FLAGS+= libexecdir=${DESTDIR}${PREFIX}/libexec post-install: - ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_MAN} ${WRKSRC}/smtpfeed.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 for i in ${DOCS}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/smtpfeed; \ + ${INSTALL_DATA} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/share/doc/smtpfeed; \ done .include "../../devel/sysexits/buildlink3.mk" diff --git a/math/octave/Makefile b/math/octave/Makefile index 450a5abfd4b2..99c3e6082fdf 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.85 2010/01/17 12:02:26 wiz Exp $ +# $NetBSD: Makefile,v 1.86 2010/02/12 00:41:48 asau Exp $ DISTNAME= octave-${OCTAVE_VER} -PKGREVISION= 2 CATEGORIES= math MASTER_SITES= ftp://ftp.octave.org/pub/octave/ EXTRACT_SUFX= .tar.bz2 @@ -14,7 +13,7 @@ BUILD_DEPENDS+= bison>=1.875:../../devel/bison BUILD_DEPENDS+= gperf>=2.7:../../devel/gperf DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot -OCTAVE_VER= 3.2.3 +OCTAVE_VER= 3.2.4 CONFLICTS+= octave-2.* .if (${MACHINE_ARCH} == "arm32") diff --git a/math/octave/distinfo b/math/octave/distinfo index 31edb0c72a30..cad9271f81cd 100644 --- a/math/octave/distinfo +++ b/math/octave/distinfo @@ -1,13 +1,13 @@ -$NetBSD: distinfo,v 1.25 2009/12/22 17:46:17 drochner Exp $ +$NetBSD: distinfo,v 1.26 2010/02/12 00:41:48 asau Exp $ -SHA1 (octave-3.2.3.tar.bz2) = 7a188ffd55ac1efb2f480fa2aed94e66d3596f34 -RMD160 (octave-3.2.3.tar.bz2) = 30c1892544ba67054f1888758ebc2b1ede8848c0 -Size (octave-3.2.3.tar.bz2) = 12085781 bytes +SHA1 (octave-3.2.4.tar.bz2) = 7de078564027108f3436f3ba7bf5993a6b411a67 +RMD160 (octave-3.2.4.tar.bz2) = 6dcdea7ef2431b8427da5e6b9d2113e0e5736f43 +Size (octave-3.2.4.tar.bz2) = 12080959 bytes SHA1 (patch-ab) = 55983c073f773c8f5aa6147a65f03e0351c6ece4 SHA1 (patch-ac) = fa39afe6f033e0be57ffde20d49b845c0243f91d -SHA1 (patch-ad) = 621496f7a0c57fb6d5157ddb737366747f1e19d2 -SHA1 (patch-af) = f3080fa8afbb3863b6b88832fb3b46fe7005476e -SHA1 (patch-ag) = 0694e61d1a45c242756821ebcbefd37c1f468e9e +SHA1 (patch-ad) = fc1fa488273878595fdef9ee1c2fcf9a4262e9e3 +SHA1 (patch-af) = b6b7c7a2c220997126769163fb1347ed7f5bfcb8 +SHA1 (patch-ag) = c4d6f230a9761cb5d16a8e8c76a34fe1ef68c584 SHA1 (patch-ah) = a2c6e3c6cb4c4570647edb4f484f514d75dda3ba SHA1 (patch-ai) = d7b4841238f7358bea50dd1b1b22cd94ab2af229 SHA1 (patch-ak) = 98aa84ac66fac0b7b0dcdb69e911dc9d42fd6673 diff --git a/math/octave/patches/patch-ad b/math/octave/patches/patch-ad index 494a5f12f794..8a1bb384643e 100644 --- a/math/octave/patches/patch-ad +++ b/math/octave/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.6 2009/07/19 00:33:10 asau Exp $ +$NetBSD: patch-ad,v 1.7 2010/02/12 00:41:48 asau Exp $ --- libcruft/Makefile.in.orig 2009-05-25 10:04:58.000000000 +0400 +++ libcruft/Makefile.in 2009-06-28 21:21:33.000000000 +0400 @@ -9,7 +9,7 @@ $NetBSD: patch-ad,v 1.6 2009/07/19 00:33:10 asau Exp $ - $(AR) $(ARFLAGS) $@ $^ - $(RANLIB) $@ + ${LIBTOOL} --mode=link ${CC} -o libcruft.$(LIBEXT) $(CRUFT_OBJ:.o=.lo) \ -+ -rpath ${PREFIX}/lib -version-info ${version:3.2.%=3:2:%} ++ -rpath ${PREFIX}/lib -version-number ${version:3.2.%=3:2:%} $(SHLPRE)cruft.$(SHLEXT_VER): $(SHLPRE)cruft.$(SHLEXT) rm -f $@ diff --git a/math/octave/patches/patch-af b/math/octave/patches/patch-af index adcd552e5ba9..7a4baddde62f 100644 --- a/math/octave/patches/patch-af +++ b/math/octave/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.6 2009/07/19 00:33:10 asau Exp $ +$NetBSD: patch-af,v 1.7 2010/02/12 00:41:48 asau Exp $ --- liboctave/Makefile.in.orig 2009-05-25 10:04:59.000000000 +0400 +++ liboctave/Makefile.in 2009-06-28 21:21:57.000000000 +0400 @@ -10,7 +10,7 @@ $NetBSD: patch-af,v 1.6 2009/07/19 00:33:10 asau Exp $ - $(RANLIB) $@ + ${LIBTOOL} --mode=link ${CC} -o liboctave.$(LIBEXT) \ + $(LIBOCTAVE_OBJECTS:.o=.lo) -rpath ${PREFIX}/lib \ -+ -version-info ${version:3.2.%=3:2:%} ++ -version-number ${version:3.2.%=3:2:%} $(SHLPRE)octave.$(SHLEXT_VER): $(SHLPRE)octave.$(SHLEXT) rm -f $@ diff --git a/math/octave/patches/patch-ag b/math/octave/patches/patch-ag index 1788dc48758b..edf8255fa202 100644 --- a/math/octave/patches/patch-ag +++ b/math/octave/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.7 2009/12/22 17:46:17 drochner Exp $ +$NetBSD: patch-ag,v 1.8 2010/02/12 00:41:48 asau Exp $ --- src/Makefile.in.orig 2009-06-03 12:32:49.000000000 +0000 +++ src/Makefile.in @@ -19,7 +19,7 @@ $NetBSD: patch-ag,v 1.7 2009/12/22 17:46:17 drochner Exp $ - $(RANLIB) $@ + ${LIBTOOL} --mode=link ${CC} -o liboctinterp.$(LIBEXT) \ + $(OBJECTS:.o=.lo) $(XERBLA:.o=.lo) -rpath ${PREFIX}/lib \ -+ -version-info ${version:3.2.%=3:2:%} $(OCTINTERP_LINK_DEPS) ++ -version-number ${version:3.2.%=3:2:%} $(OCTINTERP_LINK_DEPS) $(SHLPRE)octinterp.$(SHLEXT_VER): $(SHLPRE)octinterp.$(SHLEXT) rm -f $@ diff --git a/mbone/Makefile b/mbone/Makefile index 259592561e1d..a07dca21c1fd 100644 --- a/mbone/Makefile +++ b/mbone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2009/07/07 16:11:32 sborrill Exp $ +# $NetBSD: Makefile,v 1.22 2010/02/11 12:32:39 joerg Exp $ # COMMENT= Multi-cast backBone applications @@ -6,14 +6,14 @@ COMMENT= Multi-cast backBone applications SUBDIR+= beacon SUBDIR+= common-mml SUBDIR+= dbeacon -SUBDIR+= imm +#SUBDIR+= imm SUBDIR+= mdd SUBDIR+= mdp -SUBDIR+= nte +#SUBDIR+= nte SUBDIR+= rat SUBDIR+= rtptools SUBDIR+= sapserver -SUBDIR+= sdr +#SUBDIR+= sdr SUBDIR+= vat SUBDIR+= vic SUBDIR+= vic-devel diff --git a/misc/chord/Makefile b/misc/chord/Makefile index 7433b4defcc9..68991514817c 100644 --- a/misc/chord/Makefile +++ b/misc/chord/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:10 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/11 19:02:01 joerg Exp $ DISTNAME= chord PKGNAME= chord-3.6 @@ -8,7 +8,9 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Produce PS sheet-music from text input -NO_SRC_ON_FTP= Already in MASTER_SITE_LOCAL +PKG_DESTDIR_SUPPORT= user-destdir + +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 CFLAGS+= -DPAPERSIZE=${PAPERSIZE} diff --git a/misc/chord/distinfo b/misc/chord/distinfo index d9e981fc6843..817a98d854a4 100644 --- a/misc/chord/distinfo +++ b/misc/chord/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 11:02:51 agc Exp $ +$NetBSD: distinfo,v 1.6 2010/02/11 19:02:01 joerg Exp $ SHA1 (chord.tar.gz) = 2d93a43ee153f840786d7218cf49b44c85d19388 RMD160 (chord.tar.gz) = a0f01ac2f67f1556e7249848601901a1481fb4a1 Size (chord.tar.gz) = 74809 bytes -SHA1 (patch-aa) = 8625a6cf246d265c305faaffd826e984b30fdbc3 +SHA1 (patch-aa) = 68a43070091b8ecdb51d3e7aafbe10fa053f3018 SHA1 (patch-ab) = d99fade958792cf1b31905d5b685b6cbfd699585 diff --git a/misc/chord/patches/patch-aa b/misc/chord/patches/patch-aa index dddfd50f93e5..5ccc0723bcd0 100644 --- a/misc/chord/patches/patch-aa +++ b/misc/chord/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2003/09/22 12:29:20 wiz Exp $ +$NetBSD: patch-aa,v 1.4 2010/02/11 19:02:01 joerg Exp $ --- Makefile.orig Tue Apr 25 08:04:52 1995 +++ Makefile Mon Sep 22 11:18:10 2003 @@ -18,7 +18,7 @@ $NetBSD: patch-aa,v 1.3 2003/09/22 12:29:20 wiz Exp $ # where to put the man page -MANDIR = /usr/man -MANEXT = l -+MANDIR = ${PREFIX}/man ++MANDIR = ${PREFIX}/${PKGMANDIR} +MANEXT = 1 # You should not have to change anything below this line @@ -35,10 +35,10 @@ $NetBSD: patch-aa,v 1.3 2003/09/22 12:29:20 wiz Exp $ - chmod 666 $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT) - + for prog in $(PROGRAMS); do \ -+ ${BSD_INSTALL_PROGRAM} $$prog $(BINDIR)/$$prog; \ ++ ${BSD_INSTALL_PROGRAM} $$prog ${DESTDIR}$(BINDIR)/$$prog; \ + done -+ ${BSD_INSTALL_MAN} chord.man $(MANDIR)/man$(MANEXT)/chord.$(MANEXT) -+ ${BSD_INSTALL_MAN} a2crd.man $(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT) ++ ${BSD_INSTALL_MAN} chord.man ${DESTDIR}$(MANDIR)/man$(MANEXT)/chord.$(MANEXT) ++ ${BSD_INSTALL_MAN} a2crd.man ${DESTDIR}$(MANDIR)/man$(MANEXT)/a2crd.$(MANEXT) + shar : $(SRC) rm -f $(RELNAME).part* diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile index e03f169ca56e..3e5fd23f9ea7 100644 --- a/misc/dirdiff/Makefile +++ b/misc/dirdiff/Makefile @@ -1,16 +1,20 @@ -# $NetBSD: Makefile,v 1.13 2006/10/08 11:43:06 obache Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/11 19:07:56 joerg Exp $ # DISTNAME= dirdiff-2.1 CATEGORIES= misc tk MASTER_SITES= http://samba.org/ftp/paulus/ -DEPENDS+= tk>=8.3.4:../../x11/tk - MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://samba.org/ftp/paulus/ COMMENT= Displays differences between directories +PKG_DESTDIR_SUPPORT= user-destdir + +INSTALLATION_DIRS+= bin lib + +DEPENDS+= tk>=8.3.4:../../x11/tk + USE_LIBTOOL= yes .include "../../lang/tcl/buildlink3.mk" diff --git a/misc/dotfile/Makefile b/misc/dotfile/Makefile index ad5e08bcf7b0..f403c457e8c3 100644 --- a/misc/dotfile/Makefile +++ b/misc/dotfile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2008/05/26 02:13:22 joerg Exp $ +# $NetBSD: Makefile,v 1.34 2010/02/11 19:14:19 joerg Exp $ DISTNAME= dotfile-2.4.1 PKGREVISION= 2 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.blackie.dk/dotfile/ COMMENT= GUI dotfile generator program to create .config files +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= tk>=8.3.2:../../x11/tk USE_TOOLS+= pax @@ -22,9 +24,10 @@ DOTFILE_LANG?= english GNU_CONFIGURE= yes NO_BUILD= yes -MAKE_FLAGS+= mandir=${PREFIX}/${PKGMANDIR}/man1 INSTALLATION_DIRS= bin share/doc/${PKGNAME_NOREV} +INSTALL_MAKE_FLAGS+= mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 \ + prefix=${DESTDIR}${PREFIX} CHECK_INTERPRETER_SKIP= share/${DISTNAME}/* @@ -32,7 +35,7 @@ pre-install: rm -f ${WRKSRC}/Generator/makeHelp.orig post-install: - cd ${WRKSRC:Q}/Doc && pax -rw . ${PREFIX}/share/doc/${PKGNAME_NOREV} - ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${PREFIX}/share/doc/${PKGNAME_NOREV} + cd ${WRKSRC:Q}/Doc && pax -rw . ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV} + ${CHOWN} -R ${ROOT_USER}:${ROOT_GROUP} ${DESTDIR}${PREFIX}/share/doc/${PKGNAME_NOREV} .include "../../mk/bsd.pkg.mk" diff --git a/misc/dync/Makefile b/misc/dync/Makefile index 97bcfabcb57c..4c58d8152d34 100644 --- a/misc/dync/Makefile +++ b/misc/dync/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2009/05/22 18:16:19 zafer Exp $ +# $NetBSD: Makefile,v 1.17 2010/02/11 19:17:06 joerg Exp $ # DISTNAME= dync-1.1 @@ -10,10 +10,18 @@ MAINTAINER= agc@NetBSD.org HOMEPAGE= http://www.alistaircrooks.co.uk/software.html COMMENT= awk-like utility with C as language +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes BUILD_TARGET= tst USE_TOOLS+= file_cmd CONFIGURE_ENV+= FILE_CMD=${TOOLS_FILE_CMD:Q} CONFIGURE_ENV+= ac_cv_path_LDCONFIG=${TOOLS_LDCONFIG:Q} +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/dync ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/dync.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" diff --git a/misc/elizatalk/Makefile b/misc/elizatalk/Makefile index ac7122645904..5a1708a4dafc 100644 --- a/misc/elizatalk/Makefile +++ b/misc/elizatalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/03/04 21:30:10 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2010/02/11 19:18:55 joerg Exp $ DISTNAME= elizatalk-0.4 PKGREVISION= 1 @@ -9,7 +9,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://elizatalk.sourceforge.net/ COMMENT= Eliza talkback program +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/elizatalk-src USE_TOOLS+= gmake +INSTALLATION_DIRS+= bin + .include "../../mk/bsd.pkg.mk" diff --git a/misc/elizatalk/distinfo b/misc/elizatalk/distinfo index 874092d835b8..a69835291a42 100644 --- a/misc/elizatalk/distinfo +++ b/misc/elizatalk/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 11:02:51 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/02/11 19:18:55 joerg Exp $ SHA1 (elizatalk-0.4.tar.gz) = 8d5d1931fcd3d014b63d27d1c893661941800f84 RMD160 (elizatalk-0.4.tar.gz) = b293b8c200946c24d1c3bd68ab5dc5b6fffc8d3b Size (elizatalk-0.4.tar.gz) = 116369 bytes -SHA1 (patch-aa) = 4c8e1702707636cc3ef516b1a9a26f743d8b5f39 +SHA1 (patch-aa) = 52423155d4b4fdcc2571c69aafcab80cae3d8ab1 SHA1 (patch-ab) = b39c87a6ec89403d14fab195b4e4dd0d48c4e2be diff --git a/misc/elizatalk/patches/patch-aa b/misc/elizatalk/patches/patch-aa index 8b0d1b5f48a7..789306eb4854 100644 --- a/misc/elizatalk/patches/patch-aa +++ b/misc/elizatalk/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2003/03/01 13:02:10 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2010/02/11 19:18:55 joerg Exp $ --- Makefile.orig Mon Oct 23 03:27:20 2000 +++ Makefile @@ -16,8 +16,8 @@ $NetBSD: patch-aa,v 1.1.1.1 2003/03/01 13:02:10 jlam Exp $ +#CXX=gcc # C compiler +#CC=gcc # linker +CFLAGS+=-DELIZADIR=\"${PREFIX}/share/elizatalk\" -+INSTALLDIR=${PREFIX}/bin# installation dir of Elizatalk (be sure there is no space between the dir and the #) -+INSTALLDIRDICT=${PREFIX}/share/elizatalk# installation dir of the dictionaries (be sure there is no space between the dir and the #) ++INSTALLDIR=${DESTDIR}${PREFIX}/bin# installation dir of Elizatalk (be sure there is no space between the dir and the #) ++INSTALLDIRDICT=${DESTDIR}${PREFIX}/share/elizatalk# installation dir of the dictionaries (be sure there is no space between the dir and the #) SOURCES=elizatalk.c \ splotch.c diff --git a/misc/iselect/Makefile b/misc/iselect/Makefile index 46dd4969b864..78c014ad6cad 100644 --- a/misc/iselect/Makefile +++ b/misc/iselect/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2008/01/04 07:12:30 obache Exp $ +# $NetBSD: Makefile,v 1.22 2010/02/11 19:20:55 joerg Exp $ # DISTNAME= iselect-1.2.0 @@ -11,10 +11,18 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ossp.org/pkg/tool/iselect/ COMMENT= Curses based Interactive Selection Tool +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + post-configure: ${TOUCH} ${WRKSRC}/config_ac.h.in +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/iselect ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/iselect.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile index 952b6ea5a5e8..e6d4f4efef35 100644 --- a/misc/kanjipad/Makefile +++ b/misc/kanjipad/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2009/08/26 19:58:01 sno Exp $ +# $NetBSD: Makefile,v 1.21 2010/02/11 19:24:10 joerg Exp $ # DISTNAME= kanjipad-2.0.0 @@ -10,12 +10,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://fishsoup.net/software/kanjipad/ COMMENT= Japanese handwriting recognition +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake perl pkg-config -.include "../../x11/gtk2/buildlink3.mk" +INSTALLATION_DIRS+= share/doc/kanjipad post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/kanjipad - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/kanjipad + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/kanjipad +.include "../../x11/gtk2/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/misc/kchm/Makefile b/misc/kchm/Makefile index b02ecb5b34db..28044dfc2a62 100644 --- a/misc/kchm/Makefile +++ b/misc/kchm/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.15 2010/01/18 09:59:13 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/11 19:29:38 joerg Exp $ # DISTNAME= kchm-0.6.5 -PKGREVISION= 11 +PKGREVISION= 12 CATEGORIES= kde misc MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=kchmnew/} EXTRACT_SUFX= .tar.bz2 @@ -11,6 +11,8 @@ MAINTAINER= ianzag@mail.ru HOMEPAGE= http://kchmnew.sourceforge.net/ COMMENT= KDE CHM file viewer +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES USE_LANGUAGES= c c++ USE_LIBTOOL= YES @@ -18,8 +20,6 @@ USE_TOOLS+= gmake CONFLICTS= chmlib-[0-9]* -BUILDLINK_DEPMETHOD.libXt?= build - .include "../../meta-pkgs/kde3/kde3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../x11/kdelibs3/buildlink3.mk" diff --git a/misc/kp/Makefile b/misc/kp/Makefile index db7252f1c083..f53f826c7e87 100644 --- a/misc/kp/Makefile +++ b/misc/kp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2007/02/22 19:26:49 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2010/02/11 19:30:01 joerg Exp $ DISTNAME= kp-0.96 PKGREVISION= 1 @@ -8,8 +8,13 @@ MASTER_SITES= ftp://stampede.cs.berkeley.edu/pub/kp/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= The Keyboard Practicer, touch-type training program +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= tk>=8.3.2:../../x11/tk +INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ + KPMANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + pre-configure: for f in `${FIND} ${WRKDIR}/. -type f -print \ | ${XARGS} ${GREP} -l '/usr/local'`; do \ diff --git a/misc/lile/Makefile b/misc/lile/Makefile index 2b43963e08d3..c9a9aa54d283 100644 --- a/misc/lile/Makefile +++ b/misc/lile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/03/04 11:30:33 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/02/11 19:37:03 joerg Exp $ DISTNAME= lile-2.0 PKGNAME= ile-2.0 @@ -9,15 +9,23 @@ EXTRACT_SUFX= .tar.z MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Input Line Editor that wraps itself around programs +PKG_DESTDIR_SUPPORT= user-destdir + # uses struct sgttyb NOT_FOR_PLATFORM= Linux-*-* USE_TOOLS+= gzcat +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + post-patch: @(cd ${WRKSRC}; ${SED} "s,/usr/local,${PREFIX}," Makefile \ > Makefile.done; ${MV} Makefile.done Makefile; \ ${ECHO} all: ile >> Makefile; \ ${ECHO} CC=${CC} ${CFLAGS} >> Makefile ) +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/ile ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/ile.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile index af2efd3ede60..bde5455040ab 100644 --- a/misc/nxtvepg/Makefile +++ b/misc/nxtvepg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.53 2007/12/20 13:46:15 obache Exp $ +# $NetBSD: Makefile,v 1.54 2010/02/11 18:58:46 joerg Exp $ DISTNAME= nxtvepg-2.7.6 PKGREVISION= 1 @@ -9,6 +9,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/nxtvepg/ COMMENT= NextView EPG decoder +PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \ @@ -28,6 +29,8 @@ MAKE_ENV+= WANT_THREADS=1 # Required for Tcl/Tk 8.4 LDFLAGS+= ${PTHREAD_LIBS} +INSTALL_MAKE_FLAGS+= ROOT=${DESTDIR} resdir=${DESTDIR}${PREFIX}/lib/X11 + pre-configure: cd ${WRKSRC}; \ ${MV} -f pod2help.pl pod2help.pl.orig; \ diff --git a/misc/nxtvepg/distinfo b/misc/nxtvepg/distinfo index a347c2353688..d7a75bada0e9 100644 --- a/misc/nxtvepg/distinfo +++ b/misc/nxtvepg/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.31 2005/11/20 17:52:43 magick Exp $ +$NetBSD: distinfo,v 1.32 2010/02/11 18:58:46 joerg Exp $ SHA1 (nxtvepg-2.7.6.tar.gz) = 02008ff681377367b4b5a9d7734de9471a69e5de RMD160 (nxtvepg-2.7.6.tar.gz) = cd90477e4cbbed7a3c3ba0c93295a51fbd299922 Size (nxtvepg-2.7.6.tar.gz) = 1430471 bytes -SHA1 (patch-aa) = 00ac7056a66e3a0cc88f3f62a1bef889bbbb029d +SHA1 (patch-aa) = 9fafa7f96d57ec1cfc08c22234ba49572eff4a58 SHA1 (patch-ab) = 634cfd179fd1043e3272ce27836a9052b199d1f4 SHA1 (patch-ac) = 28d5d7a9a31e1a17f8416d271abdefa708b3480b SHA1 (patch-ad) = d1582973184fed6999fb7e79c7bbe12d19b29d9c diff --git a/misc/nxtvepg/patches/patch-aa b/misc/nxtvepg/patches/patch-aa index fc103469b514..0bff748783a2 100644 --- a/misc/nxtvepg/patches/patch-aa +++ b/misc/nxtvepg/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.12 2003/05/17 10:30:58 magick Exp $ +$NetBSD: patch-aa,v 1.13 2010/02/11 18:58:47 joerg Exp $ --- Makefile.orig 2003-03-22 17:01:56.000000000 +0100 +++ Makefile @@ -7,7 +7,7 @@ $NetBSD: patch-aa,v 1.12 2003/05/17 10:30:58 magick Exp $ bindir = $(ROOT)${exec_prefix}/bin mandir = $(ROOT)${prefix}/man/man1 -resdir = $(ROOT)/usr/X11R6/lib/X11 -+resdir = $(LOCALBASE)/lib/X11 ++resdir = $(ROOT)$(PREFIX)/lib/X11 # if you have perl set the path here, else just leave it alone PERL = /usr/bin/perl diff --git a/multimedia/dvdview/Makefile b/multimedia/dvdview/Makefile index ae6ad42a8a2a..956d7fdec01e 100644 --- a/multimedia/dvdview/Makefile +++ b/multimedia/dvdview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2010/01/18 09:59:16 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/02/11 19:55:00 joerg Exp $ DISTNAME= dvdview-1.2.2 PKGREVISION= 6 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/ COMMENT= Software only MPEG-1/2 video decoder +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES USE_LANGUAGES= c c++ USE_TOOLS+= gmake @@ -21,9 +23,10 @@ MAKE_ENV+= RTLIB=-lrt MAKE_ENV+= RTLIB= .endif +INSTALLATION_DIRS+= share/doc/dvdview + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dvdview - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dvdview + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/dvdview .include "../../graphics/libvideogfx/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" diff --git a/multimedia/flashplayer/Makefile b/multimedia/flashplayer/Makefile index 7a538b823a72..18bb1c895b2c 100644 --- a/multimedia/flashplayer/Makefile +++ b/multimedia/flashplayer/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:16 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 20:01:50 joerg Exp $ # +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../multimedia/libflash/Makefile.common" PKGNAME= ${DISTNAME:C/-/player-/} @@ -18,6 +20,8 @@ MAKE_ENV+= LIBSTDCPP=-lstdc++ MAKE_ENV+= LIBSTDCPP= .endif +INSTALLATION_DIRS+= bin + .include "../../multimedia/libflash/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" diff --git a/multimedia/goggles/Makefile b/multimedia/goggles/Makefile index f1c749aca8ca..6970a54bdba9 100644 --- a/multimedia/goggles/Makefile +++ b/multimedia/goggles/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/01/18 09:59:17 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 20:17:18 joerg Exp $ # DISTNAME= goggles-0.9.1 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.fifthplanet.net/goggles.html COMMENT= Easy to use frontend for Ogle DVD Player +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES+= c c++ # c for configure script USE_TOOLS+= gmake bash:run @@ -23,7 +25,9 @@ do-build: --use-config=build/config.generic do-install: - cd ${WRKSRC} && ${MAKE_ENV} ./gb --prefix=${PREFIX} install + cd ${WRKSRC} && ${MAKE_ENV} ./gb --package-root=${DESTDIR}${PREFIX} --prefix=${PREFIX} install + sed "s|@location@|${PREFIX}/bin|" ${WRKSRC}/scripts/goggles.in > ${DESTDIR}${PREFIX}/bin/goggles + .include "../../x11/fox/buildlink3.mk" .include "../../multimedia/ogle/buildlink3.mk" diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile index 3c57b92bf4cd..06dea2f51b9d 100644 --- a/multimedia/libflash/Makefile +++ b/multimedia/libflash/Makefile @@ -1,6 +1,8 @@ -# $NetBSD: Makefile,v 1.8 2010/01/18 09:59:17 wiz Exp $ +# $NetBSD: Makefile,v 1.9 2010/02/11 20:01:50 joerg Exp $ # +PKG_DESTDIR_SUPPORT= user-destdir + .include "Makefile.common" PKGNAME= lib${DISTNAME} @@ -12,6 +14,8 @@ BUILD_DIRS= ${WRKSRC}/Lib MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q} MAKE_ENV+= LIBSTDCPP=-lstdc++ +INSTALLATION_DIRS+= lib + .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/libflash/distinfo b/multimedia/libflash/distinfo index 166b340db33d..6aa565ea6a9d 100644 --- a/multimedia/libflash/distinfo +++ b/multimedia/libflash/distinfo @@ -1,14 +1,14 @@ -$NetBSD: distinfo,v 1.5 2006/06/30 21:57:45 tron Exp $ +$NetBSD: distinfo,v 1.6 2010/02/11 20:01:50 joerg Exp $ SHA1 (flash-0.4.10.tgz) = 41f2b8bba3e551e611913069e6e650bc4c8ab420 RMD160 (flash-0.4.10.tgz) = 17c04bb9fd29ab9b91fbc2954e508aead1ab7fb1 Size (flash-0.4.10.tgz) = 358995 bytes SHA1 (patch-aa) = 0cda07497c07a3a6e4bc13ae099812bab4bc0424 -SHA1 (patch-ab) = 29afb4393acc2c44e622d398dba05749fb5c581d +SHA1 (patch-ab) = 12a90daa82e54fc84c4e2033e09a531615c03e08 SHA1 (patch-ac) = ce803268d7c85e0317c61dbd63c56028eaba82a8 SHA1 (patch-ad) = a67db33d60bc5ce23241e5f445aabb9bdb1864c2 SHA1 (patch-ae) = 51d94184f123596c662f3e3d7de36acb507b303c -SHA1 (patch-af) = 7e6ab6312cf2d6a9e36abde8d5d94d627fcd9231 +SHA1 (patch-af) = 13dfbc92feada48a0062ff15577b625082dbf6e0 SHA1 (patch-ag) = cc6277a63c4bfa54a35b74a1a66dea5923ae8637 SHA1 (patch-ah) = d4406e8e672762b8ec474acf4923ded2301ad5a9 SHA1 (patch-ai) = a4f927b4698e7de7b46f2496b57c83a30a57fecb diff --git a/multimedia/libflash/patches/patch-ab b/multimedia/libflash/patches/patch-ab index 8e0db487d483..2f0518e009d9 100644 --- a/multimedia/libflash/patches/patch-ab +++ b/multimedia/libflash/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ +$NetBSD: patch-ab,v 1.2 2010/02/11 20:01:50 joerg Exp $ --- Lib/Makefile.orig Sun Jun 4 02:49:23 2000 +++ Lib/Makefile @@ -21,10 +21,10 @@ $NetBSD: patch-ab,v 1.1.1.1 2004/01/26 13:34:45 jmmv Exp $ +all: libflash.la + +install: libflash.la -+ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${PREFIX}/lib -+ ${BSD_INSTALL_DATA_DIR} ${PREFIX}/include/flash ++ ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA} libflash.la ${DESTDIR}${PREFIX}/lib ++ ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${PREFIX}/include/flash + for file in ${INCLUDES}; do \ -+ ${BSD_INSTALL_DATA} $$file ${PREFIX}/include/flash; \ ++ ${BSD_INSTALL_DATA} $$file ${DESTDIR}${PREFIX}/include/flash; \ + done + +libflash.la: $(SWFOBJS) diff --git a/multimedia/libflash/patches/patch-af b/multimedia/libflash/patches/patch-af index 2b3a7aa5e054..e369ca91b4ac 100644 --- a/multimedia/libflash/patches/patch-af +++ b/multimedia/libflash/patches/patch-af @@ -1,4 +1,4 @@ -$NetBSD: patch-af,v 1.3 2006/06/30 21:57:45 tron Exp $ +$NetBSD: patch-af,v 1.4 2010/02/11 20:01:50 joerg Exp $ --- Player/Makefile.orig 2000-06-07 19:19:50.000000000 +0100 +++ Player/Makefile 2006-06-30 22:53:51.000000000 +0100 @@ -19,7 +19,7 @@ $NetBSD: patch-af,v 1.3 2006/06/30 21:57:45 tron Exp $ -clean: - rm -f *~ *.o swfplayer core gmon.out +install: swfplayer -+ ${BSD_INSTALL_PROGRAM} swfplayer ${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} swfplayer ${DESTDIR}${PREFIX}/bin +swfplayer: main.o + $(CXX) $(LDFLAGS) -o $@ main.o $(LIBS) diff --git a/multimedia/mpeg-lib/Makefile b/multimedia/mpeg-lib/Makefile index 9eaf4463e484..2ea97713a88b 100644 --- a/multimedia/mpeg-lib/Makefile +++ b/multimedia/mpeg-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/10/04 21:50:09 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/02/11 20:04:28 joerg Exp $ # DISTNAME= mpeg_lib-1.3.1 @@ -13,6 +13,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gerg.ca/software/mpeglib/ COMMENT= Library for decoding MPEG movies +PKG_DESTDIR_SUPPORT= user-destdir + USE_LIBTOOL= YES GNU_CONFIGURE= YES @@ -21,4 +23,10 @@ BUILD_TARGET= libmpeg_lib.la CONFIGURE_ENV+= OPTIMIZE=${CFLAGS:M*:Q} EXTRA_LDFLAGS=${LDFLAGS:M*:Q} \ EXTRA_CPPFLAGS=${CPPFLAGS:M*:Q} +INSTALLATION_DIRS+= include lib + +do-install: + ${INSTALL_DATA} ${WRKSRC}/mpeg.h ${DESTDIR}${PREFIX}/include + libtool --mode=install ${INSTALL_LIB} ${WRKSRC}/libmpeg_lib.la ${DESTDIR}${PREFIX}/lib + .include "../../mk/bsd.pkg.mk" diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile index 11efbbaba17a..a8393b0e2f03 100644 --- a/multimedia/openquicktime/Makefile +++ b/multimedia/openquicktime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2010/01/18 09:59:18 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2010/02/11 20:08:00 joerg Exp $ # DISTNAME= ${PKGNAME_NOREV}-src @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.openquicktime.org/ COMMENT= Portable library for handling QuickTime(TM) media files +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= c c++ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake pkg-config @@ -27,6 +29,9 @@ CONFIGURE_ENV+= my_cv_comment="" USE_TOOLS+= gsed .endif +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} +INSTALLATION_DIRS+= bin lib + pre-configure: ${ECHO} '#!${SH}' > ${BUILDLINK_DIR}/bin/glib-config-2.0 ${ECHO} '${PREFIX}/bin/pkg-config glib-2.0 "$$@"' \ diff --git a/multimedia/xfmedia/Makefile b/multimedia/xfmedia/Makefile index bea2991902f4..9921fb709d31 100644 --- a/multimedia/xfmedia/Makefile +++ b/multimedia/xfmedia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2009/10/07 15:46:47 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2010/02/11 20:20:38 joerg Exp $ # DISTNAME= xfmedia-0.9.2 @@ -12,6 +12,8 @@ MAINTAINER= dhowland@users.sourceforge.net HOMEPAGE= http://spuriousinterrupt.org/projects/xfmedia/ COMMENT= Xfce media player based on xine +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes @@ -24,7 +26,7 @@ CONF_FILES= ${PREFIX}/share/xfmedia/keybindings.rc \ post-install: ${INSTALL} ${WRKSRC}/src/keybindings.rc \ - ${PREFIX}/share/xfmedia/keybindings.rc + ${DESTDIR}${PREFIX}/share/xfmedia/keybindings.rc BUILDLINK_DEPMETHOD.libXt?= build diff --git a/net/IglooFTP/Makefile b/net/IglooFTP/Makefile index 72e5f133d247..71e88d2c4ea2 100644 --- a/net/IglooFTP/Makefile +++ b/net/IglooFTP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2007/12/02 11:25:23 wiz Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/11 20:22:22 joerg Exp $ DISTNAME= IglooFTP-0.6.1 PKGREVISION= 5 @@ -10,6 +10,8 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www.littleigloo.org/iglooftp.php3 COMMENT= Easy to use FTP client for X Window System +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_DIRS= src post-extract: @@ -25,6 +27,8 @@ LDFLAGS.resolv= -lresolv MAKE_ENV+= LDFLAGS.resolv=${LDFLAGS.resolv:Q} +INSTALLATION_DIRS+= bin + .include "../../x11/gtk/buildlink3.mk" .include "../../x11/libXmu/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/IglooFTP/distinfo b/net/IglooFTP/distinfo index 3b6ce1384475..04187e4ac5c2 100644 --- a/net/IglooFTP/distinfo +++ b/net/IglooFTP/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.10 2008/06/20 11:22:17 joerg Exp $ +$NetBSD: distinfo,v 1.11 2010/02/11 20:22:22 joerg Exp $ SHA1 (IglooFTP-0.6.1.src.tar.gz) = ab56bc6c15dc81525b8e987ae5fc15e562f92eed RMD160 (IglooFTP-0.6.1.src.tar.gz) = 7f0971ec857542d96a09dffc9db8a3544df38fae Size (IglooFTP-0.6.1.src.tar.gz) = 300553 bytes -SHA1 (patch-aa) = f65166073a34bd8bc65ea49f44b338ffa83ee072 +SHA1 (patch-aa) = 7e9bfe486aa70a58354efa0570ba67fa55bf8618 SHA1 (patch-ab) = 95acf4685cf1da0ce04afc86f92ce201b24324e5 SHA1 (patch-ac) = 4ab6aaf9e8bd4765a3d64a83ce6b84e661433749 SHA1 (patch-ad) = 9e2fbcc3ece0782d32b8bf661dd81e513822852e diff --git a/net/IglooFTP/patches/patch-aa b/net/IglooFTP/patches/patch-aa index 55f1a9636c69..464c822ed67a 100644 --- a/net/IglooFTP/patches/patch-aa +++ b/net/IglooFTP/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2007/02/20 12:45:06 joerg Exp $ +$NetBSD: patch-aa,v 1.5 2010/02/11 20:22:22 joerg Exp $ --- src/Makefile.orig 1999-04-15 16:05:15.000000000 +0000 +++ src/Makefile -@@ -1,14 +1,13 @@ +@@ -1,21 +1,21 @@ SHELL=/bin/sh -CC = gcc -C_FLAGS = -Wall -g -O2 -m486 -fno-strength-reduce @@ -16,11 +16,13 @@ $NetBSD: patch-aa,v 1.4 2007/02/20 12:45:06 joerg Exp $ VERSION = 0.6.1 VERSION_DATE = 1999 -DESTDIR = /usr/local -+DESTDIR = $(PREFIX) - BIN_PATH = $(DESTDIR)/bin - MAN_PATH = $(DESTDIR)/man - SHARE_PATH = $(DESTDIR)/share/$(PROGNAME) -@@ -16,6 +15,8 @@ RPM_RELEASE = 1 +-BIN_PATH = $(DESTDIR)/bin +-MAN_PATH = $(DESTDIR)/man +-SHARE_PATH = $(DESTDIR)/share/$(PROGNAME) ++BIN_PATH = $(DESTDIR)${PREFIX}/bin ++MAN_PATH = $(DESTDIR)${PREFIX}/${PKGMANDIR} ++SHARE_PATH = $(DESTDIR)${PREFIX}/share/$(PROGNAME) + RPM_RELEASE = 1 RPM_BUILDPATH = /usr/src/redhat CODE_LINES = `cat *.c *.h | grep -ch -e "[[:alpha:]|[:punct:]]"` @@ -29,7 +31,7 @@ $NetBSD: patch-aa,v 1.4 2007/02/20 12:45:06 joerg Exp $ $(PROGNAME): main.o GTKmisc.o menu.o toolbar.o connectbar.o statusbar.o\ dirlist.o ftplist.o queue.o log.o console.o dialog.o chmod.o\ version.o custom.o string.o pixmaps.o color.o cursor.o\ -@@ -30,34 +31,34 @@ $(PROGNAME): main.o GTKmisc.o menu.o too +@@ -30,34 +30,34 @@ $(PROGNAME): main.o GTKmisc.o menu.o too install : @if ! test -e $(SHARE_PATH); then \ diff --git a/net/Makefile b/net/Makefile index 317f11e90dad..5bf6c8c6c2e6 100644 --- a/net/Makefile +++ b/net/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.800 2010/02/10 18:02:50 joerg Exp $ +# $NetBSD: Makefile,v 1.803 2010/02/11 19:20:48 joerg Exp $ # COMMENT= Networking tools @@ -391,6 +391,7 @@ SUBDIR+= partysip SUBDIR+= pchar SUBDIR+= pconsole SUBDIR+= pear-Net_DIME +SUBDIR+= pear-Net_LDAP2 SUBDIR+= pear-Net_SMTP SUBDIR+= pear-Net_Sieve SUBDIR+= pear-Net_Socket diff --git a/net/airportbasestationconfig/Makefile b/net/airportbasestationconfig/Makefile index 1ae7dbab111b..9a0b54e23bb0 100644 --- a/net/airportbasestationconfig/Makefile +++ b/net/airportbasestationconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2008/05/25 14:45:17 tron Exp $ +# $NetBSD: Makefile,v 1.36 2010/02/12 02:01:57 joerg Exp $ DISTNAME= configurator_152-128 PKGNAME= ${BINNAME}-1.5.2 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ COMMENT= Configuration program for Apple's Airport Base Station +PKG_DESTDIR_SUPPORT= user-destdir + PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-* @@ -23,7 +25,7 @@ LIBDIR= ${PREFIX}/lib/${BINNAME} USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 sun-jdk15 blackdown-jdk13 jdk14 -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin ${DOCDIR} ${LIBDIR} post-extract: ${CHMOD} -R g-w,o-w ${WRKSRC}/* @@ -38,15 +40,14 @@ do-build: ${ECHO} "exec java -jar ${LIBDIR}/${JARNAME}" >>${WRKSRC}/${BINNAME} do-install: - ${INSTALL_DATA_DIR} ${DOCDIR} ${LIBDIR} cd ${WRKSRC} && \ - ${INSTALL_SCRIPT} ${BINNAME} ${PREFIX}/bin && \ - ${INSTALL_DATA} ${JARNAME} ${LIBDIR} && \ - ${INSTALL_DATA} AUTHORS ${DOCDIR} && \ - ${INSTALL_DATA} COPYING ${DOCDIR} && \ + ${INSTALL_SCRIPT} ${BINNAME} ${DESTDIR}${PREFIX}/bin && \ + ${INSTALL_DATA} ${JARNAME} ${DESTDIR}${LIBDIR} && \ + ${INSTALL_DATA} AUTHORS ${DESTDIR}${DOCDIR} && \ + ${INSTALL_DATA} COPYING ${DESTDIR}${DOCDIR} && \ cd helpdocs && \ - ${INSTALL_DATA} ReadMe.txt ${DOCDIR}/README && \ - ${INSTALL_DATA} mainscreen.jpg manual.html ${DOCDIR} + ${INSTALL_DATA} ReadMe.txt ${DESTDIR}${DOCDIR}/README && \ + ${INSTALL_DATA} mainscreen.jpg manual.html ${DESTDIR}${DOCDIR} .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/airportmodemutility/Makefile b/net/airportmodemutility/Makefile index 159aa7d192d1..a570059ba0d9 100644 --- a/net/airportmodemutility/Makefile +++ b/net/airportmodemutility/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:16 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 20:22:28 joerg Exp $ DISTNAME= ${BINNAME}_20 PKGNAME= ${BINNAME}-2.0 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://edge.mcs.drexel.edu/GICL/people/sevy/airport/ COMMENT= Modem (dis)connection utility for Apple's Airport Base Station +PKG_DESTDIR_SUPPORT= user-destdir + PLIST_SUBST+= BINNAME=${BINNAME:Q} JARNAME=${JARNAME:Q} ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-powerpc Darwin-*-* @@ -25,7 +27,7 @@ LIBDIR= ${PREFIX}/lib/${BINNAME} USE_JAVA= run PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 blackdown-jdk13 jdk14 -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin ${DOCDIR} ${LIBDIR} post-extract: ${CHMOD} -R g-w,o-w ${WRKSRC}/* @@ -39,13 +41,12 @@ do-build: ${ECHO} "exec java ${JVM_OPTS} ${LIBDIR}/${JARNAME}" >>${WRKSRC}/${BINNAME} do-install: - ${INSTALL_DATA_DIR} ${DOCDIR} ${LIBDIR} cd ${WRKSRC} && \ - ${INSTALL_SCRIPT} ${BINNAME} ${PREFIX}/bin && \ - ${INSTALL_DATA} ${JARNAME} ${LIBDIR} && \ - ${INSTALL_DATA} AUTHORS ${DOCDIR} && \ - ${INSTALL_DATA} COPYING ${DOCDIR} && \ - ${INSTALL_DATA} README ${DOCDIR} + ${INSTALL_SCRIPT} ${BINNAME} ${DESTDIR}${PREFIX}/bin && \ + ${INSTALL_DATA} ${JARNAME} ${DESTDIR}${LIBDIR} && \ + ${INSTALL_DATA} AUTHORS ${DESTDIR}${DOCDIR} && \ + ${INSTALL_DATA} COPYING ${DESTDIR}${DOCDIR} && \ + ${INSTALL_DATA} README ${DESTDIR}${DOCDIR} .include "../../mk/java-vm.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/bounce/Makefile b/net/bounce/Makefile index f9b8952c6819..0d72c597eae0 100644 --- a/net/bounce/Makefile +++ b/net/bounce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2009/03/22 04:53:39 manu Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 20:25:12 joerg Exp $ # DISTNAME= bounce-0.0 @@ -8,6 +8,8 @@ MASTER_SITES= ${MASTER_SITE_LOCAL} MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Tool to forward TCP connection from one IP to another +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS+= majordomo-* WRKSRC= ${WRKDIR}/bounce @@ -16,7 +18,10 @@ CONFIGURE_ARGS+= --prefix=${PREFIX:Q} BUILD_TARGET= bounce -post-install: - strip ${PREFIX}/bin/bounce +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/bounce ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/bounce.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/net/cia/Makefile b/net/cia/Makefile index 20ae8050df30..66e1249732fe 100644 --- a/net/cia/Makefile +++ b/net/cia/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2008/05/25 20:49:39 tron Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 20:27:45 joerg Exp $ DISTNAME= cia-20030922 CATEGORIES= net @@ -8,15 +8,18 @@ EXTRACT_SUFX= .tar.bz2 OWNER= tron@NetBSD.org COMMENT= Simple IP accounting software +PKG_DESTDIR_SUPPORT= user-destdir + DOC_DIR= ${PREFIX}/share/doc/cia EXAMPLES_DIR= ${PREFIX}/share/examples/cia -MAKE_ENV+= ${BSD_MAKE_ENV} + +USE_BSD_MAKEFILE= yes + +INSTALLATION_DIRS+= bin ${DOC_DIR} ${EXAMPLES_DIR} post-install: - ${INSTALL_DATA_DIR} ${DOC_DIR} - ${INSTALL_DATA} ${WRKSRC}/doc/README ${DOC_DIR} - ${INSTALL_DATA_DIR} ${EXAMPLES_DIR} - ${INSTALL_DATA} ${WRKSRC}/ipstat/examples/*.cfg ${EXAMPLES_DIR} + ${INSTALL_DATA} ${WRKSRC}/doc/README ${DESTDIR}${DOC_DIR} + ${INSTALL_DATA} ${WRKSRC}/ipstat/examples/*.cfg ${DESTDIR}${EXAMPLES_DIR} .include "../../net/libpcap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/cidr/Makefile b/net/cidr/Makefile index e8d05455be36..cdf3ed85805f 100644 --- a/net/cidr/Makefile +++ b/net/cidr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/10/04 21:53:16 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 20:32:49 joerg Exp $ # DISTNAME= cidr-current @@ -10,9 +10,13 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= # http://home.netcom.com/~naym/cidr.html COMMENT= RFC 1878 subnet calculator / helper +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/cidr-2.3 LIBS.SunOS+= -lnsl -lsocket MAKE_ENV+= LIBS=${LIBS:M*:Q} +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" diff --git a/net/dcsharp/Makefile b/net/dcsharp/Makefile index 6ef160dbe2ac..55dc54abbf28 100644 --- a/net/dcsharp/Makefile +++ b/net/dcsharp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2010/01/18 09:59:19 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 20:41:53 joerg Exp $ DISTNAME= dcsharp-0.11.1 PKGREVISION= 8 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://code.google.com/p/dcsharp/ COMMENT= File sharing client for the Direct Connect protocol +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= pkg-config msgfmt USE_LANGUAGES= c++ NO_CONFIGURE= yes @@ -17,11 +19,13 @@ NO_CONFIGURE= yes BUILD_DEPENDS+= scons>=0.96.1:../../devel/scons DEPENDS+= notification-daemon>=0.3.7:../../sysutils/notification-daemon +INSTALLATION_DIRS+= bin lib share + do-build: cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${PREFIX} do-install: - cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${PREFIX} install + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons PREFIX=${DESTDIR}${PREFIX} install .include "../../lang/mono/buildlink3.mk" .include "../../x11/gtk-sharp/buildlink3.mk" diff --git a/net/driftnet/Makefile b/net/driftnet/Makefile index 069bdb4108b0..45db532bf5b2 100644 --- a/net/driftnet/Makefile +++ b/net/driftnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2010/01/18 09:59:19 wiz Exp $ +# $NetBSD: Makefile,v 1.25 2010/02/11 20:47:11 joerg Exp $ # DISTNAME= driftnet-0.1.6 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ex-parrot.com/~chris/driftnet/ COMMENT= Real-time image sniffer +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= mpg123-[0-9]*:../../audio/mpg123 MAKE_JOBS_SAFE= no @@ -21,8 +23,8 @@ USE_TOOLS+= makedepend INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_PROGRAM} ${WRKSRC}/driftnet ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/driftnet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../graphics/libungif/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/net/dtcp/Makefile b/net/dtcp/Makefile index 7ab9c5f3e4cf..a72a5cc46536 100644 --- a/net/dtcp/Makefile +++ b/net/dtcp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2007/06/18 22:45:42 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2010/02/11 20:47:16 joerg Exp $ # DISTNAME= dtcp-20060109 @@ -10,11 +10,14 @@ MAINTAINER= hamajima@NetBSD.org HOMEPAGE= http://www.imasy.or.jp/~ume/dtcp/ COMMENT= Dynamic Tunnel Configuration Protocol daemon and client +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= qpopper-[0-9]*:../../mail/qpopper RCD_SCRIPTS= dtcpc dtcps -INSTALLATION_DIRS= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 +INSTALLATION_DIRS= ${PKGMANDIR}/cat8 ${PKGMANDIR}/man8 sbin +INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} MAKE_ENV+= ${BSD_MAKE_ENV} diff --git a/net/dtcp/distinfo b/net/dtcp/distinfo index ca66e4401186..fc7e89b21e96 100644 --- a/net/dtcp/distinfo +++ b/net/dtcp/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2006/07/09 13:21:02 taca Exp $ +$NetBSD: distinfo,v 1.10 2010/02/11 20:47:16 joerg Exp $ SHA1 (dtcp-20060109.tar.gz) = 925380777a0cdd313ef8d57a93483c604bea959a RMD160 (dtcp-20060109.tar.gz) = b14d5985c558c615aa169a5dda778339c52fb713 Size (dtcp-20060109.tar.gz) = 22679 bytes -SHA1 (patch-aa) = f3b992203dcb97db0c285f7b240068b847d841a1 +SHA1 (patch-aa) = ba0b93954c8ac79fe7096788377f218ebabbdbaf diff --git a/net/dtcp/patches/patch-aa b/net/dtcp/patches/patch-aa index 45cc92fe001a..a02a9152d789 100644 --- a/net/dtcp/patches/patch-aa +++ b/net/dtcp/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2006/02/01 17:20:05 reed Exp $ +$NetBSD: patch-aa,v 1.7 2010/02/11 20:47:16 joerg Exp $ --- Makefile.orig 2006-01-24 11:51:58.000000000 -0800 +++ Makefile 2006-01-24 11:52:30.000000000 -0800 @@ -7,10 +7,10 @@ $NetBSD: patch-aa,v 1.6 2006/02/01 17:20:05 reed Exp $ .if (${OPSYS} == "NetBSD") -MANDIR= $(PREFIX)/man -+MANDIR?= $(PREFIX)/man ++MANDIR?= $(PREFIX)/${PKGMANDIR} .else -MANDIR= $(PREFIX)/man/man -+MANDIR?= $(PREFIX)/man/man ++MANDIR?= $(PREFIX)/${PKGMANDIR} .endif MAN= dtcps.8 dtcpc.8 dtcpauth.8 diff --git a/net/dynipclient/Makefile b/net/dynipclient/Makefile index c34e984917bd..2b03481d49ff 100644 --- a/net/dynipclient/Makefile +++ b/net/dynipclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:02 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2010/02/11 20:50:59 joerg Exp $ # DISTNAME= dynip_3.00 @@ -12,22 +12,23 @@ HOMEPAGE= http://www.dynip.com/ COMMENT= Client for the dynip.com dynamic DNS service +PKG_DESTDIR_SUPPORT= user-destdir + RCD_SCRIPTS= dynipclient EGDIR= ${PREFIX}/share/examples/dynipclient CONF_FILES= ${EGDIR}/dynip.cfg ${PKG_SYSCONFDIR}/dynip.cfg -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${EGDIR} do-build: cd ${WRKSRC} && ./Configure freebsd ${PREFIX}/bin ${PKG_SYSCONFDIR} \ ${PREFIX}/man do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/dynipadmin ${PREFIX}/bin/ - ${INSTALL_PROGRAM} ${WRKSRC}/dynipclient ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/*.1 ${PREFIX}/${PKGMANDIR}/man1/ - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/dynip.cfg ${EGDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/dynipadmin ${DESTDIR}${PREFIX}/bin/ + ${INSTALL_PROGRAM} ${WRKSRC}/dynipclient ${DESTDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_DATA} ${WRKSRC}/dynip.cfg ${DESTDIR}${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/net/edonkey2k/Makefile b/net/edonkey2k/Makefile index 2444560cbd62..fb283a160b3d 100644 --- a/net/edonkey2k/Makefile +++ b/net/edonkey2k/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2009/10/18 20:28:52 zafer Exp $ +# $NetBSD: Makefile,v 1.18 2010/02/11 20:52:00 joerg Exp $ # DISTNAME= donkey @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.edonkey2000.com/ COMMENT= Yet another P2P file sharing tool +PKG_DESTDIR_SUPPORT= user-destdir + EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= base compat @@ -21,6 +23,6 @@ BUILD_DIRS= # empty INSTALLATION_DIRS= bin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${DESTDIR}${PREFIX}/bin .include "../../mk/bsd.pkg.mk" diff --git a/net/entropy/Makefile b/net/entropy/Makefile index eeea23d9d1e6..5d24d7369a8b 100644 --- a/net/entropy/Makefile +++ b/net/entropy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2007/03/19 16:40:28 tv Exp $ +# $NetBSD: Makefile,v 1.27 2010/02/11 20:53:53 joerg Exp $ # DISTNAME= entropy_rsa-${ENTROPY_VERSION} @@ -13,6 +13,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://entropy.stop1984.com/ COMMENT= Anonymous peer-to-peer networking node (similar to Freenet) +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_TOOLS+= autoconf gmake @@ -21,24 +23,21 @@ ENTROPY_VERSION= 0.9.1-439 CONFIGURE_ARGS+= --enable-setproctitle --enable-verbose --disable-posix-sem LIBS+= -L${BUILDLINK_PREFIX.zlib}/lib -lz -L${BUILDLINK_PREFIX.expat}/lib -lexpat -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin share/doc/entropy share/examples/entropy/de \ + share/examples/entropy/node post-patch: ${SED} -e '/^# /!s/^#//' <${WRKSRC}/seed.txt-dist >${WRKSRC}/seed.txt do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/entropy_rsa ${PREFIX}/bin/entropy - ${INSTALL_PROGRAM} ${WRKSRC}/monoopt ${PREFIX}/bin/entropy-monoopt - ${INSTALL_PROGRAM} ${WRKSRC}/storechg ${PREFIX}/bin/entropy-storechg - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/entropy - ${INSTALL_DATA} ${WRKSRC}/[ERT]* ${PREFIX}/share/doc/entropy/ - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/entropy - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/entropy/de - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/entropy/node - ${INSTALL_DATA} ${WRKSRC}/entropy_rsa.conf-dist ${PREFIX}/share/examples/entropy/entropy.conf - ${INSTALL_DATA} ${WRKSRC}/seed.txt ${PREFIX}/share/examples/entropy/ - ${INSTALL_DATA} ${WRKSRC}/de/entropy_rsa.lo ${PREFIX}/share/examples/entropy/de/entropy.lo - ${INSTALL_DATA} ${WRKSRC}/node/[0-9a-z]* ${PREFIX}/share/examples/entropy/node/ + ${INSTALL_PROGRAM} ${WRKSRC}/entropy_rsa ${DESTDIR}${PREFIX}/bin/entropy + ${INSTALL_PROGRAM} ${WRKSRC}/monoopt ${DESTDIR}${PREFIX}/bin/entropy-monoopt + ${INSTALL_PROGRAM} ${WRKSRC}/storechg ${DESTDIR}${PREFIX}/bin/entropy-storechg + ${INSTALL_DATA} ${WRKSRC}/[ERT]* ${DESTDIR}${PREFIX}/share/doc/entropy/ + ${INSTALL_DATA} ${WRKSRC}/entropy_rsa.conf-dist ${DESTDIR}${PREFIX}/share/examples/entropy/entropy.conf + ${INSTALL_DATA} ${WRKSRC}/seed.txt ${DESTDIR}${PREFIX}/share/examples/entropy/ + ${INSTALL_DATA} ${WRKSRC}/de/entropy_rsa.lo ${DESTDIR}${PREFIX}/share/examples/entropy/de/entropy.lo + ${INSTALL_DATA} ${WRKSRC}/node/[0-9a-z]* ${DESTDIR}${PREFIX}/share/examples/entropy/node/ .include "../../mk/bsd.prefs.mk" diff --git a/net/fair-identd/Makefile b/net/fair-identd/Makefile index 78230beebaec..65a14b66d1a5 100644 --- a/net/fair-identd/Makefile +++ b/net/fair-identd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:25 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2010/02/11 20:53:21 joerg Exp $ # DISTNAME= identd @@ -11,6 +11,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.clock.org/~fair/opinion/identd.html COMMENT= Fast RFC-1413 identd running under inetd that returns no useful info +PKG_DESTDIR_SUPPORT= user-destdir + INSTALLATION_DIRS= libexec do-extract: @@ -22,6 +24,6 @@ do-build: ${CC} ${CFLAGS} -o ${DISTNAME} ${DISTNAME}${EXTRACT_SUFX} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${PREFIX}/libexec + ${INSTALL_PROGRAM} ${WRKSRC}/${DISTNAME} ${DESTDIR}${PREFIX}/libexec .include "../../mk/bsd.pkg.mk" diff --git a/net/fpdns/Makefile b/net/fpdns/Makefile index 1406bd0fcf23..d575f7975086 100644 --- a/net/fpdns/Makefile +++ b/net/fpdns/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/09/08 12:03:07 wiz Exp $ +# $NetBSD: Makefile,v 1.2 2010/02/11 20:53:48 joerg Exp $ # DISTNAME= fpdns-0.9.1 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.rfc.se/fpdns/ COMMENT= Fingerprinting DNS servers +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= p5-Net-DNS-[0-9]*:../../net/p5-Net-DNS WRKSRC= ${WRKDIR} @@ -21,7 +23,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 do-build: do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/fpdns.pl ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/fpdns.1 ${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/fpdns.pl ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/fpdns.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/net/freenet-tools/Makefile b/net/freenet-tools/Makefile index 8b9e49a314f0..ed726f6067fa 100644 --- a/net/freenet-tools/Makefile +++ b/net/freenet-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/03/19 16:40:28 tv Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 20:54:51 joerg Exp $ # DISTNAME= ft-0.2.25 @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://entropy.stop1984.com/ COMMENT= Freenet Tools, freesite manipulation tools for Freenet and Entropy +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q} @@ -20,10 +22,10 @@ CFLAGS+= -DFT_BIN=\"${PREFIX}/bin\" -D_DEBUG INSTALLATION_DIRS= bin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ft ${PREFIX}/bin/ft + ${INSTALL_PROGRAM} ${WRKSRC}/ft ${DESTDIR}${PREFIX}/bin/ft .for f in fcpbroadcast fcpchk fcpget fcpgetsite fcphello fcpinv fcpkey \ fcpput fcpputsite fcpreceive - ${LN} -s -f ft ${PREFIX}/bin/${f} + ${LN} -s -f ft ${DESTDIR}${PREFIX}/bin/${f} .endfor .include "../../mk/bsd.pkg.mk" diff --git a/net/ftpproxy/Makefile b/net/ftpproxy/Makefile index 85224f3c57f6..92e20d4103bb 100644 --- a/net/ftpproxy/Makefile +++ b/net/ftpproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:02 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2010/02/11 21:03:54 joerg Exp $ # DISTNAME= ftpproxy-${VERSION} @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ftpproxy.org/ COMMENT= Application level gateway for FTP +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_DIRS= src VERSION= 1.2.3 @@ -25,7 +27,7 @@ MAKE_ENV+= OSFLAG=${OSFLAG:Q} OSLIB=${LIBS:M*:Q} VERSION=${VERSION:Q} INSTALLATION_DIRS= libexec ${PKGMANDIR}/man8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ftp.proxy ${PREFIX:Q}/libexec/ - ${INSTALL_MAN} ${WRKSRC:Q}/doc/ftp.proxy.1 ${PREFIX:Q}/man/man8/ftp.proxy.8 + ${INSTALL_PROGRAM} ${WRKSRC:Q}/src/ftp.proxy ${DESTDIR}${PREFIX}/libexec/ + ${INSTALL_MAN} ${WRKSRC:Q}/doc/ftp.proxy.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ftp.proxy.8 .include "../../mk/bsd.pkg.mk" diff --git a/net/gnet1/Makefile b/net/gnet1/Makefile index d1c266a50daa..979ef04f4489 100644 --- a/net/gnet1/Makefile +++ b/net/gnet1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:19 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2010/02/11 21:22:17 joerg Exp $ # DISTNAME= gnet-1.1.8 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.gnetlibrary.org/ COMMENT= Simple network library (older version) +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= gnet<=1.1.8 USE_TOOLS+= pkg-config diff --git a/net/gnet1/distinfo b/net/gnet1/distinfo index 552c83f107e8..53d11c6bec6c 100644 --- a/net/gnet1/distinfo +++ b/net/gnet1/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2005/02/24 12:13:48 agc Exp $ +$NetBSD: distinfo,v 1.3 2010/02/11 21:22:17 joerg Exp $ SHA1 (gnet-1.1.8.tar.gz) = f0c01075f911859f807a5a49a2165eded26c2ad5 RMD160 (gnet-1.1.8.tar.gz) = a967693f6cbfa6dab7f0c98bb56a7c2e8049cee9 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = e874ed0fd4ee827f2c96746bb33f34182f3f6968 SHA1 (patch-ac) = 7f1545f76d28c92e37953bd5e1e0f743f3b4800f SHA1 (patch-ad) = f6bfaafafeaf12b49b18b2f4525310ee32db9726 SHA1 (patch-ae) = 5135cf8ed04bb6ed7441fff03c513039b675be5d +SHA1 (patch-af) = f7b4ac31662b5030f698c9a9fd7c123265d4ab1f diff --git a/net/gnet1/patches/patch-af b/net/gnet1/patches/patch-af new file mode 100644 index 000000000000..bf75dcb73526 --- /dev/null +++ b/net/gnet1/patches/patch-af @@ -0,0 +1,17 @@ +$NetBSD: patch-af,v 1.1 2010/02/11 21:22:17 joerg Exp $ + +--- doc/Makefile.in.orig 2003-01-06 21:19:57.000000000 +0000 ++++ doc/Makefile.in +@@ -289,9 +289,9 @@ install-data-local: + -@INSTALL@ -m 0644 $(srcdir)/html/*.html $(DESTDIR)$(TARGET_DIR) + -@INSTALL@ -m 0644 $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR) + -(cd $(DESTDIR); gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR)) +- -mv $(HTML_DIR)/$(DOC_MODULE)/* $(HTML_DIR) +- -rm -rf $(HTML_DIR)/$(DOC_MODULE) +- -(cd $(HTML_DIR); ln -s book1.html index.html) ++ -mv ${DESTDIR}$(HTML_DIR)/$(DOC_MODULE)/* ${DESTDIR}$(HTML_DIR) ++ -rm -rf ${DESTDIR}$(HTML_DIR)/$(DOC_MODULE) ++ -(cd ${DESTDIR}$(HTML_DIR); ln -s book1.html index.html) + + dist-hook: + (cd $(srcdir) ; tar cvf - html/*.html html/*.sgml) | (cd $(distdir); tar xf -) diff --git a/net/gt-itm/Makefile b/net/gt-itm/Makefile index 892aecf72e9c..7708d7604587 100644 --- a/net/gt-itm/Makefile +++ b/net/gt-itm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2006/05/05 23:14:43 minskim Exp $ +# $NetBSD: Makefile,v 1.2 2010/02/11 21:24:26 joerg Exp $ DISTNAME= gt-itm PKGNAME= gt-itm-0pre19961004 @@ -9,6 +9,8 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www-static.cc.gatech.edu/projects/gtitm/ COMMENT= GT Internetwork Topology Models +PKG_DESTDIR_SUPPORT= user-destdir + USE_LIBTOOL= yes WRKSRC= ${WRKDIR}/src @@ -17,7 +19,7 @@ INSTALLATION_DIRS+= bin share/doc/gt-itm .include "../../devel/sgb/buildlink3.mk" do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/bin/* ${PREFIX}/bin - ${INSTALL_DATA} ${WRKDIR}/docs/* ${PREFIX}/share/doc/gt-itm + ${INSTALL_PROGRAM} ${WRKDIR}/bin/* ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKDIR}/docs/* ${DESTDIR}${PREFIX}/share/doc/gt-itm .include "../../mk/bsd.pkg.mk" diff --git a/net/gtk_wicontrol/Makefile b/net/gtk_wicontrol/Makefile index ab208e217c72..0e8abc767b70 100644 --- a/net/gtk_wicontrol/Makefile +++ b/net/gtk_wicontrol/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2007/01/08 16:16:38 joerg Exp $ +# $NetBSD: Makefile,v 1.23 2010/02/11 21:30:54 joerg Exp $ DISTNAME= gtk_wicontrol-0.17 PKGREVISION= 4 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.izawa.org/software/gtk_wicontrol/ COMMENT= GTK+-based Wavelan status meter +PKG_DESTDIR_SUPPORT= user-destdir + ONLY_FOR_PLATFORM= *BSD-*-* DragonFly-*-* USE_PKGLOCALEDIR= yes diff --git a/net/gtk_wicontrol/distinfo b/net/gtk_wicontrol/distinfo index 32a92b70eeab..6aff2613bb48 100644 --- a/net/gtk_wicontrol/distinfo +++ b/net/gtk_wicontrol/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.9 2006/03/22 22:03:46 joerg Exp $ +$NetBSD: distinfo,v 1.10 2010/02/11 21:30:54 joerg Exp $ SHA1 (gtk_wicontrol-0.17.tar.gz) = be477075dcc82b6a549d1d6b8f4bb6ef7be2bfc5 RMD160 (gtk_wicontrol-0.17.tar.gz) = b2b36c9b7810c28fea48e505d48768b125500a42 @@ -8,3 +8,4 @@ SHA1 (patch-ab) = 57fa282111a8d0f65aeda5336830f17db49d96cf SHA1 (patch-ac) = 740009f59c72526511c2b8b5f330dafa36593a36 SHA1 (patch-ad) = 1f3e7780f83efd666cef444c0d2c3c8b5383e9eb SHA1 (patch-ae) = 7975912eefe0c015f6737388866ca017b3724799 +SHA1 (patch-af) = 9fd14fbb5ab19e27c2a19d0be3ea2c899c0397d1 diff --git a/net/gtk_wicontrol/patches/patch-af b/net/gtk_wicontrol/patches/patch-af new file mode 100644 index 000000000000..039116e93604 --- /dev/null +++ b/net/gtk_wicontrol/patches/patch-af @@ -0,0 +1,25 @@ +$NetBSD: patch-af,v 1.3 2010/02/11 21:30:54 joerg Exp $ + +--- po/Makefile.in.in.orig 2010-02-11 21:25:50.000000000 +0000 ++++ po/Makefile.in.in +@@ -111,16 +111,16 @@ install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ +- *.gmo) destdir=$(gnulocaledir);; \ +- *) destdir=$(localedir);; \ ++ *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \ ++ *) destdir=${DESTDIR}$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ diff --git a/net/hf6to4/Makefile b/net/hf6to4/Makefile index 974fd2d9ad9d..4dc7ea2555a8 100644 --- a/net/hf6to4/Makefile +++ b/net/hf6to4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2009/04/09 00:48:10 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2010/02/11 21:28:14 joerg Exp $ # DISTNAME= hf6to4-1.3 @@ -11,6 +11,8 @@ MAINTAINER= hubertf@NetBSD.org HOMEPAGE= ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/net/hf6to4/files/hf6to4.html COMMENT= Enables 6to4 IPv6 automatic tunnels +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR} NOT_FOR_PLATFORM+= Interix-*-* # no IPv6 support or ifconfig command @@ -37,9 +39,9 @@ post-extract: ${CP} ${FILESDIR}/hf6to4 ${WRKSRC}/hf6to4 do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/hf6to4 ${PREFIX}/sbin/hf6to4 - ${INSTALL_MAN} ${FILESDIR}/hf6to4.8 ${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_DATA} ${FILESDIR}/hf6to4.html ${PREFIX}/share/doc/hf6to4/hf6to4.html - ${INSTALL_DATA} ${FILESDIR}/hf6to4.conf ${PREFIX}/share/examples/hf6to4 + ${INSTALL_SCRIPT} ${WRKSRC}/hf6to4 ${DESTDIR}${PREFIX}/sbin/hf6to4 + ${INSTALL_MAN} ${FILESDIR}/hf6to4.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_DATA} ${FILESDIR}/hf6to4.html ${DESTDIR}${PREFIX}/share/doc/hf6to4/hf6to4.html + ${INSTALL_DATA} ${FILESDIR}/hf6to4.conf ${DESTDIR}${PREFIX}/share/examples/hf6to4 .include "../../mk/bsd.pkg.mk" diff --git a/net/ipcheck/Makefile b/net/ipcheck/Makefile index 7cae958fdc5c..bc311bc6201a 100644 --- a/net/ipcheck/Makefile +++ b/net/ipcheck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2010/02/10 19:17:43 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2010/02/11 21:33:29 joerg Exp $ # DISTNAME= ipcheck.233 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://ipcheck.sourceforge.net/ COMMENT= Python client for the dyndns service +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR} DIST_SUBDIR= ${PKGNAME_NOREV} EXTRACT_SUFX= #none @@ -21,7 +23,7 @@ PYTHON_PATCH_SCRIPTS= ipcheck.py INSTALLATION_DIRS= bin do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/ipcheck.py ${PREFIX}/bin + ${INSTALL_SCRIPT} ${WRKSRC}/ipcheck.py ${DESTDIR}${PREFIX}/bin .include "../../lang/python/application.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/iperf/Makefile b/net/iperf/Makefile index 03e03c16041e..f39102bec9c5 100644 --- a/net/iperf/Makefile +++ b/net/iperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2009/05/21 11:37:58 zafer Exp $ +# $NetBSD: Makefile,v 1.17 2010/02/11 21:34:34 joerg Exp $ DISTNAME= iperf-2.0.2 CATEGORIES= net @@ -8,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://dast.nlanr.net/Projects/Iperf/ COMMENT= TCP and UDP bandwidth performance measurement tool +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" .if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) @@ -27,7 +29,7 @@ PTHREAD_OPTS+= native optional post-install: for f in ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.gif; do \ - ${INSTALL_DATA} $$f ${PREFIX}/share/doc/html/${PKGBASE}; \ + ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/share/doc/html/${PKGBASE}; \ done .include "../../mk/bsd.pkg.mk" diff --git a/net/iplog/Makefile b/net/iplog/Makefile index da9d9737028d..cfb21350c9de 100644 --- a/net/iplog/Makefile +++ b/net/iplog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/02/05 23:10:25 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/11 21:36:18 joerg Exp $ # DISTNAME= iplog-2.2.3 @@ -10,6 +10,8 @@ MAINTAINER= gremlin@portal-to-web.de HOMEPAGE= http://ojnk.sourceforge.net/ COMMENT= Iplog is a tool using pcap to log IP traffic +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gmake GNU_CONFIGURE= YES @@ -17,13 +19,14 @@ RCD_SCRIPTS= iplog EGDIR= ${PREFIX}/share/examples/iplog +INSTALLATION_DIRS+= ${EGDIR} + post-patch: cd ${WRKSRC}/src && ${SED} s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g \ < iplog.h > iplog.h.patched && ${MV} iplog.h.patched iplog.h post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${EGDIR}/iplog.conf + ${INSTALL_DATA} ${WRKSRC}/example-iplog.conf ${DESTDIR}${EGDIR}/iplog.conf .include "../../net/libpcap/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile index 9bf00ec3d206..a96889c26539 100644 --- a/net/ipv6calc/Makefile +++ b/net/ipv6calc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2009/01/12 22:25:23 hubertf Exp $ +# $NetBSD: Makefile,v 1.35 2010/02/11 21:38:06 joerg Exp $ # DISTNAME= ipv6calc-0.72.1 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.deepspace6.net/projects/ipv6calc.html COMMENT= Manipulates IPv6 addresses +PKG_DESTDIR_SUPPORT= user-destdir + # This package does not set or evaluate IPV6_READY, but it should still # be listed in README-IPv6.html. Leave this comment here to make it so! # diff --git a/net/isc-dhcp/Makefile.common b/net/isc-dhcp/Makefile.common deleted file mode 100644 index d50a054c89c4..000000000000 --- a/net/isc-dhcp/Makefile.common +++ /dev/null @@ -1,56 +0,0 @@ -# $NetBSD: Makefile.common,v 1.5 2009/07/16 18:29:49 adrianp Exp $ -# -# used by net/isc-dhcp/Makefile -# used by net/isc-dhcpd/Makefile -# used by net/isc-dhclient/Makefile -# used by net/isc-dhcrelay/Makefile - -DISTNAME= dhcp-3.1.2p1 -PKGNAME= ${DISTNAME:S/dhcp/isc-dhcp-${COMPONENT}/} -CATEGORIES= net -MASTER_SITES= http://ftp.isc.org/isc/dhcp/ \ - http://ftp.isc.org/isc/dhcp/dhcp-3.0-history/ - -MAINTAINER= adrianp@NetBSD.org -HOMEPAGE= http://www.isc.org/sw/dhcp/ - -CONFLICTS+= isc-dhcp-base-4.*{,nb*} - -.include "../../mk/bsd.prefs.mk" - -HAS_CONFIGURE= yes -DHCP_HOME?= ${VARBASE}/db/isc-dhcp -DHCP_SYSLOG_LEVEL?= 1 -PKG_SYSCONFSUBDIR= dhcp -USE_TOOLS+= nroff - -FILESDIR= ${.CURDIR}/../isc-dhcp/files -PATCHDIR= ${.CURDIR}/../isc-dhcp/patches -EGDIR= ${PREFIX}/share/examples/isc-dhcp-${COMPONENT} -BUILD_DEFS+= VARBASE DHCP_HOME DHCP_SYSLOG_LEVEL - -SUBST_CLASSES+= conf -SUBST_STAGE.conf= pre-configure -SUBST_MESSAGE.conf= Fixing configuration files. -SUBST_FILES.conf= includes/site.h site.conf -SUBST_SED.conf= -e 's|@@DHCP_SYSLOG_LEVEL@@|${DHCP_SYSLOG_LEVEL}|g' -SUBST_SED.conf+= -e 's|@@VARBASE@@|${VARBASE}|g' -SUBST_SED.conf+= -e 's|@@SYSCONFDIR@@|${PKG_SYSCONFDIR}|g' -SUBST_SED.conf+= -e 's|@@PREFIX@@|${PREFIX}|g' -SUBST_SED.conf+= -e 's|@@CC@@|${CC:Q}|g' -SUBST_SED.conf+= -e 's|@@CFLAGS@@|${CFLAGS:Q}|g' -SUBST_SED.conf+= -e 's|@@PKGMANDIR@@|${PKGMANDIR}|g' - -post-extract: - ${CAT} ${FILESDIR}/site.h >> ${WRKSRC}/includes/site.h - ${CAT} ${FILESDIR}/site.conf >> ${WRKSRC}/site.conf - -do-install: -. for d in ${SUBDIR} - cd ${WRKSRC}/work.`${WRKSRC}/configure --print-sysname`/${d} \ - && ${SETENV} ${MAKE_ENV} ${MAKE} install -. endfor - -. for m in ${MAN_FILES} - ${CHMOD} ${MANMODE} ${PREFIX}/${PKGMANDIR}/${m} -. endfor diff --git a/net/isc-dhcp/buildlink3.mk b/net/isc-dhcp/buildlink3.mk deleted file mode 100644 index d5680e30c18d..000000000000 --- a/net/isc-dhcp/buildlink3.mk +++ /dev/null @@ -1,12 +0,0 @@ -# $NetBSD: buildlink3.mk,v 1.4 2009/03/20 19:25:08 joerg Exp $ - -BUILDLINK_TREE+= isc-dhcp-base - -.if !defined(ISC_DHCP_BASE_BUILDLINK3_MK) -ISC_DHCP_BASE_BUILDLINK3_MK:= - -BUILDLINK_API_DEPENDS.isc-dhcp-base+= isc-dhcp-base>=3.1.0<4 -BUILDLINK_PKGSRCDIR.isc-dhcp-base?= ../../net/isc-dhcp -.endif # ISC_DHCP_BASE_BUILDLINK3_MK - -BUILDLINK_TREE+= -isc-dhcp-base diff --git a/net/isc-dhcp/files/isc_dhclient.sh b/net/isc-dhcp/files/isc_dhclient.sh deleted file mode 100755 index f9c1d6c779c2..000000000000 --- a/net/isc-dhcp/files/isc_dhclient.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: isc_dhclient.sh,v 1.3 2008/01/03 12:25:01 adrianp Exp $ -# - -# PROVIDE: dhclient -# REQUIRE: network mountcritlocal -# BEFORE: NETWORKING -# -# Note that there no syslog logging of dhclient messages at boot because -# dhclient needs to start before services that syslog depends upon do. -# - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -name="dhclient" -rcvar="isc_${name}" -command="@PREFIX@/sbin/${name}" -pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid" -start_precmd="isc_dhclient_precmd" - -isc_dhclient_precmd() -{ - if [ ! -d @VARBASE@/run/isc-dhcp ]; then - @MKDIR@ @VARBASE@/run/isc-dhcp - @CHMOD@ 0770 @VARBASE@/run/isc-dhcp - fi -} - -load_rc_config $rcvar -run_rc_command "$1" diff --git a/net/isc-dhcp/files/isc_dhcpd.sh b/net/isc-dhcp/files/isc_dhcpd.sh deleted file mode 100755 index 83eb33cdec39..000000000000 --- a/net/isc-dhcp/files/isc_dhcpd.sh +++ /dev/null @@ -1,36 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: isc_dhcpd.sh,v 1.2 2007/12/30 12:30:52 adrianp Exp $ -# - -# PROVIDE: dhcpd -# REQUIRE: DAEMON -# BEFORE: LOGIN - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -name="dhcpd" -rcvar="isc_${name}" -command="@PREFIX@/sbin/${name}" -pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid" -required_files="@PKG_SYSCONFDIR@/${name}.conf" -start_precmd="isc_dhcpd_precmd" - -isc_dhcpd_precmd() -{ - if [ ! -d @VARBASE@/run/isc-dhcp ]; then - @MKDIR@ @VARBASE@/run/isc-dhcp - @CHMOD@ 0770 @VARBASE@/run/isc-dhcp - fi - - if [ ! -f @DHCP_HOME@/dhcpd.leases ]; then - @MKDIR@ @DHCP_HOME@ - @TOUCH@ @DHCP_HOME@/dhcpd.leases - @CHMOD@ 0640 @DHCP_HOME@/dhcpd.leases - fi -} - -load_rc_config $rcvar -run_rc_command "$1" diff --git a/net/isc-dhcp/files/isc_dhcrelay.sh b/net/isc-dhcp/files/isc_dhcrelay.sh deleted file mode 100755 index 8bd8372b45b1..000000000000 --- a/net/isc-dhcp/files/isc_dhcrelay.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!@RCD_SCRIPTS_SHELL@ -# -# $NetBSD: isc_dhcrelay.sh,v 1.3 2008/01/03 12:25:01 adrianp Exp $ -# - -# PROVIDE: dhcrelay -# REQUIRE: DAEMON -# BEFORE: NETWORKING -# -# Note that there no syslog logging of dhclient messages at boot because -# dhclient needs to start before services that syslog depends upon do. -# - -if [ -f /etc/rc.subr ]; then - . /etc/rc.subr -fi - -name="dhcrelay" -rcvar="isc_${name}" -command="@PREFIX@/sbin/${name}" -pidfile="@VARBASE@/run/isc-dhcp/isc-${name}.pid" -start_precmd="isc_dhcrelay_precmd" - -isc_dhcrelay_precmd() -{ - if [ ! -d @VARBASE@/run/isc-dhcp ]; then - @MKDIR@ @VARBASE@/run/isc-dhcp - @CHMOD@ 0770 @VARBASE@/run/isc-dhcp - fi -} - -load_rc_config $rcvar -run_rc_command "$1" diff --git a/net/isc-dhcp/files/site.conf b/net/isc-dhcp/files/site.conf deleted file mode 100644 index 26fd78756e11..000000000000 --- a/net/isc-dhcp/files/site.conf +++ /dev/null @@ -1,25 +0,0 @@ -CC = @@CC@@ -CC_OPTIONS = @@CFLAGS@@ -USERBINDIR = @@PREFIX@@/bin -BINDIR = @@PREFIX@@/sbin -CLIENTBINDIR = @@PREFIX@@/sbin -ADMMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man8 -FFMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man5 -LIBMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man3 -USRMANDIR = @@PREFIX@@/@@PKGMANDIR@@/man1 -ADMMANEXT = .8 -FFMANEXT = .5 -LIBMANEXT = .3 -USRMANEXT = .1 -MANCAT = man -#ADMMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat8 -#FFMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat5 -#LIBMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat3 -#USRMANDIR = @@PREFIX@@/@@PKGMANDIR@@/cat1 -ETC = @@SYSCONFDIR@@ -VARRUN = @@VARBASE@@/run/isc-dhcp -VARDB = @@VARBASE@@/db/isc-dhcp -LIBDIR = @@PREFIX@@/lib -INCDIR = @@PREFIX@@/include -CLIENT_PATH = '"PATH=@@PREFIX@@/bin:@@PREFIX@@/sbin:/usr/ucb:/usr/bin:/usr/sbin:/bin:/sbin"' -DEBUG = diff --git a/net/isc-dhcp/files/site.h b/net/isc-dhcp/files/site.h deleted file mode 100644 index aee45aec0d23..000000000000 --- a/net/isc-dhcp/files/site.h +++ /dev/null @@ -1,8 +0,0 @@ -#define _PATH_DHCPD_CONF "@@SYSCONFDIR@@/dhcpd.conf" -#define _PATH_DHCPD_PID "@@VARBASE@@/run/isc-dhcp/isc-dhcpd.pid" -#define _PATH_DHCPD_DB "@@VARBASE@@/db/isc-dhcp/dhcpd.leases" -#define _PATH_DHCLIENT_PID "@@VARBASE@@/run/isc-dhcp/isc-dhclient.pid" -#define _PATH_DHCLIENT_DB "@@VARBASE@@/db/isc-dhcp/dhclient.leases" -#define _PATH_DHCLIENT_SCRIPT "@@PREFIX@@/sbin/dhclient-script" -#define _PATH_DHCRELAY_PID "@@VARBASE@@/run/isc-dhcp/isc-dhcrelay.pid" -#define DHCPD_LOG_FACILITY LOG_LOCAL@@DHCP_SYSLOG_LEVEL@@ diff --git a/net/isc-dhcp/patches/patch-aa b/net/isc-dhcp/patches/patch-aa deleted file mode 100644 index 70cda2857183..000000000000 --- a/net/isc-dhcp/patches/patch-aa +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-aa,v 1.1 2009/08/18 19:19:59 hasso Exp $ - ---- includes/osdep.h.orig 2009-08-08 14:12:41 +0300 -+++ includes/osdep.h 2009-08-08 14:13:18 +0300 -@@ -89,7 +89,7 @@ - # include "cf/netbsd.h" - #endif - --#ifdef __FreeBSD__ -+#if defined(__FreeBSD__) || defined(__DragonFly__) - # include "cf/freebsd.h" - #endif - diff --git a/net/isc-dhcp/patches/patch-ab b/net/isc-dhcp/patches/patch-ab deleted file mode 100644 index a87ec5e1aff5..000000000000 --- a/net/isc-dhcp/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.2 2009/08/18 19:19:59 hasso Exp $ - ---- configure.orig 2005-03-17 22:14:55 +0200 -+++ configure 2009-08-08 14:06:41 +0300 -@@ -139,6 +139,8 @@ if [ "$sysname" = "" ]; then - sysname=openbsd;; - FreeBSD) - sysname=freebsd;; -+ DragonFly) -+ sysname=freebsd;; - hpux) - IFS=":" - for foo in $PATH; do -@@ -259,7 +261,7 @@ for foo in $dirs; do - ${workname}/$bar/Makefile - done diff --git a/net/isc-dhcp/patches/patch-ad b/net/isc-dhcp/patches/patch-ad deleted file mode 100644 index 649e1f3c16b3..000000000000 --- a/net/isc-dhcp/patches/patch-ad +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-ad,v 1.1.1.1 2007/12/12 20:02:08 adrianp Exp $ - ---- /dev/null 2007-11-18 12:32:58.000000000 +0000 -+++ includes/omapip/trace_mr.h 2007-11-18 12:35:30.000000000 +0000 -@@ -0,0 +1,13 @@ -+ssize_t trace_mr_send (int, const void *, size_t, int); -+ssize_t trace_mr_read_playback (struct sockaddr_in *, void *, size_t); -+void trace_mr_read_record (struct sockaddr_in *, void *, ssize_t); -+ssize_t trace_mr_recvfrom (int s, void *, size_t, int, -+ struct sockaddr *, SOCKLEN_T *); -+ssize_t trace_mr_read (int, void *, size_t); -+int trace_mr_connect (int s, struct sockaddr *, SOCKLEN_T); -+int trace_mr_socket (int, int, int); -+int trace_mr_bind (int, struct sockaddr *, SOCKLEN_T); -+int trace_mr_close (int); -+time_t trace_mr_time (time_t *); -+int trace_mr_select (int, fd_set *, fd_set *, fd_set *, struct timeval *); -+unsigned int trace_mr_res_randomid (unsigned int); diff --git a/net/ishell/Makefile b/net/ishell/Makefile index 9de8deb01498..ac36d0897858 100644 --- a/net/ishell/Makefile +++ b/net/ishell/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/02/05 23:10:25 joerg Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 21:43:39 joerg Exp $ # DISTNAME= ish-v${VERSION} @@ -12,6 +12,8 @@ MAINTAINER= pancake@phreaker.net HOMEPAGE= http://icmpshell.sourceforge.net/ COMMENT= Allow remote shell using ICMP +PKG_DESTDIR_SUPPORT= user-destdir + VERSION= 0.2 PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/net/ishell/distinfo b/net/ishell/distinfo index c581f11b9d67..7f096c49a8a6 100644 --- a/net/ishell/distinfo +++ b/net/ishell/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:13:50 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/02/11 21:43:39 joerg Exp $ SHA1 (ish-v0.2.tar.gz) = 2d5d16cdd8c097220ee885bedbefb7f41115e6b2 RMD160 (ish-v0.2.tar.gz) = 8582e044914f1d68ee7c2257d3be8cb8e8db2999 Size (ish-v0.2.tar.gz) = 6531 bytes -SHA1 (patch-aa) = 5a2a8782188874431a7ab03ea09aa60c266d2669 +SHA1 (patch-aa) = 2a14a33a1ca7dfdc6e736cf10b88f667b264b8b1 diff --git a/net/ishell/patches/patch-aa b/net/ishell/patches/patch-aa index b09f0b874330..e73285e8d414 100644 --- a/net/ishell/patches/patch-aa +++ b/net/ishell/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2004/04/12 00:09:06 minskim Exp $ +$NetBSD: patch-aa,v 1.3 2010/02/11 21:43:39 joerg Exp $ --- Makefile.orig 2002-01-31 11:35:52.000000000 -0600 +++ Makefile @@ -53,7 +53,7 @@ $NetBSD: patch-aa,v 1.2 2004/04/12 00:09:06 minskim Exp $ - $(STRIP) ish - $(STRIP) ishd +install: -+ ${BSD_INSTALL_PROGRAM} ./ish ${PREFIX}/bin/ishell -+ ${BSD_INSTALL_PROGRAM} ./ishd ${PREFIX}/sbin/ishelld ++ ${BSD_INSTALL_PROGRAM} ./ish ${DESTDIR}${PREFIX}/bin/ishell ++ ${BSD_INSTALL_PROGRAM} ./ishd ${DESTDIR}${PREFIX}/sbin/ishelld +.PHONY: all clean install diff --git a/net/jumpgate/Makefile b/net/jumpgate/Makefile index 5508678a1ef3..4a0910598912 100644 --- a/net/jumpgate/Makefile +++ b/net/jumpgate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2006/03/04 21:30:19 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2010/02/11 21:47:04 joerg Exp $ # DISTNAME= jumpgate-0.7 @@ -9,6 +9,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= ${MASTER_SITES} COMMENT= TCP connection forwarder with capture and syslog support +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/jumpgate ${DESTDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/jumpgate.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + .include "../../mk/bsd.pkg.mk" diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index 5d1df05cbfde..48600e94aa0d 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.62 2009/05/19 08:59:27 wiz Exp $ +# $NetBSD: Makefile,v 1.63 2010/02/11 21:53:00 joerg Exp $ # DISTNAME= jwhois-4.0 @@ -10,6 +10,8 @@ HOMEPAGE= http://www.gnu.org/software/jwhois/ COMMENT= Configurable WHOIS client LICENSE= gnu-gpl-v3 +PKG_DESTDIR_SUPPORT= user-destdir + USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} @@ -27,10 +29,11 @@ INFO_FILES= YES .include "../../devel/gettext-lib/buildlink3.mk" CONFIGURE_ARGS+= --with-libintl-prefix=${BUILDLINK_PREFIX.gettext} +INSTALLATION_DIRS+= ${EGDIR} + post-install: - ${INSTALL_DATA_DIR} ${EGDIR} ${INSTALL_DATA} ${WRKSRC}/example/jwhois.conf \ - ${EGDIR}/jwhois.conf.default + ${DESTDIR}${EGDIR}/jwhois.conf.default .include "../../devel/libidn/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/kismet/Makefile b/net/kismet/Makefile index 1c590f927169..f05ccd1dda07 100644 --- a/net/kismet/Makefile +++ b/net/kismet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2010/01/24 13:26:12 wiz Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/11 21:58:29 joerg Exp $ DISTNAME= kismet-2008-05-R1 PKGNAME= kismet-2008.05.01 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.kismetwireless.net/ COMMENT= 802.11 wireless network detector, sniffer and IDS +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= c c++ USE_NCURSES= yes # needs libpanel USE_TOOLS+= gmake perl:run @@ -50,16 +52,17 @@ SUBST_STAGE.user= pre-configure SUBST_FILES.user= conf/kismet.conf.in SUBST_SED.user= -e 's/your_user_here/${KISMET_USER}/' +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR} + post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/conf/ap_manuf ${EGDIR}/ - ${INSTALL_DATA} ${WRKSRC}/conf/client_manuf ${EGDIR}/ + ${INSTALL_DATA} ${WRKSRC}/conf/ap_manuf ${DESTDIR}${EGDIR}/ + ${INSTALL_DATA} ${WRKSRC}/conf/client_manuf ${DESTDIR}${EGDIR}/ ${INSTALL_DATA} ${WRKSRC}/conf/kismet.conf \ - ${EGDIR}/kismet.conf.default + ${DESTDIR}${EGDIR}/kismet.conf.default ${INSTALL_DATA} ${WRKSRC}/conf/kismet_drone.conf \ - ${EGDIR}/kismet_drone.conf.default + ${DESTDIR}${EGDIR}/kismet_drone.conf.default ${INSTALL_DATA} ${WRKSRC}/conf/kismet_ui.conf \ - ${EGDIR}/kismet_ui.conf.default + ${DESTDIR}${EGDIR}/kismet_ui.conf.default .include "options.mk" diff --git a/net/lambdamoo-core/Makefile b/net/lambdamoo-core/Makefile index 93061af8211f..9e34d5163cab 100644 --- a/net/lambdamoo-core/Makefile +++ b/net/lambdamoo-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/04 21:53:16 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2010/02/11 21:58:38 joerg Exp $ DISTNAME= LambdaCore-12Apr99.db PKGNAME= lambdamoo-core-990412 @@ -11,14 +11,17 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/lambdamoo/ COMMENT= Generic core classes for lambdamoo +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= gunzip WRKSRC= ${WRKDIR} -do-build: +NO_BUILD= yes + +INSTALLATION_DIRS+= share/lambdamoo do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/lambdamoo - ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${PREFIX}/share/lambdamoo + ${INSTALL_DATA} ${WRKSRC}/${DISTNAME} ${DESTDIR}${PREFIX}/share/lambdamoo .include "../../mk/bsd.pkg.mk" diff --git a/net/lambdamoo-doc/Makefile b/net/lambdamoo-doc/Makefile index 087638afbf1d..706dfb02e7a5 100644 --- a/net/lambdamoo-doc/Makefile +++ b/net/lambdamoo-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2006/10/04 21:53:17 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2010/02/11 21:59:11 joerg Exp $ DISTNAME= lambdamoo-doc-1.8.0p6 CATEGORIES= net @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/lambdamoo/ COMMENT= Documentation for lambdamoo +PKG_DESTDIR_SUPPORT= user-destdir + EXTRACT_ONLY= ProgrammersManual.texinfo WRKSRC= ${WRKDIR} @@ -21,13 +23,14 @@ do-build: ${WRKSRC}/ProgrammersManual.texinfo \ >${WRKSRC}/ProgrammersManual.txt +INSTALLATION_DIRS+= share/doc/lambdamoo + do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lambdamoo ${INSTALL_DATA} ${DISTDIR}/HelpSystem-02Jun93.txt \ - ${PREFIX}/share/doc/lambdamoo + ${DESTDIR}${PREFIX}/share/doc/lambdamoo ${INSTALL_DATA} ${WRKSRC}/ProgrammersManual.texinfo \ - ${PREFIX}/share/doc/lambdamoo + ${DESTDIR}${PREFIX}/share/doc/lambdamoo ${INSTALL_DATA} ${WRKSRC}/ProgrammersManual.txt \ - ${PREFIX}/share/doc/lambdamoo + ${DESTDIR}${PREFIX}/share/doc/lambdamoo .include "../../mk/bsd.pkg.mk" diff --git a/net/lambdamoo/Makefile b/net/lambdamoo/Makefile index 7b1769d19380..f799daf7da0c 100644 --- a/net/lambdamoo/Makefile +++ b/net/lambdamoo/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.22 2007/12/02 12:14:53 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2010/02/11 21:57:09 joerg Exp $ DISTNAME= LambdaMOO-1.8.1 PKGNAME= lambdamoo-1.8.1 +PKGREVISION= 1 CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=lambdamoo/} @@ -9,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/lambdamoo/ COMMENT= The definitive MOO software +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= lambdamoo-core>=990412:../../net/lambdamoo-core DEPENDS+= lambdamoo-doc>=1.8.0p6:../../net/lambdamoo-doc @@ -25,13 +28,15 @@ PKG_SHELL.${LAMBDAMOO_USER}= ${SH} PKG_GROUPS_VARS+= LAMBDAMOO_GROUP PKG_USERS_VARS+= LAMBDAMOO_USER +OWN_DIRS_PERMS+= ${LAMBDAMOO_HOME} ${LAMBDAMOO_USER} ${LAMBDAMOO_GROUP} 700 + FILES_SUBST+= LAMBDAMOO_HOME=${LAMBDAMOO_HOME:Q} WRKSRC= ${WRKDIR}/MOO-1.8.1 BUILD_TARGET= GNU_CONFIGURE= yes USE_TOOLS+= yacc -INSTALLATION_DIRS= sbin +INSTALLATION_DIRS= sbin share/lambdamoo share/doc/lambdamoo pre-build: ${MV} ${WRKSRC}/restart.sh ${WRKSRC}/restart.sh.in @@ -39,18 +44,12 @@ pre-build: "s|__PREFIX__|${PREFIX}|g" do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/moo ${PREFIX}/sbin - ${INSTALL_DATA_DIR} ${PREFIX}/share/lambdamoo - ${INSTALL_SCRIPT} ${WRKSRC}/restart.sh ${PREFIX}/share/lambdamoo - ${INSTALL_DATA} ${WRKSRC}/Minimal.db ${PREFIX}/share/lambdamoo - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/lambdamoo + ${INSTALL_PROGRAM} ${WRKSRC}/moo ${DESTDIR}${PREFIX}/sbin + ${INSTALL_SCRIPT} ${WRKSRC}/restart.sh ${DESTDIR}${PREFIX}/share/lambdamoo + ${INSTALL_DATA} ${WRKSRC}/Minimal.db ${DESTDIR}${PREFIX}/share/lambdamoo ${INSTALL_DATA} \ ${WRKSRC}/README \ ${WRKSRC}/README.Minimal \ - ${PREFIX}/share/doc/lambdamoo/ - -post-install: - ${CHOWN} -R ${LAMBDAMOO_USER}:${LAMBDAMOO_GROUP} ${LAMBDAMOO_HOME} - ${CHMOD} u+w ${LAMBDAMOO_HOME} + ${DESTDIR}${PREFIX}/share/doc/lambdamoo/ .include "../../mk/bsd.pkg.mk" diff --git a/net/latd/Makefile b/net/latd/Makefile index 7eef0e8e06bf..51633b22b637 100644 --- a/net/latd/Makefile +++ b/net/latd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/02/22 19:26:53 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/11 22:04:14 joerg Exp $ # DISTNAME= latd-1.18 @@ -9,6 +9,8 @@ MAINTAINER= fredette@theory.lcs.mit.edu HOMEPAGE= http://theory.lcs.mit.edu/~fredette/latd/index.html COMMENT= The linux-decnet project's LAT protocol suite +PKG_DESTDIR_SUPPORT= user-destdir + NOT_FOR_PLATFORM= Interix-*-* # no direct ethernet support GNU_CONFIGURE= yes diff --git a/net/latd/distinfo b/net/latd/distinfo index db60be7ee2aa..6e1859852157 100644 --- a/net/latd/distinfo +++ b/net/latd/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.5 2007/01/27 10:33:25 wiz Exp $ +$NetBSD: distinfo,v 1.6 2010/02/11 22:04:14 joerg Exp $ SHA1 (latd-1.18.tar.gz) = a7cecdb97507f485e726ea4c2fef0a59ad3adbae RMD160 (latd-1.18.tar.gz) = a0be3bd71b76c6a07c47fc2ad863526303d365bf Size (latd-1.18.tar.gz) = 233882 bytes SHA1 (patch-aa) = 70e2a543f471c9a818bfbe138137920d605d5aa9 SHA1 (patch-ab) = 8729c74907ac9ea077e9ddf1131cc4af6ecedcc7 -SHA1 (patch-ac) = adbe7b78bce30b6fbf540a18922ddb073cfccf0c +SHA1 (patch-ac) = c078151ba47ef878937e9cf818a3d0ad6dd3be7b SHA1 (patch-ad) = f606a87bf3dff0571db3ededc6889e31f2012397 SHA1 (patch-ae) = 931842733d2166c0fd29b5f0d0772c44f1d79fd3 SHA1 (patch-af) = 3b2f723ec163d925dee42b7d6597f8219ebe22df diff --git a/net/latd/patches/patch-ac b/net/latd/patches/patch-ac index 25cc883bedb2..b8ad587d013e 100644 --- a/net/latd/patches/patch-ac +++ b/net/latd/patches/patch-ac @@ -1,4 +1,4 @@ -$NetBSD: patch-ac,v 1.1 2003/10/21 20:55:42 xtraeme Exp $ +$NetBSD: patch-ac,v 1.2 2010/02/11 22:04:14 joerg Exp $ --- Makefile.in.orig 2003-10-20 19:18:37.000000000 +0200 +++ Makefile.in 2003-10-20 19:20:20.000000000 +0200 @@ -7,14 +7,14 @@ $NetBSD: patch-ac,v 1.1 2003/10/21 20:55:42 xtraeme Exp $ install-sysconfDATA: $(sysconf_DATA) @$(NORMAL_INSTALL) - $(mkinstalldirs) $(DESTDIR)$(sysconfdir) -+ $(mkinstalldirs) $(PREFIX)/share/examples/latd ++ $(mkinstalldirs) ${DESTDIR}$(PREFIX)/share/examples/latd @list='$(sysconf_DATA)'; for p in $$list; do \ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ f="`echo $$p | sed -e 's|^.*/||'`"; \ - echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \ - $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \ + echo " $(sysconfDATA_INSTALL) $$d$$p $(PREFIX)/share/examples/latd/$$f"; \ -+ $(sysconfDATA_INSTALL) $$d$$p $(PREFIX)/share/examples/latd/$$f; \ ++ $(sysconfDATA_INSTALL) $$d$$p ${DESTDIR}$(PREFIX)/share/examples/latd/$$f; \ done uninstall-sysconfDATA: diff --git a/net/lft/Makefile b/net/lft/Makefile index 120e630740df..f238e3177ae4 100644 --- a/net/lft/Makefile +++ b/net/lft/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/10/04 21:53:17 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 22:04:09 joerg Exp $ # DISTNAME= lft-2.2 @@ -9,8 +9,16 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mainnerve.com/lft/ COMMENT= Layer four traceroute capable of tracing protocol paths +PKG_DESTDIR_SUPPORT= user-destdir + USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man8 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/lft ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/lft.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + .include "../../net/libpcap/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/libnipper/Makefile b/net/libnipper/Makefile index 6f2af7605bb5..594c2ca6aafa 100644 --- a/net/libnipper/Makefile +++ b/net/libnipper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/07/17 18:00:22 adrianp Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/11 22:06:14 joerg Exp $ # DISTNAME= libnipper-0.12.1 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://nipper.sourceforge.net/ COMMENT= Performs security audits of network device configuration +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= c++ USE_CMAKE= yes @@ -24,10 +26,11 @@ SUBST_SED.config+= -e "s|@@PKGMANDIR@@|${PKGMANDIR}|g" SUBST_SED.config+= -e "s|/etc|${PKG_SYSONFDIR}|g" SUBST_MESSAGE.config= Fixing configuration files. +INSTALLATION_DIRS+= share/examples + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples ${INSTALL_DATA} ${WRKSRC}/nipper.conf \ - ${PREFIX}/share/examples/nipper.conf + ${DESTDIR}${PREFIX}/share/examples/nipper.conf .include "../../devel/cmake/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/llnlxdir/Makefile b/net/llnlxdir/Makefile index b3ba4a847fb7..f92d3b3c611a 100644 --- a/net/llnlxdir/Makefile +++ b/net/llnlxdir/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/02/22 19:26:55 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2010/02/11 22:05:00 joerg Exp $ # DISTNAME= llnlxdir2_1_2 @@ -12,13 +12,15 @@ MAINTAINER= tor@stormwall.org HOMEPAGE= http://www.llnl.gov/icc/sdd/img/xdir.html COMMENT= Advanced graphical FTP client +PKG_DESTDIR_SUPPORT= user-destdir + USE_IMAKE= yes WRKSRC= ${WRKDIR}/llnlxdir2_1_2/sources INSTALLATION_DIRS= bin lib/X11/app-defaults do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xdir ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/XDir.ad ${PREFIX}/lib/X11/app-defaults/XDir + ${INSTALL_PROGRAM} ${WRKSRC}/xdir ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/XDir.ad ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XDir .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/net/llnlxftp/Makefile b/net/llnlxftp/Makefile index 237cdafc61ad..15c413610368 100644 --- a/net/llnlxftp/Makefile +++ b/net/llnlxftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/02/22 19:26:55 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 22:05:43 joerg Exp $ # DISTNAME= llnlxftp2.1 @@ -12,13 +12,15 @@ MAINTAINER= tor@stormwall.org HOMEPAGE= http://www.llnl.gov/icc/sdd/img/xftp.html COMMENT= Motif FTP client +PKG_DESTDIR_SUPPORT= user-destdir + USE_IMAKE= yes WRKSRC= ${WRKDIR}/llnlxftp2.1/sources INSTALLATION_DIRS= bin lib/X11/app-defaults do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xftp ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/XFtp.ad ${PREFIX}/lib/X11/app-defaults/XFtp + ${INSTALL_PROGRAM} ${WRKSRC}/xftp ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/XFtp.ad ${DESTDIR}${PREFIX}/lib/X11/app-defaults/XFtp .include "../../x11/libXpm/buildlink3.mk" .include "../../mk/motif.buildlink3.mk" diff --git a/net/mcast-tools/Makefile b/net/mcast-tools/Makefile index b1d6dbeb8c6e..22886c0cf4ef 100644 --- a/net/mcast-tools/Makefile +++ b/net/mcast-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2009/06/30 00:07:21 joerg Exp $ +# $NetBSD: Makefile,v 1.5 2010/02/11 22:07:18 joerg Exp $ DISTNAME= mcast-tools-20061214 PKGREVISION= 1 @@ -8,18 +8,18 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mcast-tools/} MAINTAINER= is@NetBSD.org COMMENT= IPv6 multicast routing daemons and tools +PKG_DESTDIR_SUPPORT= user-destdir MAKE_JOBS_SAFE= no CONFLICTS= pim6sd-[0-9]* pim6dd-[0-9]* GNU_CONFIGURE= yes -INSTALLATION_DIRS= share/examples +INSTALLATION_DIRS= share/examples/mcast-tools post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mcast-tools - ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${PREFIX}/share/examples/mcast-tools - ${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample ${PREFIX}/share/examples/mcast-tools - ${INSTALL_DATA} ${WRKSRC}/mfc/mfc.conf.sample ${PREFIX}/share/examples/mcast-tools + ${INSTALL_DATA} ${WRKSRC}/pim6sd/pim6sd.conf.sample ${DESTDIR}${PREFIX}/share/examples/mcast-tools + ${INSTALL_DATA} ${FILESDIR}/pim6dd.conf.sample ${DESTDIR}${PREFIX}/share/examples/mcast-tools + ${INSTALL_DATA} ${WRKSRC}/mfc/mfc.conf.sample ${DESTDIR}${PREFIX}/share/examples/mcast-tools .include "../../mk/bsd.pkg.mk" diff --git a/net/mirror/Makefile b/net/mirror/Makefile index 40cfb51eaa7b..a688c2445803 100644 --- a/net/mirror/Makefile +++ b/net/mirror/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2007/03/01 19:33:39 wiz Exp $ +# $NetBSD: Makefile,v 1.33 2010/02/11 22:08:58 joerg Exp $ DISTNAME= mirror-2.9 PKGREVISION= 2 @@ -9,10 +9,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.sunsite.org.uk/packages/mirror/ COMMENT= Mirror packages on remote sites +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR} MAKE_FILE= makefile MAKE_FLAGS+= GRP=${BINGRP} -MAKE_FLAGS+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 USE_TOOLS+= perl:run REPLACE_PERL= do_unlinks.pl mirror.pl mm.pl pkgs_to_mmin.pl @@ -26,7 +27,6 @@ SUBST_FILES.prefix= mirror.pl mm.pl SUBST_MESSAGE.prefix= Fixing hardcoded installation prefix. SUBST_STAGE.prefix= pre-configure -pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/lib/mirror +INSTALLATION_DIRS+= bin lib/mirror ${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/net/mirror/distinfo b/net/mirror/distinfo index 3de7d1f5af6f..7d97b96e7357 100644 --- a/net/mirror/distinfo +++ b/net/mirror/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2005/02/24 12:13:52 agc Exp $ +$NetBSD: distinfo,v 1.5 2010/02/11 22:08:58 joerg Exp $ SHA1 (mirror-2.9.tar.gz) = 7a4f7a395cfff06be04a449a050b32e2c055e6c4 RMD160 (mirror-2.9.tar.gz) = 2896ba289e182a8be09c50b7d1de8510d9caf188 Size (mirror-2.9.tar.gz) = 123194 bytes -SHA1 (patch-aa) = 5b88f78a7bfa3b4e9f0905efcac2e813ac0eeae2 +SHA1 (patch-aa) = 04ba59e036a946eeff5c1a8cea08465c21a92dd8 SHA1 (patch-ab) = 09045d218a86890f95e381f355fa61c3dfc34ef0 SHA1 (patch-ac) = 5dd115284903102cf1f83de57d2aacdf9addf2f7 SHA1 (patch-ad) = 24b9dd4124756d2c058309e306da0ca022719ac6 diff --git a/net/mirror/patches/patch-aa b/net/mirror/patches/patch-aa index deede9c650d7..7317dda0123b 100644 --- a/net/mirror/patches/patch-aa +++ b/net/mirror/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.6 2004/01/27 14:06:46 grant Exp $ +$NetBSD: patch-aa,v 1.7 2010/02/11 22:08:58 joerg Exp $ --- makefile.orig 1998-06-02 04:28:47.000000000 +1000 +++ makefile @@ -19,13 +19,13 @@ $NetBSD: patch-aa,v 1.6 2004/01/27 14:06:46 grant Exp $ +GRP = bin # directory to install .pl (perl library) files -PLDIR = /usr/local/perl5/lib/perl5 -+PLDIR = ${PREFIX}/lib/mirror ++PLDIR = ${DESTDIR}${PREFIX}/lib/mirror # directory to install public executables -BINDIR = /usr/local/sbin -+BINDIR = ${PREFIX}/bin ++BINDIR = ${DESTDIR}${PREFIX}/bin # directory to install man pages -MANDIR = /usr/local/man/man1 -+MANDIR = ${PREFIX}/man/man1 ++MANDIR = ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 install: - install -m $(PLMODE) -g $(GRP) lchat.pl $(PLDIR) diff --git a/net/mrtg/Makefile b/net/mrtg/Makefile index 93cdf2b9667c..0419f682e448 100644 --- a/net/mrtg/Makefile +++ b/net/mrtg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.94 2010/01/18 09:59:20 wiz Exp $ +# $NetBSD: Makefile,v 1.95 2010/02/11 22:14:30 joerg Exp $ DISTNAME= mrtg-2.16.2 PKGREVISION= 4 @@ -11,6 +11,8 @@ HOMEPAGE= http://oss.oetiker.ch/mrtg/ COMMENT= The Multi-Router Traffic Grapher LICENSE= gnu-gpl-v2 +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= perl:run GNU_CONFIGURE= YES @@ -40,7 +42,7 @@ SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" SUBST_MESSAGE.files= Fixing default configuration files. INSTALLATION_DIRS= bin libexec ${PKGMANDIR}/man1 ${EGDIR} -INSTALLATION_DIRS+= share/mrtg share/doc/mrtg +INSTALLATION_DIRS+= share/mrtg share/doc/mrtg ${PERL5_INSTALLVENDORLIB} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" @@ -53,34 +55,33 @@ post-extract: do-install: for FILE in ${WRKSRC}/doc/*.??*; do \ - ${INSTALL_DATA} $$FILE ${PREFIX}/share/doc/mrtg; \ + ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/doc/mrtg; \ done - ${INSTALL_DATA} ${WRKSRC}/doc/mrtg*.1 ${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_DATA} ${WRKSRC}/doc/mrtg*.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ for FILE in cfgmaker.1 indexmaker.1; do \ - ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${PREFIX}/${PKGMANDIR}/man1/mrtg$$FILE; \ + ${INSTALL_DATA} ${WRKSRC}/doc/$$FILE ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/mrtg$$FILE; \ done for FILE in CHANGES COPYING COPYRIGHT README; do \ - ${INSTALL_DATA} ${WRKSRC}/$$FILE ${PREFIX}/share/doc/mrtg; \ + ${INSTALL_DATA} ${WRKSRC}/$$FILE ${DESTDIR}${PREFIX}/share/doc/mrtg; \ done for FILE in ${WRKSRC}/images/*.png; do \ - ${INSTALL_DATA} $$FILE ${PREFIX}/share/mrtg; \ + ${INSTALL_DATA} $$FILE ${DESTDIR}${PREFIX}/share/mrtg; \ done - ${INSTALL_DATA} ${WRKDIR}/mrtg.conf.example ${EGDIR}/mrtg.conf + ${INSTALL_DATA} ${WRKDIR}/mrtg.conf.example ${DESTDIR}${EGDIR}/mrtg.conf for FILE in netstat2mrtg sys2mrtg envstat2mrtg; do \ - ${INSTALL_SCRIPT} ${WRKDIR}/$$FILE ${PREFIX}/libexec; \ + ${INSTALL_SCRIPT} ${WRKDIR}/$$FILE ${DESTDIR}${PREFIX}/libexec; \ done - ${INSTALL_DATA_DIR} ${PERL5_INSTALLVENDORLIB} ${INSTALL_DATA} ${WRKSRC}/lib/mrtg2/BER.pm \ ${WRKSRC}/lib/mrtg2/SNMP_Session.pm \ ${WRKSRC}/lib/mrtg2/SNMP_util.pm \ ${WRKSRC}/lib/mrtg2/Net_SNMP_util.pm \ ${WRKSRC}/lib/mrtg2/MRTG_lib.pm \ ${WRKSRC}/lib/mrtg2/locales_mrtg.pm \ - ${PERL5_INSTALLVENDORLIB} - ${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${PREFIX}/libexec/ - ${INSTALL_SCRIPT} ${WRKSRC}/bin/mrtg ${PREFIX}/bin/ + ${DESTDIR}${PERL5_INSTALLVENDORLIB} + ${INSTALL_PROGRAM} ${WRKSRC}/bin/rateup ${DESTDIR}${PREFIX}/libexec/ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/mrtg ${DESTDIR}${PREFIX}/bin/ for FILE in cfgmaker indexmaker; do \ - ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$FILE ${PREFIX}/bin/mrtg$$FILE; \ + ${INSTALL_SCRIPT} ${WRKSRC}/bin/$$FILE ${DESTDIR}${PREFIX}/bin/mrtg$$FILE; \ done .include "../../mk/bsd.pkg.mk" diff --git a/net/mtftpd/Makefile b/net/mtftpd/Makefile index 2eca9fc25ce5..155d77ca225c 100644 --- a/net/mtftpd/Makefile +++ b/net/mtftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/03/18 13:29:32 jmcneill Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/11 22:10:59 joerg Exp $ DISTNAME= mtftpd-20080229 CATEGORIES= net @@ -7,6 +7,8 @@ MASTER_SITES= http://www.invisible.ca/~jmcneill/netbsd/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Open-loop multicast TFTP server +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/mtftpd USE_BSD_MAKEFILE= yes @@ -15,8 +17,9 @@ USE_BSD_MAKEFILE= yes CFLAGS+= -DPKG_SYSCONFDIR=\"${PKG_SYSCONFDIR}\" +INSTALLATION_DIRS+= bin share/examples/mtftpd + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/mtftpd - ${INSTALL_DATA} ${WRKSRC}/mtftpd.plist ${PREFIX}/share/examples/mtftpd + ${INSTALL_DATA} ${WRKSRC}/mtftpd.plist ${DESTDIR}${PREFIX}/share/examples/mtftpd .include "../../mk/bsd.pkg.mk" diff --git a/net/mydns-mysql/Makefile b/net/mydns-mysql/Makefile index eed4e3a544b8..cc42c935f0f0 100644 --- a/net/mydns-mysql/Makefile +++ b/net/mydns-mysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2006/06/07 12:43:13 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2010/02/11 22:14:26 joerg Exp $ PKGNAME= ${DISTNAME:S/-/-mysql-/} PKGREVISION= 2 @@ -10,6 +10,8 @@ DISTINFO_FILE= ${.CURDIR}/../../net/mydns-pgsql/distinfo PATCHDIR= ${.CURDIR}/../../net/mydns-pgsql/patches FILESDIR= ${.CURDIR}/../../net/mydns-pgsql/files +PKG_DESTDIR_SUPPORT= user-destdir + CONFIGURE_ARGS+= --without-pgsql CONFIGURE_ARGS+= --with-mysql-lib=${BUILDLINK_PREFIX.mysql-client}/lib/mysql CONFIGURE_ARGS+= --with-mysql-include=${BUILDLINK_PREFIX.mysql-client}/include/mysql diff --git a/net/mydns-pgsql/Makefile b/net/mydns-pgsql/Makefile index 8af8241470f9..2fc2a9d1d9b0 100644 --- a/net/mydns-pgsql/Makefile +++ b/net/mydns-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2010/02/10 19:34:07 joerg Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/12 02:03:29 joerg Exp $ PKGNAME= ${DISTNAME:S/-/-pgsql-/} PKGREVISION= 7 @@ -6,6 +6,8 @@ COMMENT= PostgreSQL-based DNS server CONFLICTS= mydns-mysql-[0-9]* +PKG_DESTDIR_SUPPORT= user-destdir + CONFIGURE_ARGS+= --without-mysql CONFIGURE_ARGS+= --with-pgsql-lib=${BUILDLINK_PREFIX.${PGSQL_TYPE}}/lib CONFIGURE_ARGS+= --with-pgsql-include=${BUILDLINK_PREFIX.${PGSQL_TYPE}}/include diff --git a/net/mydns-pgsql/Makefile.common b/net/mydns-pgsql/Makefile.common index a37105634724..8a5eeda793f7 100644 --- a/net/mydns-pgsql/Makefile.common +++ b/net/mydns-pgsql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2007/07/04 20:54:50 jlam Exp $ +# $NetBSD: Makefile.common,v 1.14 2010/02/11 22:14:26 joerg Exp $ DISTNAME= mydns-1.1.0 CATEGORIES= net @@ -34,10 +34,11 @@ RCD_SCRIPTS= mydns PKG_GROUPS= ${MYDNS_GROUP} PKG_USERS= ${MYDNS_USER}:${MYDNS_GROUP} +INSTALLATION_DIRS+= ${EGDIR} + post-install: - ${INSTALL_DATA_DIR} ${EGDIR} - ${WRKSRC}/src/mydns/mydns --dump-config > ${EGDIR}/mydns.conf - ${CHMOD} 0600 ${EGDIR}/mydns.conf + ${WRKSRC}/src/mydns/mydns --dump-config > ${DESTDIR}${EGDIR}/mydns.conf + ${CHMOD} 0600 ${DESTDIR}${EGDIR}/mydns.conf .include "../../security/openssl/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/net/netgroup/Makefile b/net/netgroup/Makefile index ee6553ccab8c..8096b817173b 100644 --- a/net/netgroup/Makefile +++ b/net/netgroup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/11/03 17:00:38 tv Exp $ +# $NetBSD: Makefile,v 1.4 2010/02/11 22:17:29 joerg Exp $ # DISTNAME= netgroup-0.0 @@ -8,8 +8,13 @@ MASTER_SITES= ftp://ftp.astron.com/pub/netgroup/ MAINTAINER= christos@NetBSD.org COMMENT= Netgroup membership listing and testing functions +PKG_DESTDIR_SUPPORT= user-destdir + NOT_FOR_PLATFORM= Interix-*-* # no netgroups +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 INSTALL_TARGET= inst-all +INSTALL_MAKE_FLAGS+= BINDIR=${DESTDIR}${PREFIX}/bin \ + MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/net/netname/Makefile b/net/netname/Makefile index 52fb929abd8d..aa7b38c0b19a 100644 --- a/net/netname/Makefile +++ b/net/netname/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2007/12/24 08:47:31 obache Exp $ +# $NetBSD: Makefile,v 1.9 2010/02/11 22:18:35 joerg Exp $ # DISTNAME= netname-1.7 @@ -9,6 +9,8 @@ MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/ MAINTAINER= kim@tac.nyc.ny.us COMMENT= Return the canonical network name of a host +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "SunOS" diff --git a/net/netname/distinfo b/net/netname/distinfo index 083019de63b9..30927fa0f637 100644 --- a/net/netname/distinfo +++ b/net/netname/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2007/12/24 08:47:31 obache Exp $ +$NetBSD: distinfo,v 1.6 2010/02/11 22:18:35 joerg Exp $ SHA1 (netname-1.7.tar.gz) = cc3bca5ceb11bdb05f39a9904a5b46f02e3a8dff RMD160 (netname-1.7.tar.gz) = 7809a80146e2096a010ec3c40a8e9c583255b919 Size (netname-1.7.tar.gz) = 2362 bytes -SHA1 (patch-aa) = 998ca7e23281d474d3a262d426a4de5b67c9dfe4 +SHA1 (patch-aa) = abfaab5aaa6edc64d5ee39e5ce0439c4477ee4ac diff --git a/net/netname/patches/patch-aa b/net/netname/patches/patch-aa index 07ac017ea6f1..2b5e39d20a86 100644 --- a/net/netname/patches/patch-aa +++ b/net/netname/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2007/12/24 08:47:31 obache Exp $ +$NetBSD: patch-aa,v 1.4 2010/02/11 22:18:35 joerg Exp $ --- Makefile.orig 1999-09-15 03:15:12.000000000 +0000 +++ Makefile @@ -11,7 +11,7 @@ $NetBSD: patch-aa,v 1.3 2007/12/24 08:47:31 obache Exp $ -INSTALL = install - -DEST = /usr/local -+DEST = $(PREFIX) ++DEST = ${DESTDIR}$(PREFIX) BINDIR = $(DEST)/bin -MANDIR = $(DEST)/man/man$(MANEXT) +MANDIR = $(DEST)/$(PKGMANDIR)/man$(MANEXT) diff --git a/net/netpipes/Makefile b/net/netpipes/Makefile index 2d4b1e5c55ec..1952be47763b 100644 --- a/net/netpipes/Makefile +++ b/net/netpipes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/03/14 16:00:41 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 22:17:36 joerg Exp $ DISTNAME= netpipes-4.2-export PKGNAME= ${DISTNAME:S/-export//} @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://web.purplefrog.com/~thoth/netpipes/netpipes.html COMMENT= Utilities for communicating via sockets +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR} USE_TOOLS+= tbl diff --git a/net/netpipes/distinfo b/net/netpipes/distinfo index cf3742a2cc1d..8b8259652e06 100644 --- a/net/netpipes/distinfo +++ b/net/netpipes/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.2 2005/12/18 22:02:35 joerg Exp $ +$NetBSD: distinfo,v 1.3 2010/02/11 22:17:36 joerg Exp $ SHA1 (netpipes-4.2-export.tar.gz) = e8a52168b2893a12d943cc31e5d3a7f0bb3502b0 RMD160 (netpipes-4.2-export.tar.gz) = 26c982c0b9e4382d96335f10a5e54813f776db29 Size (netpipes-4.2-export.tar.gz) = 74977 bytes -SHA1 (patch-aa) = 08b395d0c47e4099461bd0c31f6bea600cab043e +SHA1 (patch-aa) = 25c4760f1a50f1e120b691b49088f149b5c54029 SHA1 (patch-ab) = e2ff692a1153687c5c42da9df06cdc3012c6989a SHA1 (patch-ac) = 4cc8af134622dec798094dc043ad65c1e1154cf0 SHA1 (patch-ad) = dfa0eeb9b6a723b6d91fa234e4cfeaad66e6ec8c diff --git a/net/netpipes/patches/patch-aa b/net/netpipes/patches/patch-aa index d8d5431ad7da..e2b0d93bd1f2 100644 --- a/net/netpipes/patches/patch-aa +++ b/net/netpipes/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/11/06 23:58:34 jlam Exp $ +$NetBSD: patch-aa,v 1.2 2010/02/11 22:17:36 joerg Exp $ --- Makefile.orig 1998-10-28 15:30:03.000000000 -0500 +++ Makefile @@ -9,7 +9,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/11/06 23:58:34 jlam Exp $ -INSTROOT = /depot/collections0/netpipes4.1 -#INSTROOT = /usr/local +#INSTROOT = /depot/collections0/netpipes4.1 -+INSTROOT = ${PREFIX} ++INSTROOT = ${DESTDIR}${PREFIX} INSTBIN = ${INSTROOT}/bin -INSTMAN = ${INSTROOT}/man +INSTMAN = ${INSTROOT}/${PKGMANDIR} diff --git a/net/nfdump/Makefile b/net/nfdump/Makefile index e770100a099c..2e9cb774f39e 100644 --- a/net/nfdump/Makefile +++ b/net/nfdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/02/24 20:38:49 seb Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 22:18:47 joerg Exp $ # DISTNAME= nfdump-1.5.7 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://nfdump.sourceforge.net/ COMMENT= Tools to collect and process netflow data +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes TEST_TARGET= test USE_TOOLS+= lex diff --git a/net/nidentd/Makefile b/net/nidentd/Makefile index 5295f02d5c13..ce303d0f193d 100644 --- a/net/nidentd/Makefile +++ b/net/nidentd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:26 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/11 22:19:14 joerg Exp $ # DISTNAME= nidentd-1.0 @@ -10,6 +10,8 @@ EXTRACT_SUFX= .tgz MAINTAINER= symka@NetBSD.org COMMENT= identd that supports IPv4, IPv6, NAT, fake and random +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= lsof>=4.61:../../sysutils/lsof INSTALLATION_DIRS= etc libexec @@ -21,8 +23,8 @@ do-build: ${MV} ${WRKSRC}/nidentd.tmp ${WRKSRC}/nidentd do-install: - ${INSTALL_DATA} ${WRKSRC}/nidentd.nat ${PREFIX}/etc/nidentd.nat.example ; \ - ${INSTALL_DATA} ${WRKSRC}/nidentd.fake ${PREFIX}/etc/nidentd.fake.example ; \ - ${INSTALL_SCRIPT} ${WRKSRC}/nidentd ${PREFIX}/libexec + ${INSTALL_DATA} ${WRKSRC}/nidentd.nat ${DESTDIR}${PREFIX}/etc/nidentd.nat.example ; \ + ${INSTALL_DATA} ${WRKSRC}/nidentd.fake ${DESTDIR}${PREFIX}/etc/nidentd.fake.example ; \ + ${INSTALL_SCRIPT} ${WRKSRC}/nidentd ${DESTDIR}${PREFIX}/libexec .include "../../mk/bsd.pkg.mk" diff --git a/net/nipper/Makefile b/net/nipper/Makefile index bf6497378c86..80ab3096ddb9 100644 --- a/net/nipper/Makefile +++ b/net/nipper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2009/07/17 18:00:22 adrianp Exp $ +# $NetBSD: Makefile,v 1.4 2010/02/11 22:19:49 joerg Exp $ # DISTNAME= nipper-cli-0.12.0 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://nipper.sourceforge.net/ COMMENT= Performs security audits of network device configuration +PKG_DESTDIR_SUPPORT= user-destdir + USE_LANGUAGES= c++ c USE_CMAKE= yes diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile index 46267ea5d4dd..c71b5e9cd3f6 100644 --- a/net/nprobe/Makefile +++ b/net/nprobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/05/12 09:19:54 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/11 22:19:44 joerg Exp $ DISTNAME= nProbe-source-1.3.1 PKGREVISION= 4 @@ -11,6 +11,8 @@ MAINTAINER= cjs@NetBSD.org HOMEPAGE= http://www.ntop.org/nProbe.html COMMENT= Monitor a network interface and generate NetFlow data +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/nProbe GNU_CONFIGURE= YES USE_LIBTOOL= yes @@ -23,7 +25,7 @@ INSTALLATION_DIRS= sbin #CFLAGS+= -DMAX_DEMO_FLOWS=1000 -DDEMO_MODE do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/nprobe ${PREFIX}/sbin + ${INSTALL_PROGRAM} ${WRKSRC}/nprobe ${DESTDIR}${PREFIX}/sbin .include "../../mk/pthread.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/nstx/Makefile b/net/nstx/Makefile index eda2665342a9..eacc13c88eb4 100644 --- a/net/nstx/Makefile +++ b/net/nstx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/11/16 02:09:49 minskim Exp $ +# $NetBSD: Makefile,v 1.4 2010/02/11 22:20:52 joerg Exp $ # DISTNAME= nstx-1.1-beta6 @@ -11,10 +11,13 @@ MAINTAINER= pancake@phreaker.net HOMEPAGE= http://nstx.dereference.de/nstx/ COMMENT= Nameserver Transfer Protocol +PKG_DESTDIR_SUPPORT= user-destdir + +INSTALLATION_DIRS+= bin share/doc/nstx + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/nstxcd ${PREFIX}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/nstxd ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/nstx - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/nstx/ + ${INSTALL_PROGRAM} ${WRKSRC}/nstxcd ${DESTDIR}${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/nstxd ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/nstx .include "../../mk/bsd.pkg.mk" diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 2be569db6c40..2e93293d383e 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2010/01/17 12:02:34 wiz Exp $ +# $NetBSD: Makefile,v 1.58 2010/02/11 22:24:33 joerg Exp $ DISTNAME= ntop-3.3.10 PKGREVISION= 2 @@ -9,6 +9,8 @@ MAINTAINER= adam@NetBSD.org HOMEPAGE= http://www.ntop.org/ntop.html COMMENT= Shows network usage (similar to "top" for processes) +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= ntop-[0-9]* USE_LIBTOOL= yes diff --git a/net/ocamlnet/distinfo b/net/ocamlnet/distinfo index c60cf84ad5dc..8fc094e748c9 100644 --- a/net/ocamlnet/distinfo +++ b/net/ocamlnet/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2010/01/30 19:43:18 joerg Exp $ +$NetBSD: distinfo,v 1.3 2010/02/11 13:10:15 joerg Exp $ SHA1 (ocamlnet-1.1.2.tar.gz) = 09683bd8d2116449deaf96873424cebf569d65e7 RMD160 (ocamlnet-1.1.2.tar.gz) = 2c554571f53b99e7cd23dcf043bebc3c3f779435 Size (ocamlnet-1.1.2.tar.gz) = 817450 bytes SHA1 (patch-aa) = 17926b7a3096615f773fa3241030fb514b4a5f5d -SHA1 (patch-ab) = d5815fae4ccb258c134d860b823a8c82aeff275a +SHA1 (patch-ab) = 5b3ac5e7c238142e233585311df7844dd23c3915 diff --git a/net/ocamlnet/patches/patch-ab b/net/ocamlnet/patches/patch-ab index 8d0584562a6c..6dc735b7c3ad 100644 --- a/net/ocamlnet/patches/patch-ab +++ b/net/ocamlnet/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.1 2010/01/30 19:43:18 joerg Exp $ +$NetBSD: patch-ab,v 1.2 2010/02/11 13:10:15 joerg Exp $ --- src/Makefile.rules.orig 2006-03-06 16:59:47.000000000 +0000 +++ src/Makefile.rules @@ -9,7 +9,7 @@ $NetBSD: patch-ab,v 1.1 2010/01/30 19:43:18 joerg Exp $ + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}`$(OCAMLC) -where`/site-lib files=`$(COLLECT_FILES) *.mli *.cmi *.cma *.cmxa *.a META $(INSTALL_EXTRA)` && \ - $(OCAMLFIND) install $(PKGNAME) $$files -+ $(OCAMLFIND) install -destdir ${DESTDIR}`$(OCAMLC) -where`/site-lib $(PKGNAME) $$files ++ $(OCAMLFIND) install -ldconf /dev/null -destdir ${DESTDIR}`$(OCAMLC) -where`/site-lib $(PKGNAME) $$files .PHONY: uninstall-findlib uninstall-findlib: diff --git a/net/oinkmaster/Makefile b/net/oinkmaster/Makefile index bda55737607b..ce8ddad35ae6 100644 --- a/net/oinkmaster/Makefile +++ b/net/oinkmaster/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2009/07/17 18:00:20 adrianp Exp $ +# $NetBSD: Makefile,v 1.18 2010/02/11 22:24:43 joerg Exp $ DISTNAME= oinkmaster-2.0 CATEGORIES= net @@ -8,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://oinkmaster.sourceforge.net/ COMMENT= Manage snort rule updates +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= snort{,-mysql,-pgsql}-[0-9]*:../../net/snort NO_BUILD= yes @@ -32,29 +34,28 @@ SUBST_SED.pub= -e "s|/usr/local/etc|${PKG_SYSCONFDIR}|g" SUBST_SED.pub+= -e "s|/usr/local|${PREFIX}|g" SUBST_MESSAGE.pub= Fixing harcoded paths. -INSTALLATION_DIRS= bin share/snort/rules +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 \ + share/doc/oinkmaster share/examples/oinkmaster \ + share/snort/rules do-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oinkmaster - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/oinkmaster - . for f in ${DOCS} - ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${DOCDIR}/${f} . endfor - ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${EGDIR} - ${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${PREFIX}/bin/oinkmaster + ${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${DESTDIR}${EGDIR} + ${INSTALL_DATA} ${WRKSRC}/template-examples.conf ${DESTDIR}${EGDIR} + ${INSTALL_MAN} ${WRKSRC}/oinkmaster.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + ${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${DESTDIR}${PREFIX}/bin/oinkmaster ${LN} -s ${PKG_SYSCONFDIR}/classification.config \ - ${PREFIX}/share/snort/rules/classification.config + ${DESTDIR}${PREFIX}/share/snort/rules/classification.config ${LN} -s ${PKG_SYSCONFDIR}/reference.config \ - ${PREFIX}/share/snort/rules/reference.config + ${DESTDIR}${PREFIX}/share/snort/rules/reference.config ${LN} -s ${PKG_SYSCONFDIR}/gen-msg.map \ - ${PREFIX}/share/snort/rules/gen-msg.map + ${DESTDIR}${PREFIX}/share/snort/rules/gen-msg.map ${LN} -s ${PKG_SYSCONFDIR}/sid-msg.map \ - ${PREFIX}/share/snort/rules/sid-msg.map + ${DESTDIR}${PREFIX}/share/snort/rules/sid-msg.map ${LN} -s ${PKG_SYSCONFDIR}/unicode.map \ - ${PREFIX}/share/snort/rules/unicode.map + ${DESTDIR}${PREFIX}/share/snort/rules/unicode.map .include "../../mk/bsd.pkg.mk" diff --git a/net/openag/Makefile b/net/openag/Makefile index 95322cd597f5..833ade06e85a 100644 --- a/net/openag/Makefile +++ b/net/openag/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:23 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 22:28:40 joerg Exp $ # DISTNAME= OpenAG-1.1.1 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://sourceforge.net/projects/openags/ COMMENT= Open Audio Galaxy client +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= wget-[0-9]*:../../net/wget GNU_CONFIGURE= yes @@ -18,10 +20,11 @@ USE_LANGUAGES= c c++ .include "../../devel/zlib/buildlink3.mk" +INSTALLATION_DIRS+= share/doc/OpenAG + post-install: - ${INSTALL_MAN_DIR} ${PREFIX}/share/doc/OpenAG .for i in AUTHORS ChangeLog INSTALL NEWS README - ${INSTALL_MAN} ${WRKSRC}/${i} ${PREFIX}/share/doc/OpenAG/${i} + ${INSTALL_MAN} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/OpenAG/${i} .endfor .include "../../mk/bsd.pkg.mk" diff --git a/net/openh323/Makefile b/net/openh323/Makefile index 7a429c17f82b..2e6a8a8e3964 100644 --- a/net/openh323/Makefile +++ b/net/openh323/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2010/01/17 12:02:34 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2010/02/11 22:28:44 joerg Exp $ DISTNAME= openh323-v1_15_2-src PKGNAME= openh323-1.15.2 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.openh323.org/ COMMENT= Open H.323 library +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/openh323 USE_LANGUAGES= c c++ USE_TOOLS+= gmake tar @@ -24,21 +26,19 @@ MAKE_ENV+= SYSLIBDIR=${PREFIX}/lib MAKE_JOBS_SAFE= no +INSTALL_DIRS= src plugins samples/simple +INSTALLATION_DIRS+= include/openh323 share/openh323 + post-patch: cd ${WRKSRC}/include; ${LN} -s . openh323 # override the openh323 install - it uses cp -d, and isn't libtool-aware do-install: - cd ${WRKSRC}/src; ${MAKE_ENV} ${GMAKE} install - ${INSTALL_DATA_DIR} ${PREFIX}/include/openh323 - cd ${WRKSRC}/include; \ - for f in \*.h ; \ - do ${INSTALL_DATA} $$f ${PREFIX}/include/openh323; done - cd ${WRKSRC}; ${INSTALL_DATA} version.h ${PREFIX}/include/openh323 - cd ${WRKSRC}/samples/simple; ${MAKE_ENV} ${GMAKE} install - ${INSTALL_DATA_DIR} ${PREFIX}/share/openh323 - cd ${WRKSRC}; ${INSTALL_DATA} openh323u.mak ${PREFIX}/share/openh323 - cd ${WRKSRC}/plugins; ${GMAKE} install + for f in ${WRKSRC}/include/*.h ; do \ + ${INSTALL_DATA} $$f ${DESTDIR}${PREFIX}/include/openh323; \ + done + ${INSTALL_DATA} ${WRKSRC}/version.h ${DESTDIR}${PREFIX}/include/openh323 + ${INSTALL_DATA} ${WRKSRC}/openh323u.mak ${DESTDIR}${PREFIX}/share/openh323 .include "../../devel/pwlib/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile index 59189b5db3ae..90bf09cff498 100644 --- a/net/openntpd/Makefile +++ b/net/openntpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2010/01/17 12:02:34 wiz Exp $ +# $NetBSD: Makefile,v 1.28 2010/02/11 22:30:40 joerg Exp $ DISTNAME= openntpd-3.9p1 PKGREVISION= 2 @@ -13,6 +13,7 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.openntpd.org/ COMMENT= Free implementation of the Network Time Protocol +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews CONFLICTS+= ntp-[0-9]* @@ -33,11 +34,13 @@ BUILD_DEFS+= VARBASE OWN_DIRS= ${VARBASE}/chroot/ntpd AUTO_MKDIRS= yes +INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 ${EGDIR} + do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${PREFIX}/sbin/ntpd - ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${PREFIX}/${PKGMANDIR}/man8/ntpd.8 - ${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${PREFIX}/${PKGMANDIR}/man5/ntpd.conf.5 - ${INSTALL_DATA} ${WRKSRC}/ntpd.conf ${EGDIR}/ntpd.conf + ${INSTALL_PROGRAM} ${WRKSRC}/ntpd ${DESTDIR}${PREFIX}/sbin/ntpd + ${INSTALL_MAN} ${WRKSRC}/ntpd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ntpd.8 + ${INSTALL_MAN} ${WRKSRC}/ntpd.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ntpd.conf.5 + ${INSTALL_DATA} ${WRKSRC}/ntpd.conf ${DESTDIR}${EGDIR}/ntpd.conf .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/openwbem/Makefile b/net/openwbem/Makefile index 301002a0cedb..4b141af30746 100644 --- a/net/openwbem/Makefile +++ b/net/openwbem/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/12/27 18:54:18 joerg Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/11 22:46:18 joerg Exp $ DISTNAME= openwbem-3.2.2 CATEGORIES= net devel @@ -8,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.openwbem.org/ COMMENT= Web-based Enterprise Management software +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes CONFIGURE_ARGS+= ac_cv_path_TRUE_PATHNAME=true ac_cv_path_FALSE_PATHNAME=false USE_TOOLS+= gmake diff --git a/net/openwbem/distinfo b/net/openwbem/distinfo index fb3c40c0e5ba..1220428783bc 100644 --- a/net/openwbem/distinfo +++ b/net/openwbem/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.2 2007/12/27 18:54:18 joerg Exp $ +$NetBSD: distinfo,v 1.3 2010/02/11 22:46:18 joerg Exp $ SHA1 (openwbem-3.2.2.tar.gz) = 3272e5cbcfb2a864cccf71e15e0da0f6623420bb RMD160 (openwbem-3.2.2.tar.gz) = 31ce8c80d47ff7539315e3978b8c1c493bd17f35 @@ -6,5 +6,5 @@ Size (openwbem-3.2.2.tar.gz) = 2919455 bytes SHA1 (patch-aa) = 33cd8d21ed698b511fc662686a7bf7abbf85c232 SHA1 (patch-ab) = c83f632376f12d7378b1f013a0db5d4ae63f15bf SHA1 (patch-ac) = ea2f928b13eaef464e133b0e510fa4b8cfee95b9 -SHA1 (patch-ad) = 52d05017718446076417c140b14ef6296ae2e8e4 +SHA1 (patch-ad) = e8b7c3a3b7fbab6052a9e866c8a1c9f1653db590 SHA1 (patch-ae) = a9d923bdf6e52acff83588605f2913b196c92038 diff --git a/net/openwbem/patches/patch-ad b/net/openwbem/patches/patch-ad index f0a69bb47f0c..166be920abe8 100644 --- a/net/openwbem/patches/patch-ad +++ b/net/openwbem/patches/patch-ad @@ -1,4 +1,4 @@ -$NetBSD: patch-ad,v 1.1.1.1 2007/10/29 15:05:21 agc Exp $ +$NetBSD: patch-ad,v 1.2 2010/02/11 22:46:18 joerg Exp $ --- etc/Makefile.in 2007/10/29 14:15:16 1.1 +++ etc/Makefile.in 2007/10/29 14:17:27 @@ -7,7 +7,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2007/10/29 15:05:21 agc Exp $ SUBDIRS = init sysconfig pam.d openwbemconf_DATA = openwbem.conf ssleay.cnf owgencert -openwbemconfdir = $(sysconfdir)/openwbem -+openwbemconfdir = ${DESTDIR}$(prefix)/share/examples/openwbem ++openwbemconfdir = $(prefix)/share/examples/openwbem EXTRA_DIST = openwbem.conf.sh owgencert.sh ssleay.cnf CLEANFILES = openwbem.conf owgencert SUFFIXES = .sh diff --git a/net/overnet/Makefile b/net/overnet/Makefile index d09421aef811..96d5bf22cde1 100644 --- a/net/overnet/Makefile +++ b/net/overnet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2007/07/29 05:19:47 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/11 22:31:25 joerg Exp $ # DISTNAME= overnetclc-1.0.1 @@ -12,6 +12,8 @@ MAINTAINER= grant@NetBSD.org HOMEPAGE= http://www.overnet.com/ COMMENT= Peer-to-peer file sharing client (binary pkg) +PKG_DESTDIR_SUPPORT= user-destdir + EMUL_PLATFORMS= linux-i386 EMUL_MODULES.linux= compat @@ -23,17 +25,15 @@ RPM2PKG_PLIST= # empty RPM2PKG_STRIP= 0 RUN_LDCONFIG= no -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin share/doc/overnetclc share/overnetclc do-install: - ${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/overnetclc ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/overnetclc + ${INSTALL_PROGRAM} ${WRKDIR}/usr/bin/overnetclc ${DESTDIR}${PREFIX}/bin .for f in ChangeLog LISEZMOI README ${INSTALL_DATA} ${WRKDIR}/usr/share/doc/overnetclc/${f} \ - ${PREFIX}/share/doc/overnetclc + ${DESTDIR}${PREFIX}/share/doc/overnetclc .endfor - ${INSTALL_DATA_DIR} ${PREFIX}/share/overnetclc ${INSTALL_DATA} ${WRKSRC}/usr/share/overnetclc/contact.dat \ - ${PREFIX}/share/overnetclc + ${DESTDIR}${PREFIX}/share/overnetclc .include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_LDAP2/DESCR b/net/pear-Net_LDAP2/DESCR new file mode 100644 index 000000000000..33803178a0c1 --- /dev/null +++ b/net/pear-Net_LDAP2/DESCR @@ -0,0 +1,12 @@ +Net_LDAP2 is the successor of Net_LDAP which is a clone of Perls Net::LDAP +object interface to directory servers. It does contain most of Net::LDAPs +features but has some own too. + +With Net_LDAP2 you have: +* A simple object-oriented interface to connections, searches entries and +filters. +* Support for tls and ldap v3. +* Simple modification, deletion and creation of ldap entries. +* Support for schema handling. + +Net_LDAP2 layers itself on top of PHP's existing ldap extensions diff --git a/net/pear-Net_LDAP2/Makefile b/net/pear-Net_LDAP2/Makefile new file mode 100644 index 000000000000..83581408842e --- /dev/null +++ b/net/pear-Net_LDAP2/Makefile @@ -0,0 +1,13 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/02/11 11:35:37 obache Exp $ + +DISTNAME= Net_LDAP2-2.0.7 +CATEGORIES+= net + +MAINTAINER= wenheping@gmail.com +COMMENT= Object oriented interface for searching and manipulating LDAP-entries +LICENSE= gnu-lgpl-v3 + +PKG_DESTDIR_SUPPORT= user-destdir + +.include "../../lang/php/pear.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/net/pear-Net_LDAP2/distinfo b/net/pear-Net_LDAP2/distinfo new file mode 100644 index 000000000000..cb0512dc71cf --- /dev/null +++ b/net/pear-Net_LDAP2/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/02/11 11:35:37 obache Exp $ + +SHA1 (pear/Net_LDAP2-2.0.7.tgz) = af6dfb7bd2b7b3ae1c3dff0703daa1c965c82c4c +RMD160 (pear/Net_LDAP2-2.0.7.tgz) = 72d5319cd1a639566ecb163eee8eefa6db504ce5 +Size (pear/Net_LDAP2-2.0.7.tgz) = 88979 bytes diff --git a/net/queryperf/Makefile b/net/queryperf/Makefile index edfaa29d0a32..595e08254e56 100644 --- a/net/queryperf/Makefile +++ b/net/queryperf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2007/03/19 16:40:28 tv Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/11 22:34:24 joerg Exp $ # DISTNAME= queryperf-nominum-2.1 @@ -10,20 +10,20 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= ftp://ftp.nominum.com/pub/nominum/ COMMENT= DNS performance and load tester +PKG_DESTDIR_SUPPORT= user-destdir + USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes BUILD_TARGET= queryperf USE_PKGINSTALL= yes EGDIR= share/examples/queryperf -INSTALLATION_DIRS+= bin -OWN_DIRS+= share/doc/queryperf -OWN_DIRS+= ${EGDIR} +INSTALLATION_DIRS+= bin share/doc/queryperf ${EGDIR} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/queryperf ${PREFIX}/bin/ - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/queryperf/ - ${INSTALL_SCRIPT} ${WRKSRC}/utils/gen-data-queryperf.py ${PREFIX}/${EGDIR}/ - ${INSTALL_DATA} ${WRKSRC}/input/sample.* ${PREFIX}/${EGDIR}/ + ${INSTALL_PROGRAM} ${WRKSRC}/queryperf ${DESTDIR}${PREFIX}/bin/ + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/queryperf/ + ${INSTALL_SCRIPT} ${WRKSRC}/utils/gen-data-queryperf.py ${DESTDIR}${PREFIX}/${EGDIR}/ + ${INSTALL_DATA} ${WRKSRC}/input/sample.* ${DESTDIR}${PREFIX}/${EGDIR}/ .include "../../mk/bsd.pkg.mk" diff --git a/net/ra-rtsp-proxy/Makefile b/net/ra-rtsp-proxy/Makefile index 3b89f7eb4b38..6b6a01919c2d 100644 --- a/net/ra-rtsp-proxy/Makefile +++ b/net/ra-rtsp-proxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2009/05/19 08:59:28 wiz Exp $ +# $NetBSD: Makefile,v 1.27 2010/02/11 22:35:09 joerg Exp $ DISTNAME= rtspd-src-1.0.0.0 PKGNAME= ra-rtsp-proxy-1.0.0.0 @@ -11,6 +11,8 @@ HOMEPAGE= http://service.real.com/firewall/fdev.html COMMENT= Proxy server for the RealAudio RTSP protocol LICENSE= no-commercial-use +PKG_DESTDIR_SUPPORT= user-destdir + RESTRICTED= ${LICENSE} NO_SRC_ON_FTP= ${RESTRICTED} NO_SRC_ON_CDROM= ${RESTRICTED} @@ -27,14 +29,13 @@ WRKSRC= ${WRKDIR}/rtspd-1.0.0.0a MAKE_ENV+= LOCAL_LIBS="-lsocket -lnsl" .endif -INSTALLATION_DIRS= etc/rc.d ${PKGMANDIR}/man8 sbin +INSTALLATION_DIRS= etc/rc.d ${PKGMANDIR}/man8 sbin share/doc/ra-rtsp-proxy do-install: - ${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_PROGRAM} ${WRKSRC}/rtspd ${PREFIX}/sbin - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ra-rtsp-proxy - ${INSTALL_DATA} ${WRKSRC}/license.txt ${PREFIX}/share/doc/ra-rtsp-proxy + ${INSTALL_MAN} ${WRKSRC}/rtspd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/rtspd ${DESTDIR}${PREFIX}/sbin + ${INSTALL_DATA} ${WRKSRC}/license.txt ${DESTDIR}${PREFIX}/share/doc/ra-rtsp-proxy @${SED} -e 's#/usr/local#${PREFIX}#g' <${WRKSRC}/README \ - >${PREFIX}/share/doc/ra-rtsp-proxy/README + >${DESTDIR}${PREFIX}/share/doc/ra-rtsp-proxy/README .include "../../mk/bsd.pkg.mk" diff --git a/net/radiusd-cistron/Makefile b/net/radiusd-cistron/Makefile index a3bf93395bf6..7651d03d3cee 100644 --- a/net/radiusd-cistron/Makefile +++ b/net/radiusd-cistron/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2007/12/22 12:39:57 obache Exp $ +# $NetBSD: Makefile,v 1.26 2010/02/11 22:37:49 joerg Exp $ DISTNAME= radiusd-cistron-1.6.8 CATEGORIES= net @@ -8,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.radius.cistron.nl/ COMMENT= RADIUS-compliant remote authentication and accounting server +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS+= freeradius-[0-9]* USE_TOOLS+= perl:run @@ -23,7 +25,7 @@ INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 \ RCD_SCRIPTS= radiusd -OWN_DIRS_PERMS= /var/log/radacct ${ROOT_USER} ${ROOT_GROUP} 700 +OWN_DIRS_PERMS= /var/log/radacct ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 700 PKG_SYSCONFSUBDIR= raddb EGDIR= ${PREFIX}/share/examples/raddb @@ -38,20 +40,20 @@ CONF_FILES+= ${EGDIR}/${cfile} ${PKG_SYSCONFDIR}/${cfile:S/.sample//} .endfor post-install: - ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${PREFIX}/share/doc/radiusd-cistron/ + ${INSTALL_DATA} ${WRKSRC}/COPYRIGHT ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/ .for i in ChangeLog README README.CVX README.Y2K README.cisco \ README.pam README.proxy README.radrelay README.simul \ README.tunnel README.usersfile - ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${PREFIX}/share/doc/radiusd-cistron/ + ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/radiusd-cistron/ .endfor .for i in radclient.1 radlast.1 radtest.1 radwho.1 radzap.1 - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man1/ + ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ .endfor .for i in clients.5rad naslist.5rad - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man5/ + ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ .endfor .for i in radiusd.8 radrelay.8 radwatch.8 - ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${PREFIX}/${PKGMANDIR}/man8/ + ${INSTALL_MAN} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ .endfor .include "../../mk/bsd.pkg.mk" diff --git a/net/radiusd-cistron/distinfo b/net/radiusd-cistron/distinfo index 448625a2d365..ce0a3ad54385 100644 --- a/net/radiusd-cistron/distinfo +++ b/net/radiusd-cistron/distinfo @@ -1,10 +1,10 @@ -$NetBSD: distinfo,v 1.8 2007/12/22 12:39:57 obache Exp $ +$NetBSD: distinfo,v 1.9 2010/02/11 22:37:49 joerg Exp $ SHA1 (radiusd-cistron-1.6.8.tar.gz) = 7938d5acbb994174baf662a4b4641367c4e1fd95 RMD160 (radiusd-cistron-1.6.8.tar.gz) = 06de37ca5e8a8354aaa7387255929388b49edb61 Size (radiusd-cistron-1.6.8.tar.gz) = 199459 bytes -SHA1 (patch-aa) = 53f331bde823f23a869c779df92a6e400a204746 -SHA1 (patch-ab) = a877e273f3d12228d4d0d6064115c5f55c044ad3 +SHA1 (patch-aa) = 7661709e49bf6797cfbbc86e45daf7be0f723d9a +SHA1 (patch-ab) = e04249a8953a473577c4467788726c2db1de89d3 SHA1 (patch-ac) = 95053cdb7cc8a1672d32a953147074ea948e535b SHA1 (patch-ad) = 1220fdb3141391f6c15b7bfba014baf1a372f3b6 SHA1 (patch-ae) = 2049cfa99b6392ed178e11e283b2749df819a35c diff --git a/net/radiusd-cistron/patches/patch-aa b/net/radiusd-cistron/patches/patch-aa index caf4d62b3c62..9c583c1ddcbc 100644 --- a/net/radiusd-cistron/patches/patch-aa +++ b/net/radiusd-cistron/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2003/12/16 19:19:41 martti Exp $ +$NetBSD: patch-aa,v 1.5 2010/02/11 22:37:49 joerg Exp $ --- src/Makefile.BSD.orig Thu Apr 10 13:38:23 2003 +++ src/Makefile.BSD Tue Dec 16 20:15:35 2003 @@ -27,9 +27,9 @@ $NetBSD: patch-aa,v 1.4 2003/12/16 19:19:41 martti Exp $ -SBINDIR = /usr/local/sbin -MANDIR = /usr/local/man -SHAREDIR = /usr/local/share/radius -+BINDIR = $(PREFIX)/bin -+SBINDIR = $(PREFIX)/sbin -+MANDIR = $(PREFIX)/man -+SHAREDIR = $(PREFIX)/share/examples/raddb ++BINDIR = ${DESTDIR}$(PREFIX)/bin ++SBINDIR = ${DESTDIR}$(PREFIX)/sbin ++MANDIR = ${DESTDIR}$(PREFIX)/man ++SHAREDIR = ${DESTDIR}$(PREFIX)/share/examples/raddb .include "Make.inc" diff --git a/net/radiusd-cistron/patches/patch-ab b/net/radiusd-cistron/patches/patch-ab index 84b53cfcae77..6b4e512088a8 100644 --- a/net/radiusd-cistron/patches/patch-ab +++ b/net/radiusd-cistron/patches/patch-ab @@ -1,4 +1,4 @@ -$NetBSD: patch-ab,v 1.4 2003/12/16 19:19:41 martti Exp $ +$NetBSD: patch-ab,v 1.5 2010/02/11 22:37:49 joerg Exp $ --- src/Make.inc.orig Thu Apr 10 13:51:47 2003 +++ src/Make.inc Tue Dec 16 20:10:28 2003 @@ -7,7 +7,7 @@ $NetBSD: patch-ab,v 1.4 2003/12/16 19:19:41 martti Exp $ # -RADIUS_DIR = /etc/raddb -+RADIUS_DIR = ${PREFIX}/share/examples/raddb ++RADIUS_DIR = ${DESTDIR}${PREFIX}/share/examples/raddb SERVER_OBJS = radiusd.o files.o acct.o pam.o version.o proxy.o \ exec.o auth.o timestr.o cache.o readusers.o diff --git a/net/rinetd/Makefile b/net/rinetd/Makefile index 522046707fa1..c9bea9c852ca 100644 --- a/net/rinetd/Makefile +++ b/net/rinetd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2007/01/08 21:12:31 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 22:38:12 joerg Exp $ # DISTNAME= rinetd @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.boutell.com/rinetd/ COMMENT= Internet redirection server +PKG_DESTDIR_SUPPORT= user-destdir + NO_CONFIGURE= yes BUILD_TARGET= rinetd @@ -31,7 +33,7 @@ do-build: cd ${WRKSRC} && env ${MAKE_ENV} cc ${CPPFLAGS} ${CFLAGS} -o rinetd *.c do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rinetd ${PREFIX}/sbin/. - ${INSTALL_MAN} ${WRKSRC}/rinetd.8 ${PREFIX}/${PKGMANDIR}/man8/. + ${INSTALL_PROGRAM} ${WRKSRC}/rinetd ${DESTDIR}${PREFIX}/sbin/. + ${INSTALL_MAN} ${WRKSRC}/rinetd.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/. .include "../../mk/bsd.pkg.mk" diff --git a/net/rootprobe/Makefile b/net/rootprobe/Makefile index a3661e55e2e1..4ea066494e3c 100644 --- a/net/rootprobe/Makefile +++ b/net/rootprobe/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:24 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 22:39:23 joerg Exp $ # DISTNAME= rootprobe-20030115 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://mawi.wide.ad.jp/mawi/dnsprobe/ COMMENT= Root DNS server performance analysis +PKG_DESTDIR_SUPPORT= user-destdir + NOT_FOR_PLATFORM= Interix-*-* # no support WRKSRC= ${WRKDIR}/rootprobe @@ -17,7 +19,7 @@ WRKSRC= ${WRKDIR}/rootprobe INSTALLATION_DIRS= bin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rootprobe ${PREFIX}/bin - (cd ${PREFIX}/bin; ${LN} rootprobe cctldprobe) + ${INSTALL_PROGRAM} ${WRKSRC}/rootprobe ${DESTDIR}${PREFIX}/bin + (cd ${DESTDIR}${PREFIX}/bin; ${LN} rootprobe cctldprobe) .include "../../mk/bsd.pkg.mk" diff --git a/net/scamper/Makefile b/net/scamper/Makefile index e2f79d265ed3..bcfeea6f05b2 100644 --- a/net/scamper/Makefile +++ b/net/scamper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2007/07/08 12:35:11 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 22:41:44 joerg Exp $ # DISTNAME= scamper-cvs-20060331 @@ -10,12 +10,14 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.wand.net.nz/scamper/ COMMENT= Dual-stack traceroute software +PKG_DESTDIR_SUPPORT= user-destdir + INSTALLATION_DIRS=bin MAKE_FLAGS+= WITH_DEBUG=yes # recommended by the the software developer do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/scamper ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/scamper ${DESTDIR}${PREFIX}/bin PKG_OPTIONS_VAR= PKG_OPTIONS.scamper PKG_OPTIONS_REQUIRED_GROUPS= inet6 # require inet6 capability diff --git a/net/sdig/Makefile b/net/sdig/Makefile index 3dd6a1669fd8..73363746cc9c 100644 --- a/net/sdig/Makefile +++ b/net/sdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2008/06/23 03:53:57 dholland Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/11 22:43:35 joerg Exp $ DISTNAME= sdig-0.30 PKGREVISION= 1 @@ -10,20 +10,22 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.exploits.org/sdig/ COMMENT= Switch Digger finds port assignment for hosts on a switched Ethernet +PKG_DESTDIR_SUPPORT= user-destdir + SUBST_CLASSES+= sdig SUBST_STAGE.sdig= post-build SUBST_MESSAGE.sdig= Inserting the correct prefix directory. SUBST_FILES.sdig= sdig.conf SUBST_SED.sdig= -e 's,\$${PREFIX},${PREFIX},g' -INSTALLATION_DIRS+= ${PKGMANDIR}/man8 ${PKGMANDIR}/man5 share/doc \ +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man8 ${PKGMANDIR}/man5 share/doc \ share/examples share/misc post-install: - ${INSTALL_DATA} ${WRKSRC}/sdig.conf ${PREFIX}/share/examples/ - ${INSTALL_DATA} ${WRKDIR}/mactable ${PREFIX}/share/misc/ - ${INSTALL_DATA} ${WRKSRC}/sdig.8 ${PREFIX}/${PKGMANDIR}/man8/ - ${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${PREFIX}/${PKGMANDIR}/man5/ + ${INSTALL_DATA} ${WRKSRC}/sdig.conf ${DESTDIR}${PREFIX}/share/examples/ + ${INSTALL_DATA} ${WRKDIR}/mactable ${DESTDIR}${PREFIX}/share/misc/ + ${INSTALL_DATA} ${WRKSRC}/sdig.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/ + ${INSTALL_DATA} ${WRKSRC}/sdig.conf.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5/ .include "../../net/net-snmp/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/sdig/distinfo b/net/sdig/distinfo index 8030a361c929..cd6ec2c9a6fa 100644 --- a/net/sdig/distinfo +++ b/net/sdig/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:14:03 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/02/11 22:43:35 joerg Exp $ SHA1 (sdig-0.30.tar.gz) = 5af0f6adbadee33b91a45cffcfd13587ad5fa3a0 RMD160 (sdig-0.30.tar.gz) = ec8c433352170aefaf8b74152df7da850349943a @@ -6,6 +6,6 @@ Size (sdig-0.30.tar.gz) = 25301 bytes SHA1 (mactable.gz) = afe9c24c45c5472c9e78d2a8d72fcdc18d43563d RMD160 (mactable.gz) = 1222c7b06a441c5ab4755c4525a55ca0a84442e3 Size (mactable.gz) = 36490 bytes -SHA1 (patch-aa) = 88e2c8be232c2666eed66400b31bef59ff4eb8b2 +SHA1 (patch-aa) = f70967610ce3aadc5e67d82cbf8d0d5325cf9c8c SHA1 (patch-ab) = 3b2d671d7d0ca66f8afe5c55bf075c6b62a9c95a SHA1 (patch-ac) = 0e5304f2d774ae8932ba5694b511410d52314f85 diff --git a/net/sdig/patches/patch-aa b/net/sdig/patches/patch-aa index ab8af608807c..6a6ab76031d3 100644 --- a/net/sdig/patches/patch-aa +++ b/net/sdig/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2003/04/07 15:01:22 bouyer Exp $ +$NetBSD: patch-aa,v 1.3 2010/02/11 22:43:35 joerg Exp $ --- Makefile.orig Tue Jul 23 04:56:11 2002 +++ Makefile Wed Apr 2 18:58:25 2003 @@ -43,6 +43,6 @@ $NetBSD: patch-aa,v 1.2 2003/04/07 15:01:22 bouyer Exp $ - else \ - cp sdig.conf /etc; \ - fi -+ ${BSD_INSTALL_PROGRAM} sdig ${PREFIX}/bin -+ ${BSD_INSTALL_PROGRAM} nbname ${PREFIX}/bin -+ ${BSD_INSTALL_DATA} README ${PREFIX}/share/doc/sdig.README ++ ${BSD_INSTALL_PROGRAM} sdig ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_PROGRAM} nbname ${DESTDIR}${PREFIX}/bin ++ ${BSD_INSTALL_DATA} README ${DESTDIR}${PREFIX}/share/doc/sdig.README diff --git a/net/sitescooper/Makefile b/net/sitescooper/Makefile index ade2467f0ab6..25586e22939b 100644 --- a/net/sitescooper/Makefile +++ b/net/sitescooper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/01/07 09:14:06 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2010/02/11 22:46:38 joerg Exp $ # DISTNAME= sitescooper-2.2.8 @@ -10,6 +10,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://sitescooper.cx/ COMMENT= Retrieve stories from websites and convert to Palm readable format +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= p5-libwww>=5.46:../../www/p5-libwww DEPENDS+= pilotmgr-[0-9]*:../../comms/pilotmgr @@ -19,7 +21,8 @@ NO_BUILD= yes CONF_FILES+= ${PREFIX}/share/examples/sitescooper/sitescooper.cf \ ${PREFIX}/etc/sitescooper.cf \ -INSTALLATION_DIRS= bin etc ${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin etc ${PKGMANDIR}/man1 share/doc/sitescooper \ + share/examples/sitescooper share/sitescooper/lib do-configure: .for file in sitescooper rss-to-site subs-to-site @@ -37,19 +40,16 @@ do-configure: do-install: .for file in sitescooper rss-to-site subs-to-site - ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${PREFIX}/${PKGMANDIR}/man1/${file}.1 + ${INSTALL_SCRIPT} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/doc/${file}.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/${file}.1 .endfor - ${INSTALL_DATA_DIR} ${PREFIX}/share/sitescooper/lib - ${CP} -R ${WRKSRC}/site_samples ${PREFIX}/share/sitescooper - ${CP} -R ${WRKSRC}/lib/* ${PREFIX}/share/sitescooper/lib - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/sitescooper - ${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/sitescooper + ${CP} -R ${WRKSRC}/site_samples ${DESTDIR}${PREFIX}/share/sitescooper + ${CP} -R ${WRKSRC}/lib/* ${DESTDIR}${PREFIX}/share/sitescooper/lib + ${CP} -R ${WRKSRC}/doc/* ${DESTDIR}${PREFIX}/share/doc/sitescooper .for file in CHANGES.txt README.txt sitescooper.spec - ${INSTALL_DATA} ${WRKSRC}/${file} ${PREFIX}/share/doc/sitescooper + ${INSTALL_DATA} ${WRKSRC}/${file} ${DESTDIR}${PREFIX}/share/doc/sitescooper .endfor - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/sitescooper ${INSTALL_DATA} ${WRKSRC}/sitescooper.cf \ - ${PREFIX}/share/examples/sitescooper/sitescooper.cf + ${DESTDIR}${PREFIX}/share/examples/sitescooper/sitescooper.cf .include "../../mk/bsd.pkg.mk" diff --git a/net/slurm/Makefile b/net/slurm/Makefile index ed734c38f256..a95a26161832 100644 --- a/net/slurm/Makefile +++ b/net/slurm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2009/05/19 21:16:27 obache Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/11 22:47:52 joerg Exp $ # DISTNAME= slurm-0.3.3 @@ -9,16 +9,18 @@ MAINTAINER= mail@eckigesauge.de HOMEPAGE= http://www.raisdorf.net/projects/slurm/ COMMENT= Realtime traffic statistics +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/slurm do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/slurm ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${PREFIX}/${PKGMANDIR}/man1 - ${INSTALL_DATA_DIR} ${PREFIX}/share/slurm - for theme in black blue cyan foo; do \ - ${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme ${PREFIX}/share/slurm ; \ + ${INSTALL_PROGRAM} ${WRKSRC}/slurm ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/slurm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + for theme in black blue cyan foo; do \ + ${INSTALL_DATA} ${WRKSRC}/themes/$${theme}.theme \ + ${DESTDIR}${PREFIX}/share/slurm ; \ done .include "../../devel/ncurses/buildlink3.mk" diff --git a/net/sniffit/Makefile b/net/sniffit/Makefile index f13d1ec6525a..b10a0d688d3b 100644 --- a/net/sniffit/Makefile +++ b/net/sniffit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:06 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2010/02/11 22:47:49 joerg Exp $ # DISTNAME= sniffit.0.3.5 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://reptile.rug.ac.be/~coder/sniffit/sniffit.html COMMENT= Packet sniffer program +PKG_DESTDIR_SUPPORT= user-destdir + NOT_FOR_PLATFORM= *-*-alpha # severe LP64 loss GNU_CONFIGURE= YES @@ -18,9 +20,9 @@ BUILD_TARGET= INSTALLATION_DIRS= ${PKGMANDIR}/man5 ${PKGMANDIR}/man8 sbin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${PREFIX}/sbin/sniffit - ${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${PREFIX}/${PKGMANDIR}/man5 - ${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/sniffit ${DESTDIR}${PREFIX}/sbin/sniffit + ${INSTALL_MAN} ${WRKSRC}/sniffit.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 + ${INSTALL_MAN} ${WRKSRC}/sniffit.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile index 72ffdec61f1e..41ef49c941d0 100644 --- a/net/speedtouch/Makefile +++ b/net/speedtouch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2009/08/25 11:57:45 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2010/02/11 22:50:54 joerg Exp $ DISTNAME= speedtouch-1.3.1 PKGREVISION= 4 @@ -6,6 +6,8 @@ CATEGORIES= net MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=speedtouch/} DISTFILES= ${DISTNAME}.tar.bz2 +PKG_DESTDIR_SUPPORT= user-destdir + # # Firmware license and link from: # http://www.speedtouch.com/driver_upgrade_lx_3.0.1.2.htm @@ -45,6 +47,8 @@ pre-extract: SAMPLECONF= ${WRKSRC}/doc-bsd/ppp.conf.sample INSTALLATION_DIRS= libdata/speedtouch +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ + mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} post-build: ${CP} ${SAMPLECONF} ${SAMPLECONF}.pre diff --git a/net/stripes/Makefile b/net/stripes/Makefile index ebe81e74540a..c219b5eff6cb 100644 --- a/net/stripes/Makefile +++ b/net/stripes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/10/17 07:00:19 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 22:50:43 joerg Exp $ # DISTNAME= stripes-2.1 @@ -9,6 +9,8 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://www.gw.com/sw/stripes/ COMMENT= Looking Glass for Zebra and Cisco Routers +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= {p5-CGI>=2.66,perl>=5.6.1nb2}:../../www/p5-CGI DEPENDS+= p5-Net-Telnet>=3.02:../../net/p5-Net-Telnet @@ -23,4 +25,8 @@ REPLACE_PERL= lg.pl INSTALLATION_DIRS= libexec/cgi-bin ${PKGMANDIR}/man8 +do-install: + ${INSTALL_SCRIPT} ${WRKSRC}/lg ${DESTDIR}${PREFIX}/libexec/cgi-bin + ${INSTALL_MAN} ${WRKSRC}/lg.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + .include "../../mk/bsd.pkg.mk" diff --git a/net/sup/Makefile b/net/sup/Makefile index 4f82ba8da2ac..16706f248c8a 100644 --- a/net/sup/Makefile +++ b/net/sup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2008/05/30 14:25:26 christos Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 22:52:52 joerg Exp $ # DISTNAME= sup-0.3 @@ -8,6 +8,8 @@ MASTER_SITES= ftp://ftp.astron.com/pub/sup/ MAINTAINER= christos@NetBSD.org COMMENT= Network file distribution/synchronisation utility -AUTO_MKDIRS= yes +PKG_DESTDIR_SUPPORT= user-destdir + +INSTALLATION_DIRS+= sbin ${PKGMANDIR}/man1 ${PKGMANDIR}/man8 .include "../../mk/bsd.pkg.mk" diff --git a/net/sup/distinfo b/net/sup/distinfo index 5fd144381755..04e588c6f329 100644 --- a/net/sup/distinfo +++ b/net/sup/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.8 2009/07/20 18:19:25 hasso Exp $ +$NetBSD: distinfo,v 1.9 2010/02/11 22:52:52 joerg Exp $ SHA1 (sup-0.3.tar.gz) = 4672de4c7ab2b7b382acfd1b39efb83536b485ae RMD160 (sup-0.3.tar.gz) = 81a0c200a0c82bf57e5f258a2b99ccad5db56c65 Size (sup-0.3.tar.gz) = 95124 bytes -SHA1 (patch-aa) = 75aa0c905c7dc72832cc2a6861bdef66f000fa34 +SHA1 (patch-aa) = 2281eec2a4c2ff3501b3507caf9161cc45e73330 SHA1 (patch-ab) = 94801c8650bd6920a1b58d07abf24445ac9245f7 diff --git a/net/sup/patches/patch-aa b/net/sup/patches/patch-aa index f837acabcdcc..9461b9f8172d 100644 --- a/net/sup/patches/patch-aa +++ b/net/sup/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.2 2007/12/20 20:29:37 christos Exp $ +$NetBSD: patch-aa,v 1.3 2010/02/11 22:52:52 joerg Exp $ --- Makefile.orig 2007-12-20 15:16:34.000000000 -0500 +++ Makefile 2007-12-20 15:21:40.000000000 -0500 @@ -20,9 +20,9 @@ $NetBSD: patch-aa,v 1.2 2007/12/20 20:29:37 christos Exp $ - install -cs -m 555 -o bin -g bin ${PROGRAMS} ${NETBSD_BINDIR} - install -c -m 444 -o bin -g bin ${MAN1} ${NETBSD_MAN1} - install -c -m 444 -o bin -g bin ${MAN8} ${NETBSD_MAN8} -+ ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${NETBSD_BINDIR} -+ ${BSD_INSTALL_MAN} ${MAN1} ${NETBSD_MAN1} -+ ${BSD_INSTALL_MAN} ${MAN8} ${NETBSD_MAN8} ++ ${BSD_INSTALL_PROGRAM} ${PROGRAMS} ${DESTDIR}${NETBSD_BINDIR} ++ ${BSD_INSTALL_MAN} ${MAN1} ${DESTDIR}${NETBSD_MAN1} ++ ${BSD_INSTALL_MAN} ${MAN8} ${DESTDIR}${NETBSD_MAN8} netcrypt.c: @echo "[ Using netcryptvoid.c ]" diff --git a/net/tcpdmerge/Makefile b/net/tcpdmerge/Makefile index 208c2eaf56bd..c111597a7334 100644 --- a/net/tcpdmerge/Makefile +++ b/net/tcpdmerge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2006/11/09 09:36:41 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/11 22:54:36 joerg Exp $ DISTNAME= tcpdmerge-1.0 CATEGORIES= net @@ -9,8 +9,13 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://phantom.nemoto.ecei.tohoku.ac.jp/~akiraka/tcpdmerge/ COMMENT= Merge two tcpdump output files +PKG_DESTDIR_SUPPORT= user-destdir + +USE_BSD_MAKEFILE= yes + WRKSRC= ${WRKDIR} -MAKE_ENV+= ${BSD_MAKE_ENV} + +INSTALLATION_DIRS+= bin post-extract: cp ${FILESDIR}/Makefile ${WRKSRC} diff --git a/net/tcpdstat/Makefile b/net/tcpdstat/Makefile index 6b429ca46650..bad139fcb5fd 100644 --- a/net/tcpdstat/Makefile +++ b/net/tcpdstat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2006/03/04 21:30:24 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2010/02/11 22:57:40 joerg Exp $ DISTNAME= tcpd-tools-0.8 PKGNAME= tcpdstat-0.8 @@ -8,9 +8,15 @@ MASTER_SITES= ftp://tracer.csl.sony.co.jp/pub/mawi/tools/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Analyze tcpdump output +PKG_DESTDIR_SUPPORT= user-destdir + NOT_FOR_PLATFORM= Interix-*-* WRKSRC= ${WRKDIR}/${DISTNAME}/tcpdstat -MAKE_ENV+= BINDIR=${PREFIX:Q}/bin + +INSTALLATION_DIRS= bin + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/tcpdstat ${DESTDIR}${PREFIX}/bin .include "../../mk/bsd.pkg.mk" diff --git a/net/tcpillust/Makefile b/net/tcpillust/Makefile index 0d67d599be80..6ae581f49d08 100644 --- a/net/tcpillust/Makefile +++ b/net/tcpillust/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/12/02 13:04:13 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2010/02/11 22:59:24 joerg Exp $ DISTNAME= tcpillust-1.0a PKGREVISION= 4 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.sonycsl.co.jp/person/nishida/tcpillust.html COMMENT= Graphical TCP connection analysis tool +PKG_DESTDIR_SUPPORT= user-destdir + USE_IMAKE= yes GNU_CONFIGURE= yes @@ -20,14 +22,14 @@ CONFIGURE_ARGS+=--with-tk-lib=${BUILDLINK_PREFIX.tk}/lib DOCS= README SAMPLES= tcpclient.log tcpserver.log +INSTALLATION_DIRS+= share/doc/tcpillust/sample + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpillust for i in ${DOCS}; do \ - ${INSTALL_DATA} ${WRKSRC}/$$i ${PREFIX}/share/doc/tcpillust; \ + ${INSTALL_DATA} ${WRKSRC}/$$i ${DESTDIR}${PREFIX}/share/doc/tcpillust; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcpillust/sample for i in ${SAMPLES}; do \ - ${INSTALL_DATA} ${WRKSRC}/sample/$$i ${PREFIX}/share/doc/tcpillust/sample; \ + ${INSTALL_DATA} ${WRKSRC}/sample/$$i ${DESTDIR}${PREFIX}/share/doc/tcpillust/sample; \ done .include "../../lang/tcl/buildlink3.mk" diff --git a/net/tcptrace/Makefile b/net/tcptrace/Makefile index 989aa20f4f5c..718df9bffaf3 100644 --- a/net/tcptrace/Makefile +++ b/net/tcptrace/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2007/01/07 09:14:07 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2010/02/11 22:59:14 joerg Exp $ DISTNAME= tcptrace-6.6.7 CATEGORIES= net @@ -8,6 +8,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.tcptrace.org/ COMMENT= TCP dump file analysis tool +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes BUILD_TARGET= tcptrace @@ -16,14 +18,13 @@ DOCFILES= COPYRIGHT FAQ README README.tput_graphs LDFLAGS.SunOS+= -lm -INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 +INSTALLATION_DIRS= bin ${PKGMANDIR}/man1 share/doc/tcptrace do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${PREFIX}/bin - ${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${PREFIX}/${PKGMANDIR}/man1/tcptrace.1 - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/tcptrace + ${INSTALL_PROGRAM} ${WRKSRC}/tcptrace ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/tcptrace.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/tcptrace.1 .for f in ${DOCFILES} - ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/tcptrace + ${INSTALL_DATA} ${WRKSRC}/${f} ${DESTDIR}${PREFIX}/share/doc/tcptrace .endfor .include "../../archivers/bzip2/buildlink3.mk" diff --git a/net/tcptraceroute/Makefile b/net/tcptraceroute/Makefile index 33604f6e2bcd..c2add8a7cd82 100644 --- a/net/tcptraceroute/Makefile +++ b/net/tcptraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2007/03/02 09:28:55 adrianp Exp $ +# $NetBSD: Makefile,v 1.15 2010/02/11 23:00:57 joerg Exp $ # DISTNAME= tcptraceroute-1.4 @@ -10,11 +10,14 @@ MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://michael.toren.net/code/tcptraceroute/ COMMENT= Traceroute implementation using TCP packets +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_TARGET= tcptraceroute BUILDLINK_API_DEPENDS.libnet10+= libnet10>=1.0.2anb1 DOCDIR= ${PREFIX}/share/doc/tcptraceroute -BINMODE= 4711 + +SPECIAL_PERMS+= sbin/tcptraceroute ${SETUID_ROOT_PERMS} .include "../../mk/bsd.prefs.mk" @@ -24,13 +27,12 @@ SUBST_FILES.conf= Makefile SUBST_SED.conf= -e "s|libnet-config|libnet10-config|g" SUBST_MESSAGE.conf= Fixing configuration script. -INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin +INSTALLATION_DIRS= ${PKGMANDIR}/man8 sbin ${DOCDIR} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${PREFIX}/sbin - ${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${PREFIX}/${PKGMANDIR}/man8 - ${INSTALL_DATA_DIR} ${DOCDIR} - ${INSTALL_DATA} ${WRKSRC}/examples.txt ${DOCDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/tcptraceroute ${DESTDIR}${PREFIX}/sbin + ${INSTALL_MAN} ${WRKSRC}/tcptraceroute.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_DATA} ${WRKSRC}/examples.txt ${DESTDIR}${DOCDIR} .include "../../devel/libnet10/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" diff --git a/net/ttt/Makefile b/net/ttt/Makefile index b4e52196ed82..f30e77de1cbf 100644 --- a/net/ttt/Makefile +++ b/net/ttt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2007/12/02 13:04:13 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2010/02/11 23:06:39 joerg Exp $ # DISTNAME= ttt-1.8.2 @@ -9,9 +9,15 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.sonycsl.co.jp/person/kjc/software.html COMMENT= Tele Traffic Tapper +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 INSTALL_TARGET= install install-man +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ + exec_prefix=${DESTDIR}${PREFIX} \ + mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} .include "../../mk/bsd.prefs.mk" diff --git a/net/ucarp/Makefile b/net/ucarp/Makefile index 60a4df5909f7..6a0c5f240933 100644 --- a/net/ucarp/Makefile +++ b/net/ucarp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2007/02/22 19:01:24 wiz Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 23:06:05 joerg Exp $ # DISTNAME= ucarp-1.1 @@ -11,6 +11,8 @@ MAINTAINER= joel@carnat.net HOMEPAGE= http://www.ucarp.org/project/ucarp COMMENT= Common Address Redundancy Protocol (CARP) for Unix +PKG_DESTDIR_SUPPORT= user-destdir + USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES USE_TOOLS+= msgfmt @@ -18,14 +20,14 @@ USE_TOOLS+= msgfmt # pcap_freecode with one argument only BUILDLINK_API_DEPENDS.libpcap+= libpcap>=0.6.0 +INSTALLATION_DIRS+= share/doc/ucarp share/examples/ucarp + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ucarp for DOC in AUTHORS COPYING NEWS README; do \ - ${INSTALL_DATA} ${WRKSRC}/$$DOC ${PREFIX}/share/doc/ucarp; \ + ${INSTALL_DATA} ${WRKSRC}/$$DOC ${DESTDIR}${PREFIX}/share/doc/ucarp; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ucarp ${INSTALL_SCRIPT} ${WRKSRC}/examples/bsd/*sh \ - ${PREFIX}/share/examples/ucarp + ${DESTDIR}${PREFIX}/share/examples/ucarp .include "../../devel/gettext-lib/buildlink3.mk" .include "../../net/libpcap/buildlink3.mk" diff --git a/net/udptunnel/Makefile b/net/udptunnel/Makefile index 556c75402b05..04dfebca8d3c 100644 --- a/net/udptunnel/Makefile +++ b/net/udptunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2006/10/04 21:53:18 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2010/02/11 23:07:16 joerg Exp $ # DISTNAME= udptunnel-1.1 @@ -10,10 +10,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www1.cs.columbia.edu/~lennox/udptunnel/ COMMENT= Tunnel UDP packets over a TCP connection +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES INSTALLATION_DIRS= bin share/doc/html post-install: - ${INSTALL_DATA} ${WRKSRC}/udptunnel.html ${PREFIX}/share/doc/html/ + ${INSTALL_DATA} ${WRKSRC}/udptunnel.html ${DESTDIR}${PREFIX}/share/doc/html/ .include "../../mk/bsd.pkg.mk" diff --git a/net/upclient/Makefile b/net/upclient/Makefile index de34ceb489e6..6d127d7973b8 100644 --- a/net/upclient/Makefile +++ b/net/upclient/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2006/03/04 21:30:25 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2010/02/11 23:08:17 joerg Exp $ # DISTNAME= upclient-4.2.1.23 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://uptimes.hostingwired.com/ COMMENT= Keeps track of your server uptime, and compares it to other hosts +PKG_DESTDIR_SUPPORT= user-destdir + .include "../../mk/bsd.prefs.mk" .if ${OPSYS} == "DragonFly" @@ -26,7 +28,7 @@ RCD_SCRIPTS= upclient BUILD_DIRS= ${WRKSRC}/src -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin share/doc/upclient ${EGDIR} pre-configure: ${MV} ${WRKSRC}/scripts/upchk ${WRKSRC}/scripts/upchk.bak @@ -35,15 +37,13 @@ pre-configure: >${WRKSRC}/scripts/upchk <${WRKSRC}/scripts/upchk.bak do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/upclient ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/upclient - ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${PREFIX}/share/doc/upclient - ${INSTALL_DATA} ${WRKSRC}/COPYING ${PREFIX}/share/doc/upclient - ${INSTALL_DATA} ${WRKSRC}/HISTORY ${PREFIX}/share/doc/upclient - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/upclient - ${INSTALL_DATA} ${WRKSRC}/FAQ ${PREFIX}/share/doc/upclient - ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/upclient - ${INSTALL_DATA_DIR} ${EGDIR} - ${INSTALL_DATA} ${WRKSRC}/conf/upclient.conf ${EGDIR} + ${INSTALL_PROGRAM} ${WRKSRC}/src/upclient ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/AUTHORS ${DESTDIR}${PREFIX}/share/doc/upclient + ${INSTALL_DATA} ${WRKSRC}/COPYING ${DESTDIR}${PREFIX}/share/doc/upclient + ${INSTALL_DATA} ${WRKSRC}/HISTORY ${DESTDIR}${PREFIX}/share/doc/upclient + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/upclient + ${INSTALL_DATA} ${WRKSRC}/FAQ ${DESTDIR}${PREFIX}/share/doc/upclient + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/upclient + ${INSTALL_DATA} ${WRKSRC}/conf/upclient.conf ${DESTDIR}${EGDIR} .include "../../mk/bsd.pkg.mk" diff --git a/net/wimon/Makefile b/net/wimon/Makefile index 1e077a548226..63748eeed7fa 100644 --- a/net/wimon/Makefile +++ b/net/wimon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/02/22 19:27:01 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/11 23:08:34 joerg Exp $ # DISTNAME= wimon-0.3 @@ -10,6 +10,7 @@ MAINTAINER= imil@gcu.info HOMEPAGE= http://imil.net/wimon/ COMMENT= Tool that shows a real-time graph of your wireless connection +PKG_DESTDIR_SUPPORT= user-destdir PKG_INSTALLATION_TYPES= overwrite pkgviews ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* OpenBSD-*-* DragonFly-*-* @@ -22,8 +23,8 @@ WRKSRC= ${WRKDIR}/wimon INSTALLATION_DIRS= bin ${PKGMANDIR}/man8 do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/wimon ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/wimon.8 ${PREFIX}/${PKGMANDIR}/man8 + ${INSTALL_PROGRAM} ${WRKSRC}/wimon ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/wimon.8 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8 .include "../../devel/ncurses/buildlink3.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/net/wistumbler/Makefile b/net/wistumbler/Makefile index 064b10491fc8..c25cec69cf7f 100644 --- a/net/wistumbler/Makefile +++ b/net/wistumbler/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2006/03/04 21:30:26 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2010/02/11 23:12:21 joerg Exp $ DISTNAME= wistumbler-20020816 PKGNAME= wistumbler-20020816.0 @@ -10,11 +10,19 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://gongon.com/persons/iseki/wistumbler/ COMMENT= Network stumbler for WaveLAN/IEEE wireless networking +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/wistumbler NOT_FOR_PLATFORM= NetBSD-0.*-* NetBSD-1.[01234]*-* NetBSD-1.5-* NOT_FOR_PLATFORM+= NetBSD-1.5.*-* NetBSD-1.5[A-V]-* NOT_FOR_PLATFORM+= Interix-*-* +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/wistumbler ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/wistumbler.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/wmget/Makefile b/net/wmget/Makefile index 4c6d9217ed92..564d53ec6369 100644 --- a/net/wmget/Makefile +++ b/net/wmget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2010/01/17 12:02:36 wiz Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/11 23:12:10 joerg Exp $ DISTNAME= wmget-0.6.0-src PKGNAME= ${DISTNAME:S/-src//} @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://amtrickey.net/wmget/index.html COMMENT= Background download manager in a Window Maker dock app +PKG_DESTDIR_SUPPORT= user-destdir + SUBST_CLASSES+= ldflags SUBST_MESSAGE.ldflags= Fixing hardcoded LDFLAGS. SUBST_STAGE.ldflags= pre-configure @@ -25,6 +27,12 @@ SUBST_SED.paths= -e 's|^PREFIX=.*|PREFIX=${LOCALBASE}|' USE_TOOLS+= gmake +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/wmget ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/wmget.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + .include "../../www/curl/buildlink3.mk" .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/net/wminet/Makefile b/net/wminet/Makefile index a663de4f4767..9b0f8b429826 100644 --- a/net/wminet/Makefile +++ b/net/wminet/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/12/27 13:37:39 joerg Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 23:13:17 joerg Exp $ DISTNAME= wmnet-1.2 PKGNAME= wminet-1.2 @@ -10,10 +10,18 @@ MAINTAINER= coto@core.de HOMEPAGE= http://users.rcn.com/rneswold/ COMMENT= Dockable network monitor +PKG_DESTDIR_SUPPORT= user-destdir + NOT_FOR_PLATFORM= Interix-*-* # no userland protocol stack support USE_X11BASE= YES +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/wminet ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/wminet.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" diff --git a/net/wu-ftpd/Makefile b/net/wu-ftpd/Makefile index bd5f397fa668..5e752f70e642 100644 --- a/net/wu-ftpd/Makefile +++ b/net/wu-ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2009/05/01 13:21:51 zafer Exp $ +# $NetBSD: Makefile,v 1.34 2010/02/11 23:14:14 joerg Exp $ DISTNAME= wu-ftpd-2.6.2 PKGREVISION= 3 @@ -18,6 +18,8 @@ MAINTAINER= rh@NetBSD.org HOMEPAGE= http://www.wu-ftpd.org/ COMMENT= Replacement ftp server for Un*x systems +PKG_DESTDIR_SUPPORT= user-destdir + CONFLICTS= wu-ftpd-vr-[0-9]* CONFLICTS+= beroftpd-[0-9]* CONFLICTS+= kth-krb4-[0-9]* diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index 5e8929f3da9a..6eb6163ad7dc 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2009/06/14 22:58:07 joerg Exp $ +# $NetBSD: Makefile,v 1.33 2010/02/11 23:18:29 joerg Exp $ # DISTNAME= xipdump-1.5.4 @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.lse.epita.fr/twiki/bin/view/Projects/XipDump COMMENT= Displays IP packets using X Window System +PKG_DESTDIR_SUPPORT= user-destdir + PLIST_SRC= ${WRKDIR}/PLIST USE_X11BASE= yes @@ -19,6 +21,8 @@ CFLAGS+= -I${PREFIX}/include LIBS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lnet INSTALLATION_DIRS= bin lib/X11/app-defaults ${PKGMANDIR}/man8 +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ + mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} post-build: @${CP} ${PKGDIR}/PLIST ${PLIST_SRC} @@ -26,12 +30,12 @@ post-build: ${SED} -e 's|^|share/xipdump/|' >> ${PLIST_SRC}) post-install: - ${FIND} ${PREFIX}/share/xipdump -name *.pkc | \ + ${FIND} ${DESTDIR}${PREFIX}/share/xipdump -name *.pkc | \ ${XARGS} ${CHMOD} ${DOCMODE} - ${FIND} ${PREFIX}/share/xipdump -name *.pkt | \ + ${FIND} ${DESTDIR}${PREFIX}/share/xipdump -name *.pkt | \ ${XARGS} ${CHMOD} ${DOCMODE} - ${CHMOD} ${MANMODE} ${PREFIX}/${PKGMANDIR}/man8/xipdump.8 - ${CHMOD} ${SHAREMODE} ${PREFIX}/lib/X11/app-defaults/Xipdump + ${CHMOD} ${MANMODE} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/xipdump.8 + ${CHMOD} ${SHAREMODE} ${DESTDIR}${PREFIX}/lib/X11/app-defaults/Xipdump .include "../../devel/libnet10/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" diff --git a/net/xipdump/distinfo b/net/xipdump/distinfo index 0b00ac9d81b0..fbcbe6dfb905 100644 --- a/net/xipdump/distinfo +++ b/net/xipdump/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.5 2006/02/24 01:34:36 joerg Exp $ +$NetBSD: distinfo,v 1.6 2010/02/11 23:18:29 joerg Exp $ SHA1 (xipdump-1.5.4.tgz) = 8fa152cc9114fb3862a223be47e104394f00b250 RMD160 (xipdump-1.5.4.tgz) = 4202c4c3ac7a749d1b7a25caa9577a6529ee87df @@ -7,5 +7,5 @@ SHA1 (patch-aa) = 4dc89157456a3d223456babcbdca4ac501b6a664 SHA1 (patch-ab) = 5018ade12779648836a866be510fc42af54162f2 SHA1 (patch-ac) = 71c25f1fe5bb52667902c5a10f2a56d8809eb560 SHA1 (patch-ad) = 0c7bd3c0be1bffe19a7823add4c5c2ae3ff29ba3 -SHA1 (patch-ae) = 57d725a8f458799dc2a9b68a897c7d4bd1b6d435 +SHA1 (patch-ae) = 7653b883f53ec90a231fa25d506f51f8cb75470a SHA1 (patch-af) = 115aca8ae051caf44accb9b8d2a7acd691cd78fc diff --git a/net/xipdump/patches/patch-ae b/net/xipdump/patches/patch-ae index a2df5ffc7206..912dd2e4d9dd 100644 --- a/net/xipdump/patches/patch-ae +++ b/net/xipdump/patches/patch-ae @@ -1,4 +1,4 @@ -$NetBSD: patch-ae,v 1.1 2002/06/27 20:52:07 agc Exp $ +$NetBSD: patch-ae,v 1.2 2010/02/11 23:18:29 joerg Exp $ --- Makefile.in 2002/06/27 20:47:49 1.1 +++ Makefile.in 2002/06/27 20:49:00 @@ -7,7 +7,7 @@ $NetBSD: patch-ae,v 1.1 2002/06/27 20:52:07 agc Exp $ $(INSTALL) data/pkt/* $(datadir)/xipdump/pkt $(INSTALL) data/pkc/* $(datadir)/xipdump/pkc - $(INSTALL) Xipdump.ad @APP_DEFAULTS_DIR@/Xipdump -+ $(INSTALL) Xipdump.ad @prefix@/lib/X11/app-defaults/Xipdump ++ $(INSTALL) Xipdump.ad ${DESTDIR}@prefix@/lib/X11/app-defaults/Xipdump .SUFFIXES: .E .w diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile index a7a3d211fa2c..522dca4d0cfd 100644 --- a/net/xmftp/Makefile +++ b/net/xmftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2006/12/15 20:33:00 joerg Exp $ +# $NetBSD: Makefile,v 1.16 2010/02/11 23:21:26 joerg Exp $ # DISTNAME= xmftp-1.0.4 @@ -10,15 +10,16 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://viraj.org/old/xmftp/ COMMENT= X/Motif FTP client +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/xmftp/source USE_X11BASE= yes USE_TOOLS+= gmake -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin share/doc/xmftp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xmftp ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xmftp + ${INSTALL_PROGRAM} ${WRKSRC}/xmftp ${DESTDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/../BUGS ${PREFIX}/share/doc/xmftp ${INSTALL_DATA} ${WRKSRC}/../CHANGES ${PREFIX}/share/doc/xmftp ${INSTALL_DATA} ${WRKSRC}/../FAQ ${PREFIX}/share/doc/xmftp diff --git a/net/xnap/Makefile b/net/xnap/Makefile index 3a2403f9f789..97d2788f641e 100644 --- a/net/xnap/Makefile +++ b/net/xnap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2007/02/22 19:27:01 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2010/02/11 23:23:11 joerg Exp $ # DISTNAME= xnap-2.0 @@ -10,9 +10,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://xnap.sourceforge.net/ COMMENT= Java filesharing client with support for OpenNap +PKG_DESTDIR_SUPPORT= user-destdir + NO_BUILD= yes -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin share/xnap share/doc/xnap post-extract: cd ${WRKSRC} && ${MV} xnap.sh xnap.sh.in @@ -22,12 +24,9 @@ pre-configure: -e 's|@PREFIX@|${PREFIX}|g' < xnap.sh.in > xnap.sh do-install: - ${CP} ${WRKSRC}/xnap.sh ${PREFIX}/bin/xnap - ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/xnap - ${CP} ${WRKSRC}/xnap.jar ${PREFIX}/share/xnap/xnap.jar - ${INSTALL_PROGRAM_DIR} ${PREFIX}/share/doc/xnap - ${CP} ${WRKSRC}/README ${PREFIX}/share/doc/xnap - ${CHOWN} -R ${BINOWN}:${BINGRP} ${PREFIX}/share/xnap ${PREFIX}/share/doc/xnap + ${INSTALL_SCRIPT} ${WRKSRC}/xnap.sh ${DESTDIR}${PREFIX}/bin/xnap + ${INSTALL_DATA} ${WRKSRC}/xnap.jar ${PREFIX}/share/xnap/xnap.jar + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/xnap .include "../../mk/java-vm.mk" diff --git a/net/xrmftp/Makefile b/net/xrmftp/Makefile index 06d170aae949..c112ad9b3eb6 100644 --- a/net/xrmftp/Makefile +++ b/net/xrmftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2010/01/18 09:59:21 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2010/02/12 02:02:49 joerg Exp $ DISTNAME= xrmftp-1.2.4 PKGREVISION= 6 @@ -10,13 +10,15 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://www-users.mat.uni.torun.pl/~rafmet/xrmftp/ COMMENT= FTP client for X Window System +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/${DISTNAME}.src USE_X11BASE= yes INSTALLATION_DIRS= bin do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${PREFIX}/bin + ${INSTALL_PROGRAM} ${WRKSRC}/xrmftp ${DESTDIR}${PREFIX}/bin .include "../../graphics/jpeg/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index f02c67dbf443..85ce91a4e9eb 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2010/01/18 09:59:21 wiz Exp $ +# $NetBSD: Makefile,v 1.53 2010/02/11 23:26:12 joerg Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.dtek.chalmers.se/~d3august/xt/index.html COMMENT= Graphical version of traceroute, which traces the route IP packets go +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= msgfmt @@ -30,10 +32,11 @@ CONFIGURE_ARGS+= --with-lib-MesaGL CONFIGURE_ARGS+= --with-traceroute=/usr/etc/traceroute .endif +INSTALLATION_DIRS+= share/xtraceroute + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/xtraceroute - ${INSTALL_DATA} ${WRKDIR}/hosts.cache ${PREFIX}/share/xtraceroute/hosts.cache - ${INSTALL_DATA} ${WRKDIR}/networks.cache ${PREFIX}/share/xtraceroute/networks.cache + ${INSTALL_DATA} ${WRKDIR}/hosts.cache ${DESTDIR}${PREFIX}/share/xtraceroute/hosts.cache + ${INSTALL_DATA} ${WRKDIR}/networks.cache ${DESTDIR}${PREFIX}/share/xtraceroute/networks.cache .include "../../devel/gettext-lib/buildlink3.mk" .include "../../graphics/tiff/buildlink3.mk" diff --git a/net/xtraceroute/distinfo b/net/xtraceroute/distinfo index 6325b3c07067..cd4fd94a6312 100644 --- a/net/xtraceroute/distinfo +++ b/net/xtraceroute/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/24 12:14:07 agc Exp $ +$NetBSD: distinfo,v 1.4 2010/02/11 23:26:12 joerg Exp $ SHA1 (xtraceroute-0.8.14.tar.gz) = f7e21072fb653842aaed7ae2be5a0d33573bb654 RMD160 (xtraceroute-0.8.14.tar.gz) = b468783f00afdc9e346dabcb9ccc4b4ecdba1536 @@ -9,3 +9,4 @@ Size (ndg_files.tar.gz) = 90437 bytes SHA1 (patch-aa) = f2477f850ffd683fc6c6ef7fd7040ecff20ffa97 SHA1 (patch-ab) = 752713d3ec6d013987f6b8c48f3a2e59636b421c SHA1 (patch-ac) = 7dbf4818d90c6cf85e06ae423daf56e2e1f1df66 +SHA1 (patch-ad) = f9eccd1d4fd9223f436de3b669c7f265a01ae271 diff --git a/net/xtraceroute/patches/patch-ad b/net/xtraceroute/patches/patch-ad new file mode 100644 index 000000000000..3b4614fc8ab7 --- /dev/null +++ b/net/xtraceroute/patches/patch-ad @@ -0,0 +1,25 @@ +$NetBSD: patch-ad,v 1.1 2010/02/11 23:26:12 joerg Exp $ + +--- po/Makefile.in.in.orig 2010-02-11 23:24:45.000000000 +0000 ++++ po/Makefile.in.in +@@ -111,16 +111,16 @@ install-data: install-data-@USE_NLS@ + install-data-no: all + install-data-yes: all + if test -r "$(MKINSTALLDIRS)"; then \ +- $(MKINSTALLDIRS) $(datadir); \ ++ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \ + else \ +- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \ ++ $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \ + fi + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + case "$$cat" in \ +- *.gmo) destdir=$(gnulocaledir);; \ +- *) destdir=$(localedir);; \ ++ *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \ ++ *) destdir=${DESTDIR}$(localedir);; \ + esac; \ + lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ + dir=$$destdir/$$lang/LC_MESSAGES; \ diff --git a/net/youtube-dl/Makefile b/net/youtube-dl/Makefile index 040685282bd2..c53702688633 100644 --- a/net/youtube-dl/Makefile +++ b/net/youtube-dl/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.17 2010/02/10 19:17:44 joerg Exp $ +# $NetBSD: Makefile,v 1.18 2010/02/11 18:41:52 drochner Exp $ DISTNAME= youtube-dl -PKGNAME= youtube-dl-20090808 # master site needs to be updated in tandem -PKGREVISION= 1 +PKGNAME= youtube-dl-20100119 # master site needs to be updated in tandem CATEGORIES= net -MASTER_SITES= http://bitbucket.org/rg3/youtube-dl/raw/2009.08.08/ +MASTER_SITES= http://bitbucket.org/rg3/youtube-dl/raw/2010.01.19/ EXTRACT_SUFX= # none DIST_SUBDIR= ${PKGNAME_NOREV} diff --git a/net/youtube-dl/distinfo b/net/youtube-dl/distinfo index eb71563150a2..6a257cf574d0 100644 --- a/net/youtube-dl/distinfo +++ b/net/youtube-dl/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.12 2009/09/06 16:48:44 snj Exp $ +$NetBSD: distinfo,v 1.13 2010/02/11 18:41:52 drochner Exp $ -SHA1 (youtube-dl-20090808/youtube-dl) = cf0e7ef6bf04ec8dc7033b86de11192263f062ae -RMD160 (youtube-dl-20090808/youtube-dl) = c1a94ebeff9fcb9a8f3fe8ef1c13faac2d2dca16 -Size (youtube-dl-20090808/youtube-dl) = 41660 bytes +SHA1 (youtube-dl-20100119/youtube-dl) = ab420f8e4832c8a7bfdd09e644fc9297b3b68ba9 +RMD160 (youtube-dl-20100119/youtube-dl) = bec9fb2fe22047edf1155eff1a7a07bfb7ef19d8 +Size (youtube-dl-20100119/youtube-dl) = 51670 bytes diff --git a/net/ywho/Makefile b/net/ywho/Makefile index 9620520cd0af..a0dfe0d08979 100644 --- a/net/ywho/Makefile +++ b/net/ywho/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2007/09/20 08:57:53 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2010/02/11 23:25:51 joerg Exp $ # DISTNAME= ywho-1.3 @@ -8,9 +8,13 @@ MASTER_SITES= ftp://ftp.gw.com/pub/people/kim/ MAINTAINER= kim@tac.nyc.ny.us COMMENT= Who, users, uptime on clients in a sun-RPC network +PKG_DESTDIR_SUPPORT= user-destdir + NO_CONFIGURE= yes -MAKE_FLAGS+= DEST=${PREFIX} +MAKE_FLAGS+= DEST=${DESTDIR}${PREFIX} BUILD_TARGET= all + INSTALL_TARGET= install install.man +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 .include "../../mk/bsd.pkg.mk" diff --git a/news/cleanscore/Makefile b/news/cleanscore/Makefile index 73e98d8427c5..4867b7390c55 100644 --- a/news/cleanscore/Makefile +++ b/news/cleanscore/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2007/10/12 12:30:47 is Exp $ +# $NetBSD: Makefile,v 1.2 2010/02/11 23:27:24 joerg Exp $ # DISTNAME= cleanscore-0.9.8.1 @@ -9,14 +9,17 @@ MAINTAINER= is@NetBSD.org HOMEPAGE= http://slrn.sourceforge.net/cleanscore/ COMMENT= Clean SLRN's score file +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS= perl REPLACE_PERL= cleanscore NO_BUILD= yes +INSTALLATION_DIRS+= bin share/doc/cleanscore + do-install: - ${INSTALL_SCRIPT} ${WRKSRC}/cleanscore ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/cleanscore - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/cleanscore + ${INSTALL_SCRIPT} ${WRKSRC}/cleanscore ${DESTDIR}${PREFIX}/bin + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/cleanscore .include "../../mk/bsd.pkg.mk" diff --git a/news/nget/Makefile b/news/nget/Makefile index 90712bdd300f..05242557c46c 100644 --- a/news/nget/Makefile +++ b/news/nget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/02/05 23:10:33 joerg Exp $ +# $NetBSD: Makefile,v 1.8 2010/02/11 23:30:22 joerg Exp $ # DISTNAME= nget-0.27.1 @@ -10,6 +10,8 @@ MAINTAINER= joel@carnat.net HOMEPAGE= http://nget.sourceforge.net/ COMMENT= Command line nntp file grabber +PKG_DESTDIR_SUPPORT= user-destdir + USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= gmake @@ -22,11 +24,13 @@ EGDIR= ${PREFIX}/share/examples/nget MESSAGE_SUBST+= EGDIR=${EGDIR} INSTALLATION_DIRS= share/nget share/examples/nget +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ + mandir=${DESTDIR}${PREFIX}/${PKGMANDIR} post-install: for f in COPYING Changelog FAQ README TODO; do \ - ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/share/nget; done - ${INSTALL_DATA} ${WRKSRC}/.ngetrc ${EGDIR}/dot.ngetrc + ${INSTALL_DATA} ${WRKSRC}/$${f} ${DESTDIR}${PREFIX}/share/nget; done + ${INSTALL_DATA} ${WRKSRC}/.ngetrc ${DESTDIR}${EGDIR}/dot.ngetrc .include "../../converters/uulib/buildlink3.mk" .include "../../devel/pcre/buildlink3.mk" diff --git a/news/suck/Makefile b/news/suck/Makefile index f49afe07d62c..2a518ba4f7f7 100644 --- a/news/suck/Makefile +++ b/news/suck/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2010/01/17 12:02:37 wiz Exp $ +# $NetBSD: Makefile,v 1.30 2010/02/11 23:33:41 joerg Exp $ # DISTNAME= suck-4.3.2 @@ -10,6 +10,8 @@ MAINTAINER= drankin@bohemians.lexington.ky.us HOMEPAGE= http://home.comcast.net/~bobyetman/ COMMENT= Feed a local news server without a dedicated newsfeed +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes USE_FEATURES= snprintf @@ -22,10 +24,12 @@ post-patch: ${WRKSRC}/Makefile.in >${WRKSRC}/Makefile.tmp @${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile.in +INSTALLATION_DIRS+= share/examples/suck +INSTALL_MAKE_FLAGS+= prefix=${DESTDIR}${PREFIX} \ + mandir=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 + post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/suck - ${CP} ${WRKSRC}/sample/* ${PREFIX}/share/examples/suck - ${CHMOD} 644 ${PREFIX}/share/examples/suck/* + ${INSTALL_DATA} ${WRKSRC}/sample/* ${DESTDIR}${PREFIX}/share/examples/suck .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/news/xrn/Makefile b/news/xrn/Makefile index 7bc2fc0155dc..90cf49def5d6 100644 --- a/news/xrn/Makefile +++ b/news/xrn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2008/11/10 17:21:37 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2010/02/11 23:32:50 joerg Exp $ # DISTNAME= 9.01 @@ -12,16 +12,19 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.mit.edu/people/jik/software/xrn.html COMMENT= Usenet News reader for the X window system +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR} DIST_SUBDIR= xrn USE_TOOLS+= lex yacc USE_IMAKE= yes +INSTALLATION_DIRS+= share/doc/xrn + pre-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/xrn for f in COMMON-PROBLMS COPYRIGHT CREDITS ChangeLog; do \ - ${INSTALL_DATA} ${WRKSRC}/$$f ${PREFIX}/share/doc/xrn; \ + ${INSTALL_DATA} ${WRKSRC}/$$f ${DESTDIR}${PREFIX}/share/doc/xrn; \ done .include "../../x11/libXaw/buildlink3.mk" diff --git a/pkgtools/pkg_rolling-replace/Makefile b/pkgtools/pkg_rolling-replace/Makefile index fdc1b25d893e..2f3701fe3d7c 100644 --- a/pkgtools/pkg_rolling-replace/Makefile +++ b/pkgtools/pkg_rolling-replace/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2010/02/01 19:06:42 sno Exp $ +# $NetBSD: Makefile,v 1.29 2010/02/11 12:07:33 tnn Exp $ -DISTNAME= pkg_rolling-replace-0.20 +DISTNAME= pkg_rolling-replace-0.21 CATEGORIES= pkgtools -#PKGREVISION= 1 MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh index b7e17ab90808..056c42681df8 100755 --- a/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh +++ b/pkgtools/pkg_rolling-replace/files/pkg_rolling-replace.sh @@ -1,6 +1,6 @@ #!/bin/sh -# $NetBSD: pkg_rolling-replace.sh,v 1.25 2010/02/01 19:06:43 sno Exp $ +# $NetBSD: pkg_rolling-replace.sh,v 1.28 2010/02/11 12:54:27 tnn Exp $ # # Copyright (c) 2006 BBN Technologies Corp. All rights reserved. # @@ -267,7 +267,7 @@ vsleep() report() { - for a in $SUCCESSED; do + for a in $SUCCEEDED; do verbose "+ $a" done @@ -278,11 +278,29 @@ report() abort() { - echo "*** $1" - echo "*** Please read the errors listed above, fix the problem," - echo "*** then re-run pkg_rolling-replace to continue." - report - exit 1 + echo "*** $1" + echo "*** Please read the errors listed above, fix the problem," + echo "*** then re-run pkg_rolling-replace to continue." + report + exit 1 +} + +error() +{ + if [ -z "$opt_k" ]; then + abort "$1" + fi + echo "*** $1" +} + +mark_as_succeeded() +{ + SUCCEEDED=$(uniqify $SUCCEEDED $1) +} + +mark_as_failed() +{ + FAILED=$(uniqify $FAILED $1) } todo() @@ -350,10 +368,8 @@ fi MAKE="${MAKE}${MAKE_VAR_SEP}${MAKE_VAR}" -SUCCESSED="" -SUCCESSEDSEP="" +SUCCEEDED="" FAILED="" -FAILEDSEP="" MISMATCH_TODO= if [ -n "$opt_u" -o -n "$opt_F" ]; then @@ -403,6 +419,8 @@ while [ -n "$REPLACE_TODO" ]; do fi done pkgdir=$(${PKG_INFO} -Q PKGPATH $pkg) + [ -n "$pkgdir" ] || abort "Couldn't extract PKGPATH from installed package $pkg" + echo "${OPI} Selecting $pkg ($pkgdir) as next package to replace" sleep 1 @@ -466,9 +484,8 @@ while [ -n "$REPLACE_TODO" ]; do if [ -d "$PKGSRCDIR/$pkgdir" ]; then cd "$PKGSRCDIR/$pkgdir"; else - FAILED="$FAILED$FAILEDSEP$pkg" - FAILEDSEP=" " - [ -n "$opt_k" ] || abort "No package directory '$pkgdir' for $pkg." + mark_as_failed $pkg + error "No package directory '$pkgdir' for $pkg." fi if [ -z "$fail" ]; then @@ -484,9 +501,8 @@ while [ -n "$REPLACE_TODO" ]; do eval "$cmd" fi if [ -n "$fail" ]; then - FAILED="$FAILED$FAILEDSEP$pkg" - FAILEDSEP=" " - [ -n "$opt_k" ] || abort "'make clean' failed for package $pkg." + mark_as_failed $pkg + error "'make clean' failed for package $pkg." fi fi cmd="${MAKE} replace || fail=1" # XXX OLDNAME= support? xmlrpc-c -> xmlrpc-c-ss @@ -505,9 +521,8 @@ while [ -n "$REPLACE_TODO" ]; do eval "$cmd" fi if [ -n "$fail" ]; then - FAILED="$FAILED$FAILEDSEP$pkg" - FAILEDSEP=" " - [ -n "$opt_k" ] || abort "'make replace' failed for package $pkg." + mark_as_failed $pkg + error "'make replace' failed for package $pkg." fi fi if [ -z "$opt_n" -a -z "$opt_k" -a -z "$opt_F" ]; then @@ -531,9 +546,8 @@ while [ -n "$REPLACE_TODO" ]; do eval "$cmd" fi if [ -n "$fail" ]; then - FAILED="$FAILED$FAILEDSEP$pkg" - FAILEDSEP=" " - [ -n "$opt_k" ] || abort "'make package' failed for package $pkg." + mark_as_failed $pkg + error "'make package' failed for package $pkg." fi fi fi @@ -546,15 +560,13 @@ while [ -n "$REPLACE_TODO" ]; do eval "$cmd" fi if [ -n "$fail" ]; then - FAILED="$FAILED$FAILEDSEP$pkg" - FAILEDSEP=" " - [ -n "$opt_k" ] || abort "'make clean' failed for package $pkg." + mark_as_failed $pkg + error "'make clean' failed for package $pkg." fi fi if [ -z "$fail" ]; then - SUCCESSED="$SUCCESSED$SUCCESSEDSEP$pkg" - SUCCESSEDSEP=" " + mark_as_succeeded $pkg fi sleep 1 diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile index 057cce34ae0b..71053c98e3ad 100644 --- a/print/LPRng-core/Makefile +++ b/print/LPRng-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2009/07/06 16:08:30 joerg Exp $ +# $NetBSD: Makefile,v 1.35 2010/02/12 00:21:17 joerg Exp $ DISTNAME= LPRng-3.8.28 PKGNAME= LPRng-core-3.8.28 @@ -12,6 +12,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.lprng.com/ COMMENT= Enhanced Printer Spooler +PKG_DESTDIR_SUPPORT= user-destdir + MAKE_JOBS_SAFE= no CONFLICTS+= cups-[0-9]* @@ -49,6 +51,12 @@ CONF_FILES+= ${EXAMPLESDIR}/lpd.conf ${PKG_SYSCONFDIR}/lpd/lpd.conf CONF_FILES+= ${EXAMPLESDIR}/lpd.perms ${PKG_SYSCONFDIR}/lpd/lpd.perms CONF_FILES+= ${EXAMPLESDIR}/printcap ${PKG_SYSCONFDIR}/printcap +SPECIAL_PERMS+= bin/lpq ${SETUID_ROOT_PERMS} \ + bin/lpr ${SETUID_ROOT_PERMS} \ + bin/lprm ${SETUID_ROOT_PERMS} \ + bin/lpstat ${SETUID_ROOT_PERMS} \ + sbin/lpc ${SETUID_ROOT_PERMS} \ + pre-patch: ${MV} ${WRKSRC:Q}/man/lpd.conf.n ${WRKSRC:Q}/man/lpd.conf.n.in @@ -65,10 +73,12 @@ pre-install: ${SED} -e s,@PREFIX@,${PREFIX:Q},g \ ${FILESDIR:Q}/LPRng.sh > ${WRKDIR:Q}/LPRng.sh +INSTALLATION_DIRS+= ${EXAMPLESDIR} +INSTALL_MAKE_FLAGS+= SUID_ROOT_PERMS=555 + post-install: - ${INSTALL_DATA_DIR} ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/lpd.conf ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/lpd.perms ${EXAMPLESDIR} - ${INSTALL_DATA} ${WRKSRC}/printcap ${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/lpd.conf ${DESTDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/lpd.perms ${DESTDIR}${EXAMPLESDIR} + ${INSTALL_DATA} ${WRKSRC}/printcap ${DESTDIR}${EXAMPLESDIR} .include "../../mk/bsd.pkg.mk" diff --git a/print/Makefile b/print/Makefile index add50cc8d7bd..63d8877f3521 100644 --- a/print/Makefile +++ b/print/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.339 2010/02/09 18:54:22 minskim Exp $ +# $NetBSD: Makefile,v 1.341 2010/02/12 00:20:02 minskim Exp $ # COMMENT= Desktop publishing @@ -146,6 +146,7 @@ SUBDIR+= tex-amsmath SUBDIR+= tex-amsmath-doc SUBDIR+= tex-amsrefs SUBDIR+= tex-amsrefs-doc +SUBDIR+= tex-anonchap SUBDIR+= tex-apalike SUBDIR+= tex-apalike-doc SUBDIR+= tex-babel @@ -172,8 +173,8 @@ SUBDIR+= tex-draftwatermark SUBDIR+= tex-dvipdfm SUBDIR+= tex-dvipdfm-doc SUBDIR+= tex-dvipdfmx -SUBDIR+= tex-dvipdfmx-doc SUBDIR+= tex-dvipdfmx-def +SUBDIR+= tex-dvipdfmx-doc SUBDIR+= tex-dvips SUBDIR+= tex-dvips-doc SUBDIR+= tex-elsarticle diff --git a/print/chktex/Makefile b/print/chktex/Makefile index 5050cb2e8b55..6ed240e27d1e 100644 --- a/print/chktex/Makefile +++ b/print/chktex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/02/05 23:10:35 joerg Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/11 23:50:51 joerg Exp $ # DISTNAME= chktex-1.6.3 @@ -10,6 +10,8 @@ MAINTAINER= recht@NetBSD.org HOMEPAGE= http://baruch.ev-en.org/proj/chktex/ COMMENT= LaTeX semantic checker +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= lynx-[0-9]*:../../www/lynx EGDIR= ${PREFIX}/share/examples/chktex @@ -21,8 +23,7 @@ CFLAGS+= -D__unix__ CONFIGURE_ENV+= PERL5=${PERL5:Q} MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} EGDIR=${EGDIR:Q} -pre-install: - ${INSTALL_DATA_DIR} ${EGDIR} +INSTALLATION_DIRS+= ${EGDIR} .include "../../mk/tex.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile index d64e01167424..18e8d5651bf5 100644 --- a/print/cjk-lyx/Makefile +++ b/print/cjk-lyx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2010/02/10 19:17:44 joerg Exp $ +# $NetBSD: Makefile,v 1.31 2010/02/12 00:00:45 joerg Exp $ DISTNAME= lyx-${LYX_VERS} PKGNAME= cjk-${DISTNAME} @@ -15,6 +15,8 @@ MAINTAINER= rxg@NetBSD.org HOMEPAGE= http://cellular.phys.pusan.ac.kr/cjk.html COMMENT= Multibyte version of LyX +PKG_DESTDIR_SUPPORT= user-destdir + LYX_VERS= 1.2.0 CONFLICTS= lyx-[0-9]* diff --git a/print/cnprint/Makefile b/print/cnprint/Makefile index f2f590506f30..f0e163e0a80c 100644 --- a/print/cnprint/Makefile +++ b/print/cnprint/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:28 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/11 23:42:13 joerg Exp $ DISTNAME= # PKGNAME= cnprint-3.30b @@ -26,9 +26,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.neurophys.wisc.edu/~cai/software/index.html COMMENT= Print & convert CJK style text to PostScript +PKG_DESTDIR_SUPPORT= user-destdir + DIST_SUBDIR= ${PKGNAME_NOREV} USE_TOOLS+= gtar gunzip -INSTALLATION_DIRS= bin +INSTALLATION_DIRS= bin share/cnprint do-extract: ${MKDIR} ${WRKSRC} @@ -48,13 +50,12 @@ do-build: >cnprint.cmd =3.1.9:../../print/ja-ptex-bin WRKSRC= ${WRKDIR}/jsclasses @@ -27,9 +29,10 @@ post-extract: @cd ${WRKSRC}; \ ${MV} ../*.* . +INSTALLATION_DIRS+= ${PLATEX_DIR}/js + do-install: - @cd ${WRKSRC}; \ - ${INSTALL_DATA_DIR} ${PLATEX_DIR}/js; \ - ${INSTALL_DATA} *.cls *.dtx *.ins *.sty ${PLATEX_DIR}/js + @cd ${WRKSRC} && \ + ${INSTALL_DATA} *.cls *.dtx *.ins *.sty ${DESTDIR}${PLATEX_DIR}/js .include "../../mk/bsd.pkg.mk" diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile index ff41186d4370..cc754dc01d11 100644 --- a/print/magicfilter/Makefile +++ b/print/magicfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2009/08/31 22:16:39 tron Exp $ +# $NetBSD: Makefile,v 1.57 2010/02/12 00:18:29 joerg Exp $ DISTNAME= magicfilter-1.2 PKGREVISION= 7 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Customizable, extensible automatic printer filter LICENSE= gnu-gpl-v2 +PKG_DESTDIR_SUPPORT= user-destdir + # Any version will do: # DEPENDS+= a2ps-[0-9]*:../../print/a2ps @@ -50,12 +52,14 @@ GENERATE_PLIST+= \ ${ECHO} ${FILTER_DIR}/"$$f"; \ done; -post-install: +do-install: + ${INSTALL_PROGRAM} ${WRKSRC}/magicfilter ${DESTDIR}${PREFIX}/bin + ${INSTALL_MAN} ${WRKSRC}/magicfilter.man ${DESTDIR}${PREFIX}/${PKGMANDIR}/man8/magicfilter.8 set -e; \ cd ${WRKSRC}/filters; \ for f in *-filter; do \ - ${ECHO} "Installing $$f as ${PREFIX}/${FILTER_DIR}/$$f"; \ - ${INSTALL_SCRIPT} "$$f" ${PREFIX}/${FILTER_DIR}/"$$f"; \ + ${ECHO} "Installing $$f as ${DESTDIR}${PREFIX}/${FILTER_DIR}/$$f"; \ + ${INSTALL_SCRIPT} "$$f" ${DESTDIR}${PREFIX}/${FILTER_DIR}/"$$f"; \ done .include "../../mk/bsd.pkg.mk" diff --git a/print/mpage/Makefile b/print/mpage/Makefile index 1fd60c147bc4..23a687748a32 100644 --- a/print/mpage/Makefile +++ b/print/mpage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2008/10/04 14:51:16 reed Exp $ +# $NetBSD: Makefile,v 1.21 2010/02/12 00:13:23 joerg Exp $ # DISTNAME= mpage-2.5.5 @@ -12,8 +12,11 @@ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Print multiple pages per sheet of paper HOMEPAGE= http://www.mesa.nl/download.html +PKG_DESTDIR_SUPPORT= user-destdir + BUILD_TARGET= default -MAKE_ENV+= MANDIR=${PREFIX}/${PKGMANDIR}/man1 +INSTALL_MAKE_FLAGS+= PREFIX=${DESTDIR}${PREFIX} \ + MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 .include "../../mk/bsd.prefs.mk" MAKE_ENV+= PAGESIZE=${PAPERSIZE} diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile index 63f2b47ca5ed..542628aedf78 100644 --- a/print/rlpr/Makefile +++ b/print/rlpr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2006/10/04 21:56:34 wiz Exp $ +# $NetBSD: Makefile,v 1.8 2010/02/12 00:08:02 joerg Exp $ DISTNAME= rlpr-2.06 PKGREVISION= 2 @@ -9,6 +9,8 @@ MAINTAINER= sekiya@NetBSD.org HOMEPAGE= http://truffula.com/rlpr/ COMMENT= lpr work-alike to print directly to remote printer +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= YES .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/print/rtf2latex/Makefile b/print/rtf2latex/Makefile index 74a9383d709f..e177dec8c082 100644 --- a/print/rtf2latex/Makefile +++ b/print/rtf2latex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2006/03/04 21:30:31 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2010/02/12 00:08:35 joerg Exp $ DISTNAME= rtf2LaTeX.1.5 PKGNAME= rtf2latex-1.5 @@ -8,6 +8,8 @@ MASTER_SITES= ftp://ftp.dante.de/pub/tex/support/rtf2latex/ MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Filter that converts RTF (MS's Rich Text Format) into LaTeX +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/rtf2LaTeX NO_CONFIGURE= yes @@ -20,4 +22,6 @@ post-extract: MAKE_ENV+= XCFLAGS="${CPPFLAGS} -DSYSV" CC=${CC:Q} .endif +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" diff --git a/print/rtf2latex/files/Makefile b/print/rtf2latex/files/Makefile index c437b2da429d..748d2ea7c0aa 100644 --- a/print/rtf2latex/files/Makefile +++ b/print/rtf2latex/files/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 1998/12/30 18:00:03 tron Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/12 00:08:35 joerg Exp $ SHELL=/bin/sh INSTALL_PROGRAM=${BSD_INSTALL_PROGRAM} @@ -25,7 +25,7 @@ LD=cc -s # This is where executables, man-pages and support files are installed BINDIR = ${PREFIX}/bin -MANDIR = ${PREFIX}/man/man1 +MANDIR = ${PREFIX}/${PKGMANDIR}/man1 RTFDIR = ${PREFIX}/share/rtf ############### No configuration parameters below this line ############### @@ -45,10 +45,10 @@ all: rtf2LaTeX rtf2LaTeX: $(LATEXOBJS) $(LD) $(LDFLAGS) -o $@ $(LATEXOBJS) install: rtf2LaTeX $(DOCFILS) $(SUPPORT) - $(INSTALL_PROGRAM) rtf2LaTeX $(BINDIR) - $(INSTALL_MAN) rtf2LaTeX.man $(MANDIR)/rtf2LaTeX.1 - -mkdir $(RTFDIR) - $(INSTALL_DATA) ansi.code mac.code german.land english.land $(RTFDIR) + $(INSTALL_PROGRAM) rtf2LaTeX ${DESTDIR}$(BINDIR) + $(INSTALL_MAN) rtf2LaTeX.man ${DESTDIR}$(MANDIR)/rtf2LaTeX.1 + -mkdir ${DESTDIR}$(RTFDIR) + $(INSTALL_DATA) ansi.code mac.code german.land english.land ${DESTDIR}$(RTFDIR) tags: etags -et *.[ch] clean:: diff --git a/print/rtf2latex2e/Makefile b/print/rtf2latex2e/Makefile index d7229182de39..08d92aa96858 100644 --- a/print/rtf2latex2e/Makefile +++ b/print/rtf2latex2e/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2008/05/26 02:13:23 joerg Exp $ +# $NetBSD: Makefile,v 1.4 2010/02/12 00:10:15 joerg Exp $ # # fix install so it uses ${prefix} @@ -12,6 +12,8 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://sourceforge.net/projects/rtf2latex2e/ COMMENT= RTF to LaTeX2e converter +PKG_DESTDIR_SUPPORT= user-destdir + # ImageMagick is an optional component WRKSRC= ${WRKDIR}/rtf2latex2eUnix-1.0fc1/ @@ -25,11 +27,11 @@ USE_TOOLS+= pax INSTALLATION_DIRS+= bin share/doc/rtf2latex2e share/rtf2latex2e do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/rtf2latex2e.bin ${PREFIX}/bin/rtf2latex2e - ${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/rtf2latex2e/ - ${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/rtf2latex2e/ - ${INSTALL_DATA} ${WRKSRC}/doc/rtf2LaTeX2eDoc.html ${PREFIX}/share/doc/rtf2latex2e/ - cd ${WRKSRC} && pax -rw pref ${PREFIX}/share/rtf2latex2e + ${INSTALL_PROGRAM} ${WRKSRC}/rtf2latex2e.bin ${DESTDIR}${PREFIX}/bin/rtf2latex2e + ${INSTALL_DATA} ${WRKSRC}/INSTALL ${DESTDIR}${PREFIX}/share/doc/rtf2latex2e/ + ${INSTALL_DATA} ${WRKSRC}/README ${DESTDIR}${PREFIX}/share/doc/rtf2latex2e/ + ${INSTALL_DATA} ${WRKSRC}/doc/rtf2LaTeX2eDoc.html ${DESTDIR}${PREFIX}/share/doc/rtf2latex2e/ + cd ${WRKSRC} && pax -rw pref ${DESTDIR}${PREFIX}/share/rtf2latex2e # install other docs and examples too? diff --git a/print/stylewriter/Makefile b/print/stylewriter/Makefile index ef41b3c11e8f..d22683adc1f7 100644 --- a/print/stylewriter/Makefile +++ b/print/stylewriter/Makefile @@ -1,9 +1,9 @@ -# $NetBSD: Makefile,v 1.21 2008/06/16 13:22:49 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2010/02/12 00:12:11 joerg Exp $ # DISTNAME= stylewriter PKGNAME= stylewriter-0.9.9 -PKGREVISION= 3 +PKGREVISION= 4 CATEGORIES= print MASTER_SITES= ftp://ftp.NetBSD.org/pub/NetBSD/packages/distfiles/ @@ -11,6 +11,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://homepage.mac.com/monroe/styl/ COMMENT= Apple StyleWriter driver for un*x +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= enscript>=1.6.3nb1:../../print/enscript USE_TOOLS+= gs:run @@ -31,34 +33,34 @@ PRINTCAP_SED= -e "s,/var/spool/stylps,/var/spool/lpd/stylps,g" \ post-extract: ${CP} ${FILESDIR}/Makefile ${WRKSRC} +INSTALLATION_DIRS+= ${FILTER_DIR} share/doc/stylewriter share/examples/stylewriter + +OWN_DIRS+= /var/spool/lpd/stylps + post-install: ${CP} ${PKGDIR}/PLIST ${PLIST_SRC} - ${INSTALL_DATA_DIR} ${PREFIX}/${FILTER_DIR} (cd ${WRKSRC}/scripts; \ for FILTER in ${FILTERS}; do \ ${SED} ${FILTER_SED} \ < $${FILTER} > ${WRKDIR}/$${FILTER}; \ ${INSTALL_SCRIPT} ${WRKDIR}/$${FILTER} \ - ${PREFIX}/${FILTER_DIR}/$${FILTER}; \ + ${DESTDIR}${PREFIX}/${FILTER_DIR}/$${FILTER}; \ ${RM} ${WRKDIR}/$${FILTER}; \ done) - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/stylewriter for FILE in README README.protocol README.troubleshooting; do \ ${INSTALL_DATA} ${WRKSRC}/$${FILE} \ - ${PREFIX}/share/doc/stylewriter; \ + ${DESTDIR}${PREFIX}/share/doc/stylewriter; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/stylewriter (cd ${WRKSRC}; \ for PRINTCAP in printcap printcap.a4; do \ ${SED} ${PRINTCAP_SED} \ < $${PRINTCAP} > ${WRKDIR}/$${PRINTCAP}; \ ${INSTALL_DATA} ${WRKDIR}/$${PRINTCAP} \ - ${PREFIX}/share/examples/stylewriter; \ + ${DESTDIR}${PREFIX}/share/examples/stylewriter; \ ${RM} ${WRKDIR}/$${PRINTCAP}; \ done) - ${INSTALL_DATA} ${WRKSRC}/styl.ppd ${PREFIX}/share/examples/stylewriter - ${INSTALL_DATA_DIR} /var/spool/lpd/stylps + ${INSTALL_DATA} ${WRKSRC}/styl.ppd ${DESTDIR}${PREFIX}/share/examples/stylewriter .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-anonchap/DESCR b/print/tex-anonchap/DESCR new file mode 100644 index 000000000000..1440dae2affc --- /dev/null +++ b/print/tex-anonchap/DESCR @@ -0,0 +1,4 @@ +The command \simplechapter sets up the \chapter command not to number +chapters, though they may possibly have a prefix, and a suffix (the +\simplechapterdelim command, which the user may alter). The +\restorechapter command restores the status quo ante. diff --git a/print/tex-anonchap/Makefile b/print/tex-anonchap/Makefile new file mode 100644 index 000000000000..cac96c9ba2cd --- /dev/null +++ b/print/tex-anonchap/Makefile @@ -0,0 +1,11 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/02/12 00:18:57 minskim Exp $ +# TeX Live Revision 15878 + +DISTNAME= anonchap +PKGNAME= tex-${DISTNAME}-1.1a + +MAINTAINER= minskim@NetBSD.org +COMMENT= LaTeX style to make chapters be typeset like sections + +.include "../../print/texlive/package.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/print/tex-anonchap/PLIST b/print/tex-anonchap/PLIST new file mode 100644 index 000000000000..4a219afd08b1 --- /dev/null +++ b/print/tex-anonchap/PLIST @@ -0,0 +1,2 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/12 00:18:57 minskim Exp $ +share/texmf-dist/tex/latex/anonchap/anonchap.sty diff --git a/print/tex-anonchap/distinfo b/print/tex-anonchap/distinfo new file mode 100644 index 000000000000..2c0c47216bf0 --- /dev/null +++ b/print/tex-anonchap/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/02/12 00:18:57 minskim Exp $ + +SHA1 (tex-anonchap-1.1a/anonchap.tar.xz) = be34dea87b73ec38176406894478327219b3d388 +RMD160 (tex-anonchap-1.1a/anonchap.tar.xz) = 331a9ad07536173d5f03108571e029b22e5581b8 +Size (tex-anonchap-1.1a/anonchap.tar.xz) = 1456 bytes diff --git a/print/tex-ifluatex-doc/Makefile b/print/tex-ifluatex-doc/Makefile index 4b33450a3bdf..08f773648577 100644 --- a/print/tex-ifluatex-doc/Makefile +++ b/print/tex-ifluatex-doc/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/02/05 16:23:05 minskim Exp $ -# TeX Live Revision 16857 +# $NetBSD: Makefile,v 1.2 2010/02/11 20:22:29 minskim Exp $ +# TeX Live Revision 16936 DISTNAME= ifluatex.doc -PKGNAME= tex-${DISTNAME:S/./-/}-1.2 +PKGNAME= tex-${DISTNAME:S/./-/}-1.2.16936 MAINTAINER= minskim@NetBSD.org COMMENT= Documentation for tex-ifluatex diff --git a/print/tex-ifluatex-doc/distinfo b/print/tex-ifluatex-doc/distinfo index 5784bd96afc6..a6312dd712b0 100644 --- a/print/tex-ifluatex-doc/distinfo +++ b/print/tex-ifluatex-doc/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/02/05 16:23:05 minskim Exp $ +$NetBSD: distinfo,v 1.2 2010/02/11 20:22:29 minskim Exp $ -SHA1 (tex-ifluatex-doc-1.2/ifluatex.doc.tar.xz) = 28b016f20dc9a8c4fbbe82e94ef1f10cd368451c -RMD160 (tex-ifluatex-doc-1.2/ifluatex.doc.tar.xz) = b40103c603a86daba5a5477cc8c788b220e510b4 -Size (tex-ifluatex-doc-1.2/ifluatex.doc.tar.xz) = 288856 bytes +SHA1 (tex-ifluatex-doc-1.2.16936/ifluatex.doc.tar.xz) = 9cbe10c81bd2ce1948f9794aecc9b5d2c5e2f4fc +RMD160 (tex-ifluatex-doc-1.2.16936/ifluatex.doc.tar.xz) = 37d8f37dfeb5d464cfe48139e380b5be95b3a626 +Size (tex-ifluatex-doc-1.2.16936/ifluatex.doc.tar.xz) = 288752 bytes diff --git a/print/tex-ifluatex/Makefile b/print/tex-ifluatex/Makefile index 3e8898c9118c..7466abaa23c3 100644 --- a/print/tex-ifluatex/Makefile +++ b/print/tex-ifluatex/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.1.1.1 2010/02/05 16:20:05 minskim Exp $ -# TeX Live Revision 16857 +# $NetBSD: Makefile,v 1.2 2010/02/11 20:25:14 minskim Exp $ +# TeX Live Revision 16936 DISTNAME= ifluatex PKGNAME= tex-${DISTNAME}-1.2 +DIST_SUBDIR= ${PKGNAME_NOREV}.16936 MAINTAINER= minskim@NetBSD.org COMMENT= The \ifluatex switch for TeX diff --git a/print/tex-ifluatex/distinfo b/print/tex-ifluatex/distinfo index b929cb5f3258..97c1ea201864 100644 --- a/print/tex-ifluatex/distinfo +++ b/print/tex-ifluatex/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2010/02/05 16:20:05 minskim Exp $ +$NetBSD: distinfo,v 1.2 2010/02/11 20:25:14 minskim Exp $ -SHA1 (tex-ifluatex-1.2/ifluatex.tar.xz) = e9350b7ae3b613e878d739798b91dab1476cd3e8 -RMD160 (tex-ifluatex-1.2/ifluatex.tar.xz) = 7099097b500ca483f06e4f7a5e4a9c5fe25d506c -Size (tex-ifluatex-1.2/ifluatex.tar.xz) = 2260 bytes +SHA1 (tex-ifluatex-1.2.16936/ifluatex.tar.xz) = ccd336b96b1e880335edbff634e0e394cae8715d +RMD160 (tex-ifluatex-1.2.16936/ifluatex.tar.xz) = 3a697a9f103c2a7a59803bf66156b9e2e7482323 +Size (tex-ifluatex-1.2.16936/ifluatex.tar.xz) = 2260 bytes diff --git a/print/tex-ifxetex-doc/Makefile b/print/tex-ifxetex-doc/Makefile index 3a87449da2f9..e68f002ae19f 100644 --- a/print/tex-ifxetex-doc/Makefile +++ b/print/tex-ifxetex-doc/Makefile @@ -1,5 +1,5 @@ -# $NetBSD: Makefile,v 1.1.1.1 2009/04/24 01:03:12 minskim Exp $ -# TeX Live Revision 12011 +# $NetBSD: Makefile,v 1.2 2010/02/11 20:49:10 minskim Exp $ +# TeX Live Revision 15878 DISTNAME= ifxetex.doc PKGNAME= tex-${DISTNAME:S/./-/}-0.5 @@ -8,5 +8,5 @@ MAINTAINER= reed@reedmedia.net HOMEPAGE= http://tug.ctan.org/tex-archive/help/Catalogue/entries/ifxetex.html COMMENT= Documentation for tex-ifxetex -.include "../../print/texlive/module.mk" +.include "../../print/texlive/package.mk" .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-ifxetex-doc/distinfo b/print/tex-ifxetex-doc/distinfo index 6fe0b4d4be59..2e907b44f2ba 100644 --- a/print/tex-ifxetex-doc/distinfo +++ b/print/tex-ifxetex-doc/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.1.1.1 2009/04/24 01:03:12 minskim Exp $ +$NetBSD: distinfo,v 1.2 2010/02/11 20:49:10 minskim Exp $ -SHA1 (tex-ifxetex-doc-0.5/ifxetex.doc.tar.lzma) = 94171cf40187836875eef5f13a40672e328ce393 -RMD160 (tex-ifxetex-doc-0.5/ifxetex.doc.tar.lzma) = f809e8200ff817bcfdcb9d80aa6e6e0a4b11aaed -Size (tex-ifxetex-doc-0.5/ifxetex.doc.tar.lzma) = 56609 bytes +SHA1 (tex-ifxetex-doc-0.5/ifxetex.doc.tar.xz) = 320a991328080460c5e82fd6e7db5c71feb40c8a +RMD160 (tex-ifxetex-doc-0.5/ifxetex.doc.tar.xz) = e94f34033cd77b34bb675e3245782e6216b0e5c8 +Size (tex-ifxetex-doc-0.5/ifxetex.doc.tar.xz) = 56680 bytes diff --git a/print/tex-luatex/Makefile b/print/tex-luatex/Makefile index 1612fef34859..fc5c5950253a 100644 --- a/print/tex-luatex/Makefile +++ b/print/tex-luatex/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2009/06/09 22:23:33 minskim Exp $ -# TeX Live Revision 12927 +# $NetBSD: Makefile,v 1.4 2010/02/11 22:00:45 minskim Exp $ +# TeX Live Revision 16044 DISTNAME= luatex PKGNAME= tex-${DISTNAME}-0.2 +PKGREVISION= 1 MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://www.luatex.org/ @@ -15,12 +16,12 @@ DEPENDS+= tex-plain>=3.14159265.12854:../../print/tex-plain INSTALLATION_DIRS+= bin -TEX_FORMAT_NAMES+= luatex +TEX_FORMATS+= "luatex luatex language.def luatex.ini\\\ndviluatex luatex language.def dviluatex.ini" TEX_TEXMF_DIRS+= ${PREFIX}/share/texmf -.include "../../print/texlive/module.mk" +.include "../../print/texlive/package.mk" post-install: - ${LN} -sf luatex ${DESTDIR}${PREFIX}/bin/pdfluatex + ${LN} -sf luatex ${DESTDIR}${PREFIX}/bin/dviluatex .include "../../mk/bsd.pkg.mk" diff --git a/print/tex-luatex/PLIST b/print/tex-luatex/PLIST index 1675e2f24423..4bf437f1796d 100644 --- a/print/tex-luatex/PLIST +++ b/print/tex-luatex/PLIST @@ -1,4 +1,3 @@ -@comment $NetBSD: PLIST,v 1.3 2009/06/09 22:23:33 minskim Exp $ -bin/pdfluatex -share/texmf/fmtutil/format.luatex.cnf +@comment $NetBSD: PLIST,v 1.4 2010/02/11 22:00:45 minskim Exp $ +bin/dviluatex share/texmf/tex/generic/config/luatexiniconfig.tex diff --git a/print/tex-luatex/distinfo b/print/tex-luatex/distinfo index f9115307016c..bac113f780b4 100644 --- a/print/tex-luatex/distinfo +++ b/print/tex-luatex/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.2 2009/06/09 22:23:33 minskim Exp $ +$NetBSD: distinfo,v 1.3 2010/02/11 22:00:45 minskim Exp $ -SHA1 (tex-luatex-0.2/luatex.tar.lzma) = ea0431a43dc7ff02f0dfac8c7b15534502ad92c3 -RMD160 (tex-luatex-0.2/luatex.tar.lzma) = 3c33c1993be74f812c7c4509ac696fae17df72c3 -Size (tex-luatex-0.2/luatex.tar.lzma) = 858 bytes +SHA1 (tex-luatex-0.2/luatex.tar.xz) = 95c76e69b39d91c42cec4e105cdc88f7855530d9 +RMD160 (tex-luatex-0.2/luatex.tar.xz) = 172f81cd7b0c97c0a811e1d0237be23b237fc19a +Size (tex-luatex-0.2/luatex.tar.xz) = 948 bytes diff --git a/shells/es/Makefile b/shells/es/Makefile index 07b23045076b..31ec8b726007 100644 --- a/shells/es/Makefile +++ b/shells/es/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2007/12/02 08:32:25 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2010/02/12 00:23:34 joerg Exp $ DISTNAME= es-0.9-alpha1 PKGNAME= es-0.9a1 @@ -10,6 +10,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://hawkwind.cs.toronto.edu:8001/mlists/es.html COMMENT= Extensible shell, derived from plan9's rc +PKG_DESTDIR_SUPPORT= user-destdir + USE_TOOLS+= yacc PKG_SHELL= bin/es @@ -20,4 +22,6 @@ SUBST_MESSAGE.path= Fixing path to es in scripts. SUBST_FILES.path= esdebug SUBST_SED.path= -e 's|^\#! /bin/es|\#! ${PREFIX:Q}/bin/es|' +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + .include "../../mk/bsd.pkg.mk" diff --git a/shells/es/distinfo b/shells/es/distinfo index c052e1206f57..761a9795647c 100644 --- a/shells/es/distinfo +++ b/shells/es/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.12 2008/09/19 20:02:23 joerg Exp $ +$NetBSD: distinfo,v 1.13 2010/02/12 00:23:34 joerg Exp $ SHA1 (es-0.9-alpha1.tar.gz) = 5027c9dade742c437b8e471a356d15883ebc4732 RMD160 (es-0.9-alpha1.tar.gz) = ca2307202ab6e65c49188e3228d1af6426a23952 Size (es-0.9-alpha1.tar.gz) = 125913 bytes -SHA1 (patch-aa) = 0ecb437885e77c07ef9c6d677cefe9d0ae6b86d8 +SHA1 (patch-aa) = a6488aa2ca69332f0d22943befcd8d022ab01ef2 SHA1 (patch-ab) = bd58fbbf71d5c9dc76bdc380cb7b93ad3f5f1c72 SHA1 (patch-ac) = 978debd8079eedf7d09862e9946bfd9957c46732 SHA1 (patch-ad) = 63bf69c25dc9e610b9375685459a1fd05ea66e1e diff --git a/shells/es/patches/patch-aa b/shells/es/patches/patch-aa index cef0bacee8a2..025c4f01d652 100644 --- a/shells/es/patches/patch-aa +++ b/shells/es/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.5 2005/03/10 16:58:39 tv Exp $ +$NetBSD: patch-aa,v 1.6 2010/02/12 00:23:34 joerg Exp $ --- Makefile.orig 1995-05-30 07:14:14.000000000 -0400 +++ Makefile @@ -20,9 +20,9 @@ $NetBSD: patch-aa,v 1.5 2005/03/10 16:58:39 tv Exp $ +all: es + +install: -+ ${BSD_INSTALL_PROGRAM} es $(PREFIX)/bin -+ ${BSD_INSTALL_SCRIPT} esdebug $(PREFIX)/bin/esdebug -+ ${BSD_INSTALL_MAN} es.1 $(PREFIX)/man/man1 ++ ${BSD_INSTALL_PROGRAM} es ${DESTDIR}$(PREFIX)/bin ++ ${BSD_INSTALL_SCRIPT} esdebug ${DESTDIR}$(PREFIX)/bin/esdebug ++ ${BSD_INSTALL_MAN} es.1 ${DESTDIR}$(PREFIX)/man/man1 + es : ${OFILES} initial.o ${CC} -o es ${LDFLAGS} ${OFILES} initial.o ${LIBS} diff --git a/shells/esh/Makefile b/shells/esh/Makefile index 6a17369d13e2..1b0d2bd41998 100644 --- a/shells/esh/Makefile +++ b/shells/esh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2007/02/20 19:04:15 wiz Exp $ +# $NetBSD: Makefile,v 1.26 2010/02/12 00:23:07 joerg Exp $ DISTNAME= esh-0.8 PKGREVISION= 2 @@ -8,25 +8,25 @@ MASTER_SITES= ${MASTER_SITE_BACKUP} MAINTAINER= pkgsrc-users@NetBSD.org COMMENT= Unix shell with Lisp-like syntax +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/esh PKG_SHELL= bin/esh INFO_FILES= # PLIST -INSTALLATION_DIRS= bin ${PKGINFODIR} +INSTALLATION_DIRS= bin ${PKGINFODIR} share/doc/esh share/examples/esh \ + share/emacs/site-lisp do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/esh ${PREFIX}/bin - ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/esh + ${INSTALL_PROGRAM} ${WRKSRC}/esh ${DESTDIR}${PREFIX}/bin ${INSTALL_DATA} ${WRKSRC}/examples/*.esh \ - ${PREFIX}/share/examples/esh - ${INSTALL_DATA_DIR} ${PREFIX}/share/emacs/site-lisp + ${DESTDIR}${PREFIX}/share/examples/esh ${INSTALL_DATA} ${WRKSRC}/emacs/esh-mode.el \ - ${PREFIX}/share/emacs/site-lisp + ${DESTDIR}${PREFIX}/share/emacs/site-lisp cd ${WRKSRC}/doc; for f in *.info *.info-[0-9]*; do \ ${TEST} ! -f "$$f" || \ - ${INSTALL_DATA} "$$f" ${PREFIX}/${PKGINFODIR}; \ + ${INSTALL_DATA} "$$f" ${DESTDIR}${PREFIX}/${PKGINFODIR}; \ done - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/esh cd ${WRKSRC}/doc && ${INSTALL_DATA} esh.html esh_toc.html \ - ${PREFIX}/share/doc/esh/ + ${DESTDIR}${PREFIX}/share/doc/esh/ .include "../../mk/bsd.pkg.mk" diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile index 1c546d547553..f48b4556eb52 100644 --- a/shells/rssh/Makefile +++ b/shells/rssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2006/03/04 21:30:39 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2010/02/12 00:27:18 joerg Exp $ # DISTNAME= rssh-2.3.2 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://rssh.sourceforge.net/ COMMENT= Restricted shell allowing only scp and/or sftp +PKG_DESTDIR_SUPPORT= user-destdir + GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} @@ -47,6 +49,6 @@ CONFIGURE_ARGS+= --with-rsync=${RSSH_RSYNC_PATH:Q} .endif post-install: - ${INSTALL_DATA} ${WRKSRC}/rssh.conf ${EGDIR}/rssh.conf + ${INSTALL_DATA} ${WRKSRC}/rssh.conf ${DESTDIR}${EGDIR}/rssh.conf .include "../../mk/bsd.pkg.mk" diff --git a/shells/rssh/distinfo b/shells/rssh/distinfo index 8e73500c1cad..0827a65b6d3b 100644 --- a/shells/rssh/distinfo +++ b/shells/rssh/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.3 2006/01/14 00:52:33 seb Exp $ +$NetBSD: distinfo,v 1.4 2010/02/12 00:27:18 joerg Exp $ SHA1 (rssh-2.3.2.tar.gz) = bc7154f50dec1e46cb76b3e1c00e2b1179e50d3d RMD160 (rssh-2.3.2.tar.gz) = bcdf7d111042bbf296d624943e3350d5273676ed Size (rssh-2.3.2.tar.gz) = 113959 bytes -SHA1 (patch-aa) = 0424bd8d705c8981cdd9076ba9a1d5eb59a192f3 +SHA1 (patch-aa) = c1be257e75bf4658606c0ff7cf7b42a02f1033f0 SHA1 (patch-ab) = 4ea3ca63d199e6fbfbc2e1db97f95700c203b593 diff --git a/shells/rssh/patches/patch-aa b/shells/rssh/patches/patch-aa index c18da0851f8e..2837b9db648b 100644 --- a/shells/rssh/patches/patch-aa +++ b/shells/rssh/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.1.1.1 2005/04/20 16:21:15 seb Exp $ +$NetBSD: patch-aa,v 1.2 2010/02/12 00:27:18 joerg Exp $ ---- Makefile.in.orig 2004-06-19 08:31:32.000000000 +0200 +--- Makefile.in.orig 2006-01-07 02:24:57.000000000 +0000 +++ Makefile.in -@@ -550,7 +550,7 @@ info-am: +@@ -670,7 +670,7 @@ info-am: install-data-am: install-man @@ -11,3 +11,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2005/04/20 16:21:15 seb Exp $ install-libexecPROGRAMS @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-exec-hook +@@ -728,7 +728,6 @@ uninstall-man: uninstall-man1 uninstall- + $(CC) -c $(DEFS) $(ourdefs) $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) $< + + install-exec-hook: +- chmod u+s $(libexecdir)/rssh_chroot_helper + + rpm: dist + rpmbuild -ta --sign $(base).tar.gz diff --git a/sysutils/munin-doc/Makefile b/sysutils/munin-doc/Makefile index feca61560d9a..d7b46fd64a29 100644 --- a/sysutils/munin-doc/Makefile +++ b/sysutils/munin-doc/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.5 2010/02/10 19:17:45 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2010/02/11 12:38:45 joerg Exp $ # -DISTNAME= ${PKGNAME:S:-doc-:_:} -PKGNAME= munin-doc-1.3.2 +VERS= 1.3.2 +DISTNAME= munin_${VERS} +PKGNAME= munin-doc-${VERS} PKGREVISION= 1 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=munin/} diff --git a/textproc/Makefile b/textproc/Makefile index d608d7538305..8ad09f3aeabd 100644 --- a/textproc/Makefile +++ b/textproc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.519 2010/02/10 17:52:30 joerg Exp $ +# $NetBSD: Makefile,v 1.520 2010/02/11 13:05:03 joerg Exp $ # COMMENT= Text processing utilities (does not include desktop publishing) @@ -398,6 +398,7 @@ SUBDIR+= py-FourSuite SUBDIR+= py-HappyDoc SUBDIR+= py-X SUBDIR+= py-cmTemplate +SUBDIR+= py-creole SUBDIR+= py-docutils SUBDIR+= py-elementtree SUBDIR+= py-enchant diff --git a/textproc/py-creole/DESCR b/textproc/py-creole/DESCR new file mode 100644 index 000000000000..1262a4e6290c --- /dev/null +++ b/textproc/py-creole/DESCR @@ -0,0 +1,4 @@ +py-creole is a converter between HTML and the Creole markup language. +Creole is a markup language that was created to simplify sharing content +between different wikis. It is supported by MoinMoin and various other +engines. The full language is descript in http://www.wikicreole.org/. diff --git a/textproc/py-creole/Makefile b/textproc/py-creole/Makefile new file mode 100644 index 000000000000..701d73d8b490 --- /dev/null +++ b/textproc/py-creole/Makefile @@ -0,0 +1,20 @@ +# $NetBSD: Makefile,v 1.1.1.1 2010/02/11 13:01:54 joerg Exp $ +# + +VERS= 0.2.5 +DISTNAME= python-creole-${VERS} +PKGNAME= ${PYPKGPREFIX}-creole-${VERS} +EGG_NAME= python_creole-${VERS} +CATEGORIES= textproc www python +MASTER_SITES= http://pypi.python.org/packages/source/p/python-creole/ + +MAINTAINER= joerg@NetBSD.org +HOMEPAGE= http://code.google.com/p/python-creole/ +COMMENT= Creole <-> HTML converter + +LICENSE= gnu-gpl-v3 + +PKG_DESTDIR_SUPPORT= user-destdir + +.include "../../lang/python/egg.mk" +.include "../../mk/bsd.pkg.mk" diff --git a/textproc/py-creole/PLIST b/textproc/py-creole/PLIST new file mode 100644 index 000000000000..a231d5635466 --- /dev/null +++ b/textproc/py-creole/PLIST @@ -0,0 +1,45 @@ +@comment $NetBSD: PLIST,v 1.1.1.1 2010/02/11 13:01:54 joerg Exp $ +${PYSITELIB}/creole/__init__.py +${PYSITELIB}/creole/__init__.pyc +${PYSITELIB}/creole/__init__.pyo +${PYSITELIB}/creole/creole2html.py +${PYSITELIB}/creole/creole2html.pyc +${PYSITELIB}/creole/creole2html.pyo +${PYSITELIB}/creole/creole_parser.py +${PYSITELIB}/creole/creole_parser.pyc +${PYSITELIB}/creole/creole_parser.pyo +${PYSITELIB}/creole/default_macros.py +${PYSITELIB}/creole/default_macros.pyc +${PYSITELIB}/creole/default_macros.pyo +${PYSITELIB}/creole/html2creole.py +${PYSITELIB}/creole/html2creole.pyc +${PYSITELIB}/creole/html2creole.pyo +${PYSITELIB}/${EGG_INFODIR}/PKG-INFO +${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt +${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt +${PYSITELIB}/${EGG_INFODIR}/top_level.txt +${PYSITELIB}/${EGG_INFODIR}/zip-safe +${PYSITELIB}/tests/__init__.py +${PYSITELIB}/tests/__init__.pyc +${PYSITELIB}/tests/__init__.pyo +${PYSITELIB}/tests/run_all_tests.py +${PYSITELIB}/tests/run_all_tests.pyc +${PYSITELIB}/tests/run_all_tests.pyo +${PYSITELIB}/tests/test_creole2html.py +${PYSITELIB}/tests/test_creole2html.pyc +${PYSITELIB}/tests/test_creole2html.pyo +${PYSITELIB}/tests/test_cross_compare.py +${PYSITELIB}/tests/test_cross_compare.pyc +${PYSITELIB}/tests/test_cross_compare.pyo +${PYSITELIB}/tests/test_html2creole.py +${PYSITELIB}/tests/test_html2creole.pyc +${PYSITELIB}/tests/test_html2creole.pyo +${PYSITELIB}/tests/utils/__init__.py +${PYSITELIB}/tests/utils/__init__.pyc +${PYSITELIB}/tests/utils/__init__.pyo +${PYSITELIB}/tests/utils/base_unittest.py +${PYSITELIB}/tests/utils/base_unittest.pyc +${PYSITELIB}/tests/utils/base_unittest.pyo +${PYSITELIB}/tests/utils/utils.py +${PYSITELIB}/tests/utils/utils.pyc +${PYSITELIB}/tests/utils/utils.pyo diff --git a/textproc/py-creole/distinfo b/textproc/py-creole/distinfo new file mode 100644 index 000000000000..f2538025d40f --- /dev/null +++ b/textproc/py-creole/distinfo @@ -0,0 +1,5 @@ +$NetBSD: distinfo,v 1.1.1.1 2010/02/11 13:01:54 joerg Exp $ + +SHA1 (python-creole-0.2.5.tar.gz) = cdc05b235a1ec66153b4078b7cbfea2efebfa248 +RMD160 (python-creole-0.2.5.tar.gz) = 05f5e579a5b886402bd832ed64b3b66b5536641d +Size (python-creole-0.2.5.tar.gz) = 31024 bytes diff --git a/textproc/py-pygments/Makefile b/textproc/py-pygments/Makefile index dae7697e5e78..8d7c994cf258 100644 --- a/textproc/py-pygments/Makefile +++ b/textproc/py-pygments/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.5 2009/05/19 08:59:36 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2010/02/11 12:57:38 joerg Exp $ # -DISTNAME= Pygments-1.0 +DISTNAME= Pygments-1.2.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:tl} CATEGORIES= textproc python MASTER_SITES= http://pypi.python.org/packages/source/P/Pygments/ diff --git a/textproc/py-pygments/PLIST b/textproc/py-pygments/PLIST index 79e1e36dd7b4..697d8e02b6f8 100644 --- a/textproc/py-pygments/PLIST +++ b/textproc/py-pygments/PLIST @@ -1,9 +1,8 @@ -@comment $NetBSD: PLIST,v 1.4 2009/06/14 18:17:25 joerg Exp $ +@comment $NetBSD: PLIST,v 1.5 2010/02/11 12:57:38 joerg Exp $ bin/pygmentize ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt ${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt -${PYSITELIB}/${EGG_INFODIR}/entry_points.txt ${PYSITELIB}/${EGG_INFODIR}/not-zip-safe ${PYSITELIB}/${EGG_INFODIR}/top_level.txt ${PYSITELIB}/pygments/__init__.py @@ -63,6 +62,9 @@ ${PYSITELIB}/pygments/lexer.pyo ${PYSITELIB}/pygments/lexers/__init__.py ${PYSITELIB}/pygments/lexers/__init__.pyc ${PYSITELIB}/pygments/lexers/__init__.pyo +${PYSITELIB}/pygments/lexers/_asybuiltins.py +${PYSITELIB}/pygments/lexers/_asybuiltins.pyc +${PYSITELIB}/pygments/lexers/_asybuiltins.pyo ${PYSITELIB}/pygments/lexers/_clbuiltins.py ${PYSITELIB}/pygments/lexers/_clbuiltins.pyc ${PYSITELIB}/pygments/lexers/_clbuiltins.pyo @@ -99,6 +101,9 @@ ${PYSITELIB}/pygments/lexers/math.pyo ${PYSITELIB}/pygments/lexers/other.py ${PYSITELIB}/pygments/lexers/other.pyc ${PYSITELIB}/pygments/lexers/other.pyo +${PYSITELIB}/pygments/lexers/parsers.py +${PYSITELIB}/pygments/lexers/parsers.pyc +${PYSITELIB}/pygments/lexers/parsers.pyo ${PYSITELIB}/pygments/lexers/special.py ${PYSITELIB}/pygments/lexers/special.pyc ${PYSITELIB}/pygments/lexers/special.pyo @@ -150,6 +155,9 @@ ${PYSITELIB}/pygments/styles/fruity.pyo ${PYSITELIB}/pygments/styles/manni.py ${PYSITELIB}/pygments/styles/manni.pyc ${PYSITELIB}/pygments/styles/manni.pyo +${PYSITELIB}/pygments/styles/monokai.py +${PYSITELIB}/pygments/styles/monokai.pyc +${PYSITELIB}/pygments/styles/monokai.pyo ${PYSITELIB}/pygments/styles/murphy.py ${PYSITELIB}/pygments/styles/murphy.pyc ${PYSITELIB}/pygments/styles/murphy.pyo diff --git a/textproc/py-pygments/distinfo b/textproc/py-pygments/distinfo index c11d96479a69..9388222238f4 100644 --- a/textproc/py-pygments/distinfo +++ b/textproc/py-pygments/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.3 2009/05/12 13:45:01 obache Exp $ +$NetBSD: distinfo,v 1.4 2010/02/11 12:57:38 joerg Exp $ -SHA1 (Pygments-1.0.tar.gz) = b71e33147fc402e361227b30e1f589eecafd42a7 -RMD160 (Pygments-1.0.tar.gz) = aa9d4816bb1bd1b67a5e6ac0f94d9ae3410df71b -Size (Pygments-1.0.tar.gz) = 930751 bytes +SHA1 (Pygments-1.2.2.tar.gz) = de191db0227a7cae76593228749b78f9d19b2d7f +RMD160 (Pygments-1.2.2.tar.gz) = 08b82db9736e9be2e4425ce4af228e7d1dc19bcd +Size (Pygments-1.2.2.tar.gz) = 1019873 bytes diff --git a/time/ocaml-calendar/Makefile b/time/ocaml-calendar/Makefile index e8638a02cedb..5fa7b0489d30 100644 --- a/time/ocaml-calendar/Makefile +++ b/time/ocaml-calendar/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2009/05/30 01:00:11 zafer Exp $ +# $NetBSD: Makefile,v 1.3 2010/02/12 00:31:52 joerg Exp $ # DISTNAME= calendar-2.0.4 @@ -10,6 +10,8 @@ MAINTAINER= jaapb@kerguelen.org HOMEPAGE= http://www.lri.fr/~signoles/prog.en.html/ COMMENT= OCaml library managing dates and times +PKG_DESTDIR_SUPPORT= user-destdir + DEPENDS+= ocaml-findlib-[0-9]*:../../devel/ocaml-findlib GNU_CONFIGURE= yes @@ -25,5 +27,7 @@ PLIST_SRC+= PLIST TEST_TARGET= tests +INSTALLATION_DIRS+= lib/ocaml/site-lib + .include "../../lang/ocaml/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/ocaml-calendar/distinfo b/time/ocaml-calendar/distinfo index ca0321659b8d..8ff194690fff 100644 --- a/time/ocaml-calendar/distinfo +++ b/time/ocaml-calendar/distinfo @@ -1,5 +1,6 @@ -$NetBSD: distinfo,v 1.1.1.1 2008/11/01 12:09:44 obache Exp $ +$NetBSD: distinfo,v 1.2 2010/02/12 00:31:52 joerg Exp $ SHA1 (calendar-2.0.4.tar.gz) = 60917d141a79b07b3bf4289ef906e97bd657814a RMD160 (calendar-2.0.4.tar.gz) = 23c2a5a8d030cdf19d4d98b7b7bdf67d87146b59 Size (calendar-2.0.4.tar.gz) = 221843 bytes +SHA1 (patch-aa) = 0a0520e4d63ef4315f8519e953d47d61f76bc6a6 diff --git a/time/ocaml-calendar/patches/patch-aa b/time/ocaml-calendar/patches/patch-aa new file mode 100644 index 000000000000..0060b6fb8e59 --- /dev/null +++ b/time/ocaml-calendar/patches/patch-aa @@ -0,0 +1,20 @@ +$NetBSD: patch-aa,v 1.1 2010/02/12 00:31:52 joerg Exp $ + +--- Makefile.in.orig 2010-02-12 00:29:07.000000000 +0000 ++++ Makefile.in +@@ -190,14 +190,7 @@ headers: + ######### + + install: $(LIBS) $(CLIBS) META +- @if [ "`sed -n -e 's/version = "\([0-9.]*\)"/\1/p' META`" = "$(VERSION)" ]; then \ +- (if test -d $(CAMLLIB)/site-lib/$(NAME); then $(MAKE) uninstall; fi;\ +- $(CAMLFIND) install $(NAME) target/*.cm[iox] $(MLI) $(CMI) $(CLIBS) META\ +- )else \ +- (echo; echo "Not the good version. Please, do :"; \ +- echo " make clean && make"; \ +- echo "next reinstall"; echo) \ +- fi ++ $(CAMLFIND) install -destdir ${DESTDIR}${CAMLLIB}/site-lib -ldconf /dev/null $(NAME) target/*.cm[iox] $(MLI) $(CMI) $(CLIBS) META\ + + uninstall: + $(CAMLFIND) remove $(NAME) diff --git a/time/wmfishtime/Makefile b/time/wmfishtime/Makefile index b8fa343b2787..8178545384a8 100644 --- a/time/wmfishtime/Makefile +++ b/time/wmfishtime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2006/03/04 21:30:53 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/12 00:28:02 joerg Exp $ # DISTNAME= wmfishtime-1.24 @@ -10,8 +10,12 @@ MAINTAINER= pkgsrc-users@NetBSD.org HOMEPAGE= http://www.ne.jp/asahi/linux/timecop/ COMMENT= Dockable clock application with clock, date and fish +PKG_DESTDIR_SUPPORT= user-destdir + USE_X11BASE= yes +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + .include "../../devel/libgetopt/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/time/wmfishtime/distinfo b/time/wmfishtime/distinfo index 6074417550b1..2c1d41536fb3 100644 --- a/time/wmfishtime/distinfo +++ b/time/wmfishtime/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.6 2005/02/23 19:14:56 wiz Exp $ +$NetBSD: distinfo,v 1.7 2010/02/12 00:28:02 joerg Exp $ SHA1 (wmfishtime-1.24.tar.gz) = f5c730102787bac48b19bb5418a70333cbe22c31 RMD160 (wmfishtime-1.24.tar.gz) = 9c705351ecbc28e15fd8e3b73712940fdb73baf1 Size (wmfishtime-1.24.tar.gz) = 21895 bytes -SHA1 (patch-aa) = 8122c7a1213914145b3fd43956e6982dca1c1214 +SHA1 (patch-aa) = b4529e948b3534b7ee7c62571eeed63c073ec6e2 SHA1 (patch-ba) = cd739472544fe79dcc12b22fa0b1dbc0281ac7bd SHA1 (patch-bb) = d35e6a640d89db0ea2ae60101cffb1957e836f58 diff --git a/time/wmfishtime/patches/patch-aa b/time/wmfishtime/patches/patch-aa index 66ae9d675a11..0037e02a9bff 100644 --- a/time/wmfishtime/patches/patch-aa +++ b/time/wmfishtime/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.4 2003/01/19 10:27:57 salo Exp $ +$NetBSD: patch-aa,v 1.5 2010/02/12 00:28:02 joerg Exp $ --- Makefile.orig Sat May 26 22:49:41 2001 +++ Makefile Sat Jan 19 05:48:48 2002 @@ -2,22 +2,22 @@ @@ -35,5 +35,5 @@ $NetBSD: patch-aa,v 1.4 2003/01/19 10:27:57 salo Exp $ install: - install $(INSTALL) wmfishtime $(PREFIX)/bin - install $(INSTALL) wmfishtime.1 $(PREFIX)/man/man1 -+ $(BSD_INSTALL_PROGRAM) wmfishtime $(PREFIX)/bin -+ $(BSD_INSTALL_MAN) wmfishtime.1 $(PREFIX)/man/man1 ++ $(BSD_INSTALL_PROGRAM) wmfishtime ${DESTDIR}$(PREFIX)/bin ++ $(BSD_INSTALL_MAN) wmfishtime.1 ${DESTDIR}$(PREFIX)/${PKGMANDIR}/man1 diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile index 0485e1fa1be0..0e4e201b8471 100644 --- a/time/wmmoonclock/Makefile +++ b/time/wmmoonclock/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2007/09/19 06:46:52 tron Exp $ +# $NetBSD: Makefile,v 1.19 2010/02/12 00:28:36 joerg Exp $ DISTNAME= wmMoonClock-1.27 PKGREVISION= 1 @@ -9,6 +9,8 @@ MAINTAINER= pkgsrc-users@NetBSD.org # HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml COMMENT= Shows lunar ephemeris to fairly high accuracy +PKG_DESTDIR_SUPPORT= user-destdir + WRKSRC= ${WRKDIR}/${DISTNAME}/Src USE_TOOLS+= gmake USE_X11BASE= YES @@ -21,6 +23,8 @@ MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q} EXTRA_LOCAL_LIBS= -lsocket .endif +INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 + .include "../../x11/libXext/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/xextproto/buildlink3.mk" diff --git a/time/wmmoonclock/distinfo b/time/wmmoonclock/distinfo index 05225ebafc93..8c1a2e7368ba 100644 --- a/time/wmmoonclock/distinfo +++ b/time/wmmoonclock/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.5 2005/02/23 19:14:56 wiz Exp $ +$NetBSD: distinfo,v 1.6 2010/02/12 00:28:36 joerg Exp $ SHA1 (wmMoonClock-1.27.tar.gz) = bbc27a11ff99505fe4b872019f214f305cee6c5b RMD160 (wmMoonClock-1.27.tar.gz) = adf74a0fff42a5e3d7823c7fabf71c95f47057e4 Size (wmMoonClock-1.27.tar.gz) = 155197 bytes -SHA1 (patch-aa) = 6b9d2459c7b92bee200c06f543a85ce429b8cd7b +SHA1 (patch-aa) = e6e38e186b6525c96e81c141d5ea75ce242b9e7a diff --git a/time/wmmoonclock/patches/patch-aa b/time/wmmoonclock/patches/patch-aa index ac43a5c47eb8..061c21412b25 100644 --- a/time/wmmoonclock/patches/patch-aa +++ b/time/wmmoonclock/patches/patch-aa @@ -1,4 +1,4 @@ -$NetBSD: patch-aa,v 1.3 2002/10/27 13:40:30 bouyer Exp $ +$NetBSD: patch-aa,v 1.4 2010/02/12 00:28:36 joerg Exp $ --- Makefile.orig Tue Mar 23 03:20:32 1999 +++ Makefile Thu Oct 17 00:31:50 2002 @@ -25,5 +25,5 @@ $NetBSD: patch-aa,v 1.3 2002/10/27 13:40:30 bouyer Exp $ - install -s -m 0755 wmMoonClock $(DESTDIR)/bin - install -m 0644 wmMoonClock.1 $(DESTDIR)/man/man1 - -+ $(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)/bin -+ $(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)/man/man1 ++ $(BSD_INSTALL_PROGRAM) wmMoonClock $(DESTDIR)${PREFIX}/bin ++ $(BSD_INSTALL_DATA) wmMoonClock.1 $(DESTDIR)${PREFIX}/${PKGMANDIR}/man1 diff --git a/wip/cabocha/Makefile b/wip/cabocha/Makefile index 4ab53be144f6..e5fe5ab04d28 100644 --- a/wip/cabocha/Makefile +++ b/wip/cabocha/Makefile @@ -10,11 +10,10 @@ PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_LANGUAGES= c c++ -USE_TOOLS+= gmake perl:run +USE_TOOLS+= gmake perl:run gzcat CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-perl=${PERL5:Q} -CONFIGURE_ARGS+= --with-morphological-analyzer=chasen INSTALL_MAKE_FLAGS+= confdir=${PREFIX}/share/examples @@ -24,6 +23,13 @@ TEST_TARGET= check BUILD_DEPENDS+= nkf-[0-9]*:../../converters/nkf +# using zcat to extract .gz +SUBST_CLASSES+= zcat +SUBST_STAGE.zcat= post-configure +SUBST_FILES.zcat= model/Makefile +SUBST_SED.zcat= -e 's|zcat|${TOOLS_CMDLINE_GZCAT}|g' + +.include "options.mk" + .include "../../wip/yamcha/buildlink3.mk" -.include "../../textproc/chasen/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wip/cabocha/options.mk b/wip/cabocha/options.mk new file mode 100644 index 000000000000..8c9c993e991d --- /dev/null +++ b/wip/cabocha/options.mk @@ -0,0 +1,19 @@ +# $NetBSD$ +# + +PKG_OPTIONS_VAR= PKG_OPTIONS.cabocha +PKG_OPTIONS_NONEMPTY_SETS= ma +PKG_OPTIONS_SET.ma= chasen mecab +PKG_SUGGESTED_OPTIONS= chasen + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mchasen) +CONFIGURE_ARGS+= --with-morphological-analyzer=chasen +.include "../../textproc/chasen/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Mmecab) +CONFIGURE_ARGS+= --with-morphological-analyzer=mecab +.include "../../textproc/mecab/buildlink3.mk" +.endif diff --git a/wip/classic-mac-font-pack/Makefile b/wip/classic-mac-font-pack/Makefile index c5676304a3ed..1047afa96ca3 100644 --- a/wip/classic-mac-font-pack/Makefile +++ b/wip/classic-mac-font-pack/Makefile @@ -41,8 +41,10 @@ SITES.MONACO.TTF= http://www.webdevkungfu.com/files/ DISTFILES+= genoa.zip SITES.genoa.zip= http://www.searchfreefonts.com/assets/downloads/ -#DISTFILES+= -#SITES.apple_garamond.zip= +# This next one has Apple Garamond. +# I don't think it is freely distributable though. +#DISTFILES+= macfonts.tar.gz +#SITES.macfonts.tar.gz= http://ubuntu-debs.googlecode.com/files/ DISTFILES+= virtue.zip SITES.virtue.zip= http://www.scootergraphics.com/virtue/ DISTFILES+= Mottek.zip diff --git a/wip/classic-mac-font-pack/distinfo b/wip/classic-mac-font-pack/distinfo index 564891257ed2..bb24a2aaed30 100644 --- a/wip/classic-mac-font-pack/distinfo +++ b/wip/classic-mac-font-pack/distinfo @@ -24,6 +24,9 @@ Size (alexandria.zip) = 14145 bytes SHA1 (genoa.zip) = 2c1245c81f8ac910f936d700985c1d6b968fe722 RMD160 (genoa.zip) = 94ad3b5babfdf6789373c01a87f60713c2b49a21 Size (genoa.zip) = 21257 bytes +SHA1 (macfonts.tar.gz) = 3ebbc503c42c30c1f49242646dd40946906acdb7 +RMD160 (macfonts.tar.gz) = 4bc2d1d3cb3f6a58955f59512ae32bac6976c11e +Size (macfonts.tar.gz) = 1294760 bytes SHA1 (virtue.zip) = fbe05243b39627326f585429fe50b3bb746c4ebe RMD160 (virtue.zip) = 9bd1aef190555518829cd7575e6b3504a1191eaa Size (virtue.zip) = 59576 bytes diff --git a/wip/couchdb-glib/Makefile b/wip/couchdb-glib/Makefile index 6548841cded9..cefb4751787b 100644 --- a/wip/couchdb-glib/Makefile +++ b/wip/couchdb-glib/Makefile @@ -1,7 +1,7 @@ # $NetBSD$ # -DISTNAME= couchdb-glib-0.5.3 +DISTNAME= couchdb-glib-0.5.99 CATEGORIES= databases gnome MASTER_SITES= ftp://ftp.gnome.org/pub/gnome/sources/couchdb-glib/0.5/ EXTRACT_SUFX= .tar.bz2 @@ -9,19 +9,24 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= kamelderouiche@yahoo.com HOMEPAGE= https://launchpad.net/couchdb-glib COMMENT= GLib-based api to access couchdb databases -#LICENSE= # TODO: (see mk/license.mk) +LICENSE= gnu-gpl-v2 + +DEPENDS+= gobject-introspection>=0.6.7:../../wip/gobject-introspection PKG_DESTDIR_SUPPORT= user-destdir GNU_CONFIGURE= yes USE_LIBTOOL= yes -USE_TOOLS+= pkg-config +USE_TOOLS+= pkg-config gmake PKGCONFIG_OVERRIDE+= couchdb-glib.pc.in +PKGCONFIG_OVERRIDE+= desktopcouch-glib.pc.in + -.include "../../devel/GConf/schemas.mk" .include "../../devel/glib2/buildlink3.mk" .include "../../net/libsoup24/buildlink3.mk" +.include "../../security/gnome-keyring/buildlink3.mk" +.include "../../sysutils/dbus-glib/buildlink3.mk" .include "../../textproc/json-glib/buildlink3.mk" .include "../../wip/libuuid/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/wip/couchdb-glib/PLIST b/wip/couchdb-glib/PLIST index 31c5d3dc712f..1c857803bbea 100644 --- a/wip/couchdb-glib/PLIST +++ b/wip/couchdb-glib/PLIST @@ -1,6 +1,37 @@ @comment $NetBSD$ +include/couchdb-glib-1.0/couchdb-credentials.h +include/couchdb-glib-1.0/couchdb-database-info.h include/couchdb-glib-1.0/couchdb-document-contact.h +include/couchdb-glib-1.0/couchdb-document-info.h +include/couchdb-glib-1.0/couchdb-document.h include/couchdb-glib-1.0/couchdb-glib.h +include/couchdb-glib-1.0/couchdb-session.h +include/couchdb-glib-1.0/couchdb-struct-field.h include/couchdb-glib-1.0/couchdb-types.h +include/desktopcouch-glib-1.0/desktopcouch-glib.h +include/desktopcouch-glib-1.0/desktopcouch-session.h lib/libcouchdb-glib-1.0.la +lib/libdesktopcouch-glib-1.0.la lib/pkgconfig/couchdb-glib-1.0.pc +lib/pkgconfig/desktopcouch-glib-1.0.pc +share/doc/couchdb-glib/LICENSE +share/doc/couchdb-glib/NEWS +share/doc/couchdb-glib/README +share/doc/couchdb-glib/couchdb-glib.doap +share/gtk-doc/html/couchdb-glib/CouchdbCredentials.html +share/gtk-doc/html/couchdb-glib/CouchdbDocument.html +share/gtk-doc/html/couchdb-glib/CouchdbSession.html +share/gtk-doc/html/couchdb-glib/ch01.html +share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-database-info.html +share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-document-contact.html +share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-document-info.html +share/gtk-doc/html/couchdb-glib/couchdb-glib-couchdb-struct-field.html +share/gtk-doc/html/couchdb-glib/couchdb-glib.devhelp +share/gtk-doc/html/couchdb-glib/couchdb-glib.devhelp2 +share/gtk-doc/html/couchdb-glib/home.png +share/gtk-doc/html/couchdb-glib/index.html +share/gtk-doc/html/couchdb-glib/index.sgml +share/gtk-doc/html/couchdb-glib/left.png +share/gtk-doc/html/couchdb-glib/right.png +share/gtk-doc/html/couchdb-glib/style.css +share/gtk-doc/html/couchdb-glib/up.png diff --git a/wip/couchdb-glib/distinfo b/wip/couchdb-glib/distinfo index 221608d18bcf..b0820c429df8 100644 --- a/wip/couchdb-glib/distinfo +++ b/wip/couchdb-glib/distinfo @@ -1,5 +1,5 @@ $NetBSD$ -SHA1 (couchdb-glib-0.5.3.tar.bz2) = 564483cfaba7b5bd36c5070dd6f9fe22893c6b26 -RMD160 (couchdb-glib-0.5.3.tar.bz2) = 1a0a526b43b45c38facb9b9d8f7cf3ccee27c156 -Size (couchdb-glib-0.5.3.tar.bz2) = 264272 bytes +SHA1 (couchdb-glib-0.5.99.tar.bz2) = 5fc272b1290a03ac7e6ca3bff4bfb014722a5649 +RMD160 (couchdb-glib-0.5.99.tar.bz2) = 8839bf036069b677e4fc5f91720c082b8490ec25 +Size (couchdb-glib-0.5.99.tar.bz2) = 338419 bytes diff --git a/wip/deforaos-panel/PLIST b/wip/deforaos-panel/PLIST index 1e5d5f9dd292..ebcbc8145624 100644 --- a/wip/deforaos-panel/PLIST +++ b/wip/deforaos-panel/PLIST @@ -5,6 +5,7 @@ include/Panel.h lib/Panel/applets/battery.so lib/Panel/applets/clock.so lib/Panel/applets/cpu.so +lib/Panel/applets/cpufreq.so lib/Panel/applets/desktop.so lib/Panel/applets/lock.so lib/Panel/applets/logout.so @@ -12,3 +13,4 @@ lib/Panel/applets/main.so lib/Panel/applets/memory.so lib/Panel/applets/pager.so lib/Panel/applets/tasks.so +lib/Panel/applets/volume.so diff --git a/wip/evolution-couchdb/Makefile b/wip/evolution-couchdb/Makefile index 1b36e625f801..306c112b8162 100644 --- a/wip/evolution-couchdb/Makefile +++ b/wip/evolution-couchdb/Makefile @@ -1,8 +1,7 @@ # $NetBSD$ # -DISTNAME= evolution-couchdb-0.3.4 -PKGREVISION= 1 +DISTNAME= evolution-couchdb-0.3.99 CATEGORIES= mail MASTER_SITES= ftp://ftp.gnome.org/pub/gnome/sources/evolution-couchdb/0.3/ EXTRACT_SUFX= .tar.bz2 @@ -10,7 +9,7 @@ EXTRACT_SUFX= .tar.bz2 MAINTAINER= kamelderouiche@yahoo.com HOMEPAGE= https://launchpad.net/evolution-couchdb COMMENT= Evolution backend to access CouchDBs -#LICENSE= # TODO: (see mk/license.mk) +LICENSE= gnu-gpl-v2 PKG_DESTDIR_SUPPORT= user-destdir @@ -19,8 +18,6 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_TOOLS+= pkg-config gmake intltool msgfmt - - .include "../../devel/glib2/buildlink3.mk" .include "../../mail/evolution/buildlink3.mk" .include "../../mail/evolution-data-server/buildlink3.mk" diff --git a/wip/evolution-couchdb/PLIST b/wip/evolution-couchdb/PLIST index 80ef3152a183..fc1fb08ac8ee 100644 --- a/wip/evolution-couchdb/PLIST +++ b/wip/evolution-couchdb/PLIST @@ -2,11 +2,13 @@ lib/evolution-data-server-1.2/extensions/libebookbackendcouchdb.la lib/evolution/2.28/plugins/liborg-gnome-evolution-couchdb.la lib/evolution/2.28/plugins/org-gnome-evolution-couchdb.eplug +share/locale/ca/LC_MESSAGES/evolution-couchdb.mo share/locale/cs/LC_MESSAGES/evolution-couchdb.mo share/locale/de/LC_MESSAGES/evolution-couchdb.mo share/locale/el/LC_MESSAGES/evolution-couchdb.mo share/locale/es/LC_MESSAGES/evolution-couchdb.mo share/locale/fr/LC_MESSAGES/evolution-couchdb.mo +share/locale/nds/LC_MESSAGES/evolution-couchdb.mo share/locale/pt_BR/LC_MESSAGES/evolution-couchdb.mo share/locale/sl/LC_MESSAGES/evolution-couchdb.mo share/locale/sv/LC_MESSAGES/evolution-couchdb.mo diff --git a/wip/evolution-couchdb/distinfo b/wip/evolution-couchdb/distinfo index f4710dd14048..ac98bda48410 100644 --- a/wip/evolution-couchdb/distinfo +++ b/wip/evolution-couchdb/distinfo @@ -1,5 +1,5 @@ $NetBSD$ -SHA1 (evolution-couchdb-0.3.4.tar.bz2) = 719e5d939fc792e165453b54ed76a69a7fc33f2e -RMD160 (evolution-couchdb-0.3.4.tar.bz2) = dd5ea22f7146949646d5cfcb5337a11fd2c83971 -Size (evolution-couchdb-0.3.4.tar.bz2) = 259170 bytes +SHA1 (evolution-couchdb-0.3.99.tar.bz2) = 225ee4d54b206893ba8c372f5046a5e45d443d2a +RMD160 (evolution-couchdb-0.3.99.tar.bz2) = 573f14a5119bb35cc48ff9fa1d150cb666a1c3de +Size (evolution-couchdb-0.3.99.tar.bz2) = 284249 bytes diff --git a/wip/flvmeta/Makefile b/wip/flvmeta/Makefile index d8114c995ce8..3ef0aab77b7d 100644 --- a/wip/flvmeta/Makefile +++ b/wip/flvmeta/Makefile @@ -1,7 +1,7 @@ # $NetBSD$ # -DISTNAME= flvmeta-1.0.10 +DISTNAME= flvmeta-1.0.11 CATEGORIES= multimedia MASTER_SITES= http://flvmeta.googlecode.com/files/ diff --git a/wip/flvmeta/distinfo b/wip/flvmeta/distinfo index aa7edc758a1c..58afd927a0a7 100644 --- a/wip/flvmeta/distinfo +++ b/wip/flvmeta/distinfo @@ -1,5 +1,5 @@ $NetBSD$ -SHA1 (flvmeta-1.0.10.tar.gz) = e17bb1c12f2eeb96a1bd1a4874f812d15f42286a -RMD160 (flvmeta-1.0.10.tar.gz) = 106f35cbd72cbf9d75f67c531aeb303583a3056f -Size (flvmeta-1.0.10.tar.gz) = 114536 bytes +SHA1 (flvmeta-1.0.11.tar.gz) = cec7da5da2e63d479e1714ada178332c55fe1d9a +RMD160 (flvmeta-1.0.11.tar.gz) = 410d6929ce61b232dfe64dc91ec93aac64527bb8 +Size (flvmeta-1.0.11.tar.gz) = 114879 bytes diff --git a/wip/trac-plugins-AccountManager/Makefile b/wip/trac-plugins-AccountManager/Makefile index 738613b8137c..c1b44ca2ef6f 100644 --- a/wip/trac-plugins-AccountManager/Makefile +++ b/wip/trac-plugins-AccountManager/Makefile @@ -15,7 +15,7 @@ PKG_DESTDIR_SUPPORT= user-destdir DEPENDS+= {ja-,}trac>=0.11:../../www/trac -SVN_REV= 5836 +SVN_REV= 7163 SVN_MOD= accountmanagerplugin/0.11 WRKSRC= ${WRKDIR}/${SVN_MOD} diff --git a/wip/trac-plugins-AccountManager/distinfo b/wip/trac-plugins-AccountManager/distinfo index 21a4c430c23f..d562f4cac681 100644 --- a/wip/trac-plugins-AccountManager/distinfo +++ b/wip/trac-plugins-AccountManager/distinfo @@ -1,7 +1,6 @@ $NetBSD$ -SHA1 (accountmanagerplugin_0.11-r5836.zip) = 3736bb899497553911ba799e6c9ac6006ba992b9 -RMD160 (accountmanagerplugin_0.11-r5836.zip) = 636196d67f5da1e294286ed55a94fdc8594b06c1 -Size (accountmanagerplugin_0.11-r5836.zip) = 44560 bytes -SHA1 (patch-aa) = 07fb158909f85eab89862a0a00da445747d0e178 +SHA1 (accountmanagerplugin_0.11-r7163.zip) = a790468fbb20d08c4f77e6897b921aa22086f369 +RMD160 (accountmanagerplugin_0.11-r7163.zip) = e0e36602649557aebbe4cf555d256266380adc1d +Size (accountmanagerplugin_0.11-r7163.zip) = 44511 bytes SHA1 (patch-ab) = bcb4aec4e1384f6a0c932c480a46b9311eb19cd7 diff --git a/wip/trac-plugins-AccountManager/patches/patch-aa b/wip/trac-plugins-AccountManager/patches/patch-aa deleted file mode 100644 index 5a5ca6fa4521..000000000000 --- a/wip/trac-plugins-AccountManager/patches/patch-aa +++ /dev/null @@ -1,70 +0,0 @@ -$NetBSD$ - -Work with trac-0.11.x -http://trac-hacks.org/ticket/4125 - -Index: acct_mgr/web_ui.py -=================================================================== ---- acct_mgr/web_ui.py (revision 5267) -+++ acct_mgr/web_ui.py (working copy) -@@ -24,6 +24,7 @@ - from trac.web.main import IRequestHandler, IRequestFilter - from trac.web import chrome - from trac.web.chrome import INavigationContributor, ITemplateProvider -+from genshi.core import Markup - from genshi.builder import tag - - from api import AccountManager -@@ -239,7 +240,7 @@ - if force_change_password: - del(req.session['force_change_passwd']) - req.session.save() -- chrome.add_notice(req, MessageWrapper(tag( -+ chrome.add_notice(req, Markup(tag( - "Thank you for taking the time to update your password." - ))) - force_change_password = False -@@ -248,7 +249,7 @@ - else: - data.update({'error': 'Invalid action'}) - if force_change_password: -- chrome.add_warning(req, MessageWrapper(tag( -+ chrome.add_warning(req, Markup(tag( - "You are required to change password because of a recent " - "password change request. ", - tag.b("Please change your password now.")))) -@@ -507,16 +508,6 @@ - return [resource_filename(__name__, 'templates')] - - --class MessageWrapper(object): -- """Wrapper for add_warning and add_notice to work around the requirement -- for a % operator.""" -- def __init__(self, body): -- self.body = body -- -- def __mod__(self, rhs): -- return self.body -- -- - class EmailVerificationNotification(SingleUserNofification): - template_name = 'verify_email.txt' - -@@ -549,7 +540,7 @@ - # tickets. As such, this email verifying code won't be used on them - return handler - if handler is not self and 'email_verification_token' in req.session: -- chrome.add_warning(req, MessageWrapper(tag.span( -+ chrome.add_warning(req, Markup(tag.span( - 'Your permissions have been limited until you ', - tag.a(href=req.href.verify_email())( - 'verify your email address')))) -@@ -566,7 +557,7 @@ - req.session['email_verification_token'] = self._gen_token() - req.session['email_verification_sent_to'] = req.session.get('email') - self._send_email(req) -- chrome.add_notice(req, MessageWrapper(tag.span( -+ chrome.add_notice(req, Markup(tag.span( - 'An email has been sent to ', req.session['email'], - ' with a token to ', - tag.a(href=req.href.verify_email())( diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile index 40f2b27542db..89b75f528c5c 100644 --- a/wm/metacity/Makefile +++ b/wm/metacity/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.84 2009/12/15 22:14:28 joerg Exp $ +# $NetBSD: Makefile,v 1.85 2010/02/11 18:19:13 drochner Exp $ # -DISTNAME= metacity-2.28.0 -PKGREVISION= 1 +DISTNAME= metacity-2.28.1 CATEGORIES= wm x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/metacity/2.28/} EXTRACT_SUFX= .tar.bz2 diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST index cd0e916ad0af..3fb90a53c2ff 100644 --- a/wm/metacity/PLIST +++ b/wm/metacity/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.31 2009/10/22 17:33:57 drochner Exp $ +@comment $NetBSD: PLIST,v 1.32 2010/02/11 18:19:13 drochner Exp $ bin/metacity bin/metacity-message bin/metacity-theme-viewer @@ -12,9 +12,9 @@ include/metacity-1/metacity-private/theme.h include/metacity-1/metacity-private/util.h lib/libmetacity-private.la lib/pkgconfig/libmetacity-private.pc +man/man1/metacity-message.1 man/man1/metacity-theme-viewer.1 man/man1/metacity-window-demo.1 -man/man1/metacity-message.1 man/man1/metacity.1 share/applications/metacity.desktop share/gconf/schemas/metacity.schemas @@ -36,12 +36,14 @@ share/locale/br/LC_MESSAGES/metacity.mo share/locale/bs/LC_MESSAGES/metacity.mo share/locale/ca/LC_MESSAGES/metacity.mo share/locale/ca@valencia/LC_MESSAGES/metacity.mo +share/locale/crh/LC_MESSAGES/metacity.mo share/locale/cs/LC_MESSAGES/metacity.mo share/locale/cy/LC_MESSAGES/metacity.mo share/locale/da/LC_MESSAGES/metacity.mo share/locale/de/LC_MESSAGES/metacity.mo share/locale/dz/LC_MESSAGES/metacity.mo share/locale/el/LC_MESSAGES/metacity.mo +share/locale/en@shaw/LC_MESSAGES/metacity.mo share/locale/en_CA/LC_MESSAGES/metacity.mo share/locale/en_GB/LC_MESSAGES/metacity.mo share/locale/es/LC_MESSAGES/metacity.mo diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo index 6c19b7ef02f4..7ec31cefecf4 100644 --- a/wm/metacity/distinfo +++ b/wm/metacity/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.40 2009/10/22 17:33:57 drochner Exp $ +$NetBSD: distinfo,v 1.41 2010/02/11 18:19:13 drochner Exp $ -SHA1 (metacity-2.28.0.tar.bz2) = d64dc861ac00fffc503bf9acdc705b67b772d772 -RMD160 (metacity-2.28.0.tar.bz2) = 0eec1900fad87604bc531757d0e878d2da8cb89d -Size (metacity-2.28.0.tar.bz2) = 2288241 bytes +SHA1 (metacity-2.28.1.tar.bz2) = 752d1aff3a1a96d63069bcf58de5cc21de9a240d +RMD160 (metacity-2.28.1.tar.bz2) = 3d93c7f0a771f8ba2d82ef03b13d79e90af4b62c +Size (metacity-2.28.1.tar.bz2) = 2348762 bytes SHA1 (patch-aa) = e57853437a8485399f302553a4a4289e607d3780 SHA1 (patch-ab) = 6e3f56831d152a2144a8970a5c17b37be70ca117 +SHA1 (patch-ac) = bfdb91948f619a7021a6d1d7d0ff4b7995c8e91d diff --git a/wm/metacity/patches/patch-ac b/wm/metacity/patches/patch-ac new file mode 100644 index 000000000000..83d0348bc0d4 --- /dev/null +++ b/wm/metacity/patches/patch-ac @@ -0,0 +1,12 @@ +$NetBSD: patch-ac,v 1.1 2010/02/11 18:19:13 drochner Exp $ + +--- src/core/delete.c.orig 2010-01-26 11:11:27.000000000 +0000 ++++ src/core/delete.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + static void meta_window_present_delete_dialog (MetaWindow *window, + guint32 timestamp); diff --git a/www/Makefile b/www/Makefile index 11c83be6b625..7a31ae0284ae 100644 --- a/www/Makefile +++ b/www/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.699 2010/02/10 18:08:33 joerg Exp $ +# $NetBSD: Makefile,v 1.700 2010/02/11 12:27:07 wiz Exp $ # COMMENT= Packages related to the World Wide Web @@ -436,7 +436,6 @@ SUBDIR+= pear-HTML_Select SUBDIR+= pear-HTML_TreeMenu SUBDIR+= pear-HTTP SUBDIR+= pear-HTTP_Request -SUBDIR+= php-FastTemplate SUBDIR+= php-apc SUBDIR+= php-curl SUBDIR+= php-eaccelerator diff --git a/www/py-django/Makefile b/www/py-django/Makefile index c71c2b819413..f3c93c7ab7bf 100644 --- a/www/py-django/Makefile +++ b/www/py-django/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2010/02/10 19:30:09 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2010/02/11 13:37:44 joerg Exp $ DJANGOVERS= 1.1.1 DISTNAME= Django-${DJANGOVERS} @@ -27,7 +27,9 @@ DEPENDS+= ${PYPKGPREFIX}-flup-[0-9]*:../../www/py-flup .include "options.mk" pre-configure: +.if empty(PKG_OPTIONS:Moracle) rm -r ${WRKSRC}/django/db/backends/oracle +.endif .if empty(PKG_OPTIONS:Mmysql) rm -r ${WRKSRC}/django/db/backends/mysql .endif diff --git a/www/py-django/PLIST b/www/py-django/PLIST index fa9f3e540d88..01ccadb2b506 100644 --- a/www/py-django/PLIST +++ b/www/py-django/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.14 2010/02/10 19:30:09 joerg Exp $ +@comment $NetBSD: PLIST,v 1.15 2010/02/11 13:37:44 joerg Exp $ bin/django-admin.py ${PYSITELIB}/django/__init__.py ${PYSITELIB}/django/__init__.pyc @@ -1863,6 +1863,24 @@ ${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/introspection.pyo ${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.py ${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.pyc ${PLIST.mysql}${PYSITELIB}/django/db/backends/mysql/validation.pyo +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/__init__.py +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/__init__.pyc +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/__init__.pyo +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/base.py +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/base.pyc +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/base.pyo +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.py +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.pyc +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/client.pyo +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.py +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.pyc +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/creation.pyo +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.py +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyc +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/introspection.pyo +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/query.py +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/query.pyc +${PLIST.oracle}${PYSITELIB}/django/db/backends/oracle/query.pyo ${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql/__init__.py ${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql/__init__.pyc ${PLIST.pgsql}${PYSITELIB}/django/db/backends/postgresql/__init__.pyo diff --git a/www/py-django/options.mk b/www/py-django/options.mk index d83e4ed6bc3e..4d7555fb3f82 100644 --- a/www/py-django/options.mk +++ b/www/py-django/options.mk @@ -1,7 +1,7 @@ -# $NetBSD: options.mk,v 1.7 2010/02/10 19:30:09 joerg Exp $ +# $NetBSD: options.mk,v 1.8 2010/02/11 13:37:45 joerg Exp $ PKG_OPTIONS_VAR = PKG_OPTIONS.django -PKG_SUPPORTED_OPTIONS= mysql pgsql sqlite +PKG_SUPPORTED_OPTIONS= mysql oracle pgsql sqlite PKG_SUGGESTED_OPTIONS= pgsql .include "../../mk/bsd.options.mk" @@ -13,6 +13,11 @@ DEPENDS+= ${PYPKGPREFIX}-mysqldb-[0-9]*:../../databases/py-mysqldb PLIST.mysql= yes .endif +.if !empty(PKG_OPTIONS:Moracle) +DEPENDS+= ${PYPKGPREFIX}-cx_Oracle-[0-9]*:../../databases/py-cx_Oracle +PLIST.oracle= yes +.endif + .if !empty(PKG_OPTIONS:Mpgsql) DEPENDS+= ${PYPKGPREFIX}-psycopg2-[0-9]*:../../databases/py-psycopg2 PLIST.pgsql= yes diff --git a/x11/gnome-screensaver/Makefile b/x11/gnome-screensaver/Makefile index b0dd214d2cb5..65f0db8fdc0b 100644 --- a/x11/gnome-screensaver/Makefile +++ b/x11/gnome-screensaver/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.39 2009/11/18 08:12:12 wiz Exp $ +# $NetBSD: Makefile,v 1.40 2010/02/11 18:02:39 drochner Exp $ # -DISTNAME= gnome-screensaver-2.28.0 -PKGREVISION= 1 +DISTNAME= gnome-screensaver-2.28.2 CATEGORIES= x11 gnome MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-screensaver/2.28/} EXTRACT_SUFX= .tar.bz2 diff --git a/x11/gnome-screensaver/PLIST b/x11/gnome-screensaver/PLIST index 951e9c6a9ec1..e96a07566f1e 100644 --- a/x11/gnome-screensaver/PLIST +++ b/x11/gnome-screensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.16 2009/11/17 17:54:25 wiz Exp $ +@comment $NetBSD: PLIST,v 1.17 2010/02/11 18:02:39 drochner Exp $ bin/gnome-screensaver bin/gnome-screensaver-command bin/gnome-screensaver-preferences @@ -30,12 +30,12 @@ share/backgrounds/cosmos/whirlpool.jpg share/desktop-directories/gnome-screensaver.directory share/examples/gnome-screensaver/pam.d/gnome-screensaver-Linux share/examples/gnome-screensaver/pam.d/gnome-screensaver-NetBSD -share/examples/gnome-screensaver/xdg/autostart/gnome-screensaver.desktop share/examples/gnome-screensaver/xdg/menus/gnome-screensavers.menu share/gconf/schemas/gnome-screensaver.schemas share/gnome-background-properties/cosmos.xml share/gnome-screensaver/gnome-screensaver-preferences.ui share/gnome-screensaver/lock-dialog-default.ui +share/gnome/autostart/gnome-screensaver.desktop share/locale/ar/LC_MESSAGES/gnome-screensaver.mo share/locale/as/LC_MESSAGES/gnome-screensaver.mo share/locale/ast/LC_MESSAGES/gnome-screensaver.mo diff --git a/x11/gnome-screensaver/distinfo b/x11/gnome-screensaver/distinfo index a5a172089d29..0ea5b6b3e785 100644 --- a/x11/gnome-screensaver/distinfo +++ b/x11/gnome-screensaver/distinfo @@ -1,9 +1,8 @@ -$NetBSD: distinfo,v 1.19 2009/11/18 08:12:12 wiz Exp $ +$NetBSD: distinfo,v 1.20 2010/02/11 18:02:39 drochner Exp $ -SHA1 (gnome-screensaver-2.28.0.tar.bz2) = 7981b09f75076ebb8cd55032696f12ed06b224ca -RMD160 (gnome-screensaver-2.28.0.tar.bz2) = 3e29efc67cafd66c6aac7c2b4d17b0c2d42b4edb -Size (gnome-screensaver-2.28.0.tar.bz2) = 4779450 bytes +SHA1 (gnome-screensaver-2.28.2.tar.bz2) = ec31c4208c8eed32ba12d27b501b3dd17d3a8c99 +RMD160 (gnome-screensaver-2.28.2.tar.bz2) = f2eb4524794ac995181ccee361dd7cf58f40cb8c +Size (gnome-screensaver-2.28.2.tar.bz2) = 4786755 bytes SHA1 (patch-aa) = 20f25a4efc3c134366280afbfb8aeb49db791208 SHA1 (patch-ab) = 5b5f9d69fd071bfd6f9b316626e23585841dad9d -SHA1 (patch-ac) = 6e7dbae1d0693bf3f20a5e44d2d35c68dbe3ba3f -SHA1 (patch-ad) = a2b001d143ca7d440c7f22a3f142c8d12e9b17cc +SHA1 (patch-ae) = e7f36cb3bb673800ae2001ac3b2237cb912f56c3 diff --git a/x11/gnome-screensaver/patches/patch-ac b/x11/gnome-screensaver/patches/patch-ac deleted file mode 100644 index b0130b60f20e..000000000000 --- a/x11/gnome-screensaver/patches/patch-ac +++ /dev/null @@ -1,50 +0,0 @@ -$NetBSD: patch-ac,v 1.7 2009/11/18 08:12:12 wiz Exp $ - -https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/446395 -http://patches.ubuntu.com/g/gnome-screensaver/extracted/08_gs_dialog_request_to_exit.patch - ---- src/gnome-screensaver-dialog.c.orig 2009-08-26 16:06:12.000000000 +0000 -+++ src/gnome-screensaver-dialog.c -@@ -29,6 +29,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -326,6 +327,21 @@ response_cb (GSLockPlug *plug, - } - - static gboolean -+response_request_quit (void) -+{ -+ printf ("REQUEST QUIT\n"); -+ fflush (stdout); -+ return FALSE; -+} -+ -+static gboolean -+quit_timeout_cb (gpointer data) -+{ -+ gtk_main_quit (); -+ return FALSE; -+} -+ -+static gboolean - auth_check_idle (GSLockPlug *plug) - { - gboolean res; -@@ -347,7 +363,11 @@ auth_check_idle (GSLockPlug *plug) - } else { - gs_debug ("Authentication failed, quitting (max failures)"); - again = FALSE; -- gtk_main_quit (); -+ /* Don't quit immediately, but rather request that gnome-screensaver -+ * terminates us after it has finished the dialog shake. Time out -+ * after 5 seconds and quit anyway if this doesn't happen though */ -+ g_idle_add ((GSourceFunc)response_request_quit, NULL); -+ g_timeout_add (5000, (GSourceFunc)quit_timeout_cb, NULL); - } - } - diff --git a/x11/gnome-screensaver/patches/patch-ad b/x11/gnome-screensaver/patches/patch-ad deleted file mode 100644 index c686d459cf6f..000000000000 --- a/x11/gnome-screensaver/patches/patch-ad +++ /dev/null @@ -1,73 +0,0 @@ -$NetBSD: patch-ad,v 1.1 2009/11/18 08:12:12 wiz Exp $ - -https://bugs.launchpad.net/ubuntu/+source/gnome-screensaver/+bug/446395 -http://patches.ubuntu.com/g/gnome-screensaver/extracted/08_gs_dialog_request_to_exit.patch - ---- src/gs-window-x11.c.orig 2009-08-19 23:19:14.000000000 +0000 -+++ src/gs-window-x11.c -@@ -91,6 +91,8 @@ struct GSWindowPrivate - gint lock_pid; - gint lock_watch_id; - gint dialog_response; -+ gboolean dialog_quit_requested; -+ gboolean dialog_shake_in_progress; - - gint keyboard_pid; - gint keyboard_watch_id; -@@ -1383,6 +1385,16 @@ gs_window_dialog_finish (GSWindow *windo - remove_key_events (window); - } - -+static void -+maybe_kill_dialog (GSWindow *window) -+{ -+ if (!window->priv->dialog_shake_in_progress -+ && window->priv->dialog_quit_requested -+ && window->priv->lock_pid > 0) { -+ kill (window->priv->lock_pid, SIGTERM); -+ } -+} -+ - /* very rudimentary animation for indicating an auth failure */ - static void - shake_dialog (GSWindow *window) -@@ -1391,6 +1403,8 @@ shake_dialog (GSWindow *window) - guint left; - guint right; - -+ window->priv->dialog_shake_in_progress = TRUE; -+ - for (i = 0; i < 9; i++) { - if (i % 2 == 0) { - left = 30; -@@ -1415,6 +1429,9 @@ shake_dialog (GSWindow *window) - - g_usleep (10000); - } -+ -+ window->priv->dialog_shake_in_progress = FALSE; -+ maybe_kill_dialog (window); - } - - static gboolean -@@ -1457,6 +1474,10 @@ lock_command_watch (GIOChannel *source - window->priv->dialog_response = DIALOG_RESPONSE_CANCEL; - } - finished = TRUE; -+ } else if (strstr (line, "REQUEST QUIT") != NULL) { -+ gs_debug ("Got request for quit"); -+ window->priv->dialog_quit_requested = TRUE; -+ maybe_kill_dialog (window); - } - break; - case G_IO_STATUS_EOF: -@@ -1570,6 +1591,9 @@ popup_dialog_idle (GSWindow *window) - - set_invisible_cursor (GTK_WIDGET (window)->window, FALSE); - -+ window->priv->dialog_quit_requested = FALSE; -+ window->priv->dialog_shake_in_progress = FALSE; -+ - result = spawn_on_window (window, - command->str, - &window->priv->lock_pid, diff --git a/x11/gnome-screensaver/patches/patch-ae b/x11/gnome-screensaver/patches/patch-ae new file mode 100644 index 000000000000..9593abffcec2 --- /dev/null +++ b/x11/gnome-screensaver/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.1 2010/02/11 18:02:39 drochner Exp $ + +--- src/Makefile.in.orig 2010-02-08 15:58:16.000000000 +0000 ++++ src/Makefile.in +@@ -396,7 +396,7 @@ INCLUDES = \ + $(LIBNOTIFY_CFLAGS) \ + $(NULL) + +-desktopdir = $(sysconfdir)/xdg/autostart ++desktopdir = $(PREFIX)/share/gnome/autostart + desktop_in_files = gnome-screensaver.desktop.in + desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) + gnome_screensaver_command_SOURCES = \ diff --git a/x11/xscreensaver/Makefile b/x11/xscreensaver/Makefile index ca6e515a4f4a..10aa1e2761a0 100644 --- a/x11/xscreensaver/Makefile +++ b/x11/xscreensaver/Makefile @@ -1,6 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2010/01/24 13:26:13 wiz Exp $ - -PKGREVISION= 2 +# $NetBSD: Makefile,v 1.88 2010/02/11 18:16:21 drochner Exp $ COMMENT= Screen saver and locker for the X window system diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 8a08b0b725dc..36fb396085af 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,10 +1,10 @@ -# $NetBSD: Makefile.common,v 1.99 2009/07/07 17:28:04 joerg Exp $ +# $NetBSD: Makefile.common,v 1.100 2010/02/11 18:16:21 drochner Exp $ # # When updating the package, # please check kdeartwork3 -- it installs some extra # files depending on which screensavers it finds. -DISTNAME= xscreensaver-5.08 +DISTNAME= xscreensaver-5.10 CATEGORIES= x11 MASTER_SITES= ${HOMEPAGE} diff --git a/x11/xscreensaver/PLIST b/x11/xscreensaver/PLIST index b5c04ad732d8..4b07e021fdf6 100644 --- a/x11/xscreensaver/PLIST +++ b/x11/xscreensaver/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.35 2009/06/14 18:25:18 joerg Exp $ +@comment $NetBSD: PLIST,v 1.36 2010/02/11 18:16:21 drochner Exp $ bin/xscreensaver bin/xscreensaver-command bin/xscreensaver-getimage @@ -129,8 +129,6 @@ libexec/xscreensaver/config/halftone.xml libexec/xscreensaver/config/halo.xml libexec/xscreensaver/config/helix.xml libexec/xscreensaver/config/hopalong.xml -libexec/xscreensaver/config/hyperball.xml -libexec/xscreensaver/config/hypercube.xml libexec/xscreensaver/config/hypertorus.xml libexec/xscreensaver/config/hypnowheel.xml libexec/xscreensaver/config/ifs.xml @@ -140,7 +138,6 @@ libexec/xscreensaver/config/interference.xml libexec/xscreensaver/config/intermomentary.xml libexec/xscreensaver/config/jigglypuff.xml libexec/xscreensaver/config/jigsaw.xml -libexec/xscreensaver/config/juggle.xml libexec/xscreensaver/config/juggler3d.xml libexec/xscreensaver/config/julia.xml libexec/xscreensaver/config/kaleidescope.xml @@ -194,6 +191,7 @@ libexec/xscreensaver/config/rocks.xml libexec/xscreensaver/config/rorschach.xml libexec/xscreensaver/config/rotzoomer.xml libexec/xscreensaver/config/rubik.xml +libexec/xscreensaver/config/rubikblocks.xml libexec/xscreensaver/config/sballs.xml libexec/xscreensaver/config/shadebobs.xml libexec/xscreensaver/config/sierpinski.xml @@ -214,6 +212,7 @@ libexec/xscreensaver/config/stonerview.xml libexec/xscreensaver/config/strange.xml libexec/xscreensaver/config/substrate.xml libexec/xscreensaver/config/superquadrics.xml +libexec/xscreensaver/config/surfaces.xml libexec/xscreensaver/config/swirl.xml libexec/xscreensaver/config/tangram.xml libexec/xscreensaver/config/thornbird.xml @@ -293,8 +292,6 @@ libexec/xscreensaver/halftone libexec/xscreensaver/halo libexec/xscreensaver/helix libexec/xscreensaver/hopalong -libexec/xscreensaver/hyperball -libexec/xscreensaver/hypercube libexec/xscreensaver/hypertorus libexec/xscreensaver/hypnowheel libexec/xscreensaver/ifs @@ -304,7 +301,6 @@ libexec/xscreensaver/interference libexec/xscreensaver/intermomentary libexec/xscreensaver/jigglypuff libexec/xscreensaver/jigsaw -libexec/xscreensaver/juggle libexec/xscreensaver/juggler3d libexec/xscreensaver/julia libexec/xscreensaver/kaleidescope @@ -359,6 +355,7 @@ libexec/xscreensaver/rocks libexec/xscreensaver/rorschach libexec/xscreensaver/rotzoomer libexec/xscreensaver/rubik +libexec/xscreensaver/rubikblocks libexec/xscreensaver/sballs libexec/xscreensaver/shadebobs libexec/xscreensaver/sierpinski @@ -379,6 +376,7 @@ libexec/xscreensaver/stonerview libexec/xscreensaver/strange libexec/xscreensaver/substrate libexec/xscreensaver/superquadrics +libexec/xscreensaver/surfaces libexec/xscreensaver/swirl libexec/xscreensaver/tangram libexec/xscreensaver/thornbird @@ -496,8 +494,6 @@ man/man6/halftone.6 man/man6/halo.6 man/man6/helix.6 man/man6/hopalong.6 -man/man6/hyperball.6 -man/man6/hypercube.6 man/man6/hypertorus.6 man/man6/hypnowheel.6 man/man6/ifs.6 @@ -507,7 +503,6 @@ man/man6/interference.6 man/man6/intermomentary.6 man/man6/jigglypuff.6 man/man6/jigsaw.6 -man/man6/juggle.6 man/man6/juggler3d.6 man/man6/julia.6 man/man6/kaleidescope.6 @@ -560,6 +555,7 @@ man/man6/rocks.6 man/man6/rorschach.6 man/man6/rotzoomer.6 man/man6/rubik.6 +man/man6/rubikblocks.6 man/man6/sballs.6 man/man6/shadebobs.6 man/man6/sierpinski.6 @@ -580,6 +576,7 @@ man/man6/stonerview.6 man/man6/strange.6 man/man6/substrate.6 man/man6/superquadrics.6 +man/man6/surfaces.6 man/man6/swirl.6 man/man6/tangram.6 man/man6/thornbird.6 diff --git a/x11/xscreensaver/distinfo b/x11/xscreensaver/distinfo index c9411e123770..c85c3e5c18e9 100644 --- a/x11/xscreensaver/distinfo +++ b/x11/xscreensaver/distinfo @@ -1,11 +1,11 @@ -$NetBSD: distinfo,v 1.54 2009/01/14 13:29:15 drochner Exp $ +$NetBSD: distinfo,v 1.55 2010/02/11 18:16:22 drochner Exp $ -SHA1 (xscreensaver-5.08.tar.gz) = 4e6889d7171eaf18b856c484a87d5701787e5dc6 -RMD160 (xscreensaver-5.08.tar.gz) = f37ba887a656a4ffd14f3809de3269806271352d -Size (xscreensaver-5.08.tar.gz) = 5466460 bytes +SHA1 (xscreensaver-5.10.tar.gz) = d8379928de2e6e86cc7b17d75150daafe57e93c4 +RMD160 (xscreensaver-5.10.tar.gz) = 6c437ef89969a0bf886f27b2430b53a431146b20 +Size (xscreensaver-5.10.tar.gz) = 5561162 bytes SHA1 (patch-aa) = 6dbc44a362e0fc7142ed3135674a8fb6ed5a9979 SHA1 (patch-ab) = 77d41e44143f94297375d5497a0ddd4298e9510f -SHA1 (patch-ac) = 5704efa8940569febc95d49eade2dca0e764f0f1 +SHA1 (patch-ac) = d575520bbe7d2ba2363a19620576b12d7110c19d SHA1 (patch-ad) = 8a4e9578fa5b9b33c52884e360638ae707798be5 SHA1 (patch-ae) = 16d0c8b50b2601458aaec09d1c7425fb23308225 SHA1 (patch-af) = d8261f1c8fd01b455a151f97837712dc46aff6f3 diff --git a/x11/xscreensaver/patches/patch-ac b/x11/xscreensaver/patches/patch-ac index 451f9b063d00..5875ece387e2 100644 --- a/x11/xscreensaver/patches/patch-ac +++ b/x11/xscreensaver/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ +$NetBSD: patch-ac,v 1.22 2010/02/11 18:16:22 drochner Exp $ ---- configure.orig 2008-12-28 08:59:19.000000000 +0100 +--- configure.orig 2009-09-08 04:54:40.000000000 +0000 +++ configure -@@ -3504,6 +3504,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp +@@ -3505,6 +3505,9 @@ echo "${ECHO_T}$ac_cv_gcc_accepts_no_cpp ac_gcc_accepts_no_cpp_precomp="$ac_cv_gcc_accepts_no_cpp_precomp" fi @@ -10,9 +10,9 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ +# cause build failures. +if false; then if test -n "$GCC"; then - if test -n "$GCC"; then - { echo "$as_me:$LINENO: checking whether gcc accepts -std=c89" >&5 -@@ -3554,6 +3557,7 @@ echo "${ECHO_T}Disabling C++ comments in + + case "$host" in +@@ -3565,6 +3568,7 @@ echo "${ECHO_T}Disabling C++ comments in CC="$CC -Wp,-lang-c89" fi fi @@ -20,7 +20,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ ac_ext=c ac_cpp='$CPP $CPPFLAGS' -@@ -7925,7 +7929,7 @@ _ACEOF +@@ -7936,7 +7940,7 @@ _ACEOF @@ -29,7 +29,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. set dummy ${ac_tool_prefix}ranlib; ac_word=$2 -@@ -13644,7 +13648,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea +@@ -13632,7 +13636,7 @@ if test "${ac_cv_lib_krb4_krb_get_tf_rea echo $ECHO_N "(cached) $ECHO_C" >&6 else ac_check_lib_save_LIBS=$LIBS @@ -38,7 +38,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -13731,7 +13735,7 @@ echo "$as_me: WARNING: Cannot find compa +@@ -13719,7 +13723,7 @@ echo "$as_me: WARNING: Cannot find compa # from Matt Knopp # (who got it from amu@mit.edu) @@ -47,7 +47,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ # jwz: MacOS X uses -lkrb5, but not -lcrypt -@@ -14893,7 +14897,7 @@ fi +@@ -14881,7 +14885,7 @@ fi # if test "$enable_locking" = yes ; then case "$host" in @@ -56,7 +56,7 @@ $NetBSD: patch-ac,v 1.21 2009/01/14 13:29:15 drochner Exp $ need_setuid=yes ;; esac -@@ -15327,11 +15331,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > +@@ -15315,11 +15319,7 @@ echo "${ECHO_T}$ac_cv_gtk_config_libs" > ac_gtk_config_libs=$ac_cv_gtk_config_libs GTK_EXTRA_OBJS="" -- 2.41.0