Sat Apr 6 13:01:28 2013 UTC ()
'EXTRACT_SUFX is ".tar.gz" by default, so this definition may be
redundant.' - It was. Removed.


(rodent)
diff -r1.111 -r1.112 pkgsrc/devel/kdevelop-base/Makefile
diff -r1.27 -r1.28 pkgsrc/devel/libthrift/Makefile
diff -r1.30 -r1.31 pkgsrc/fonts/intlfonts/Makefile
diff -r1.28 -r1.29 pkgsrc/misc/molden/Makefile
diff -r1.5 -r1.6 pkgsrc/multimedia/ming/Makefile.common
diff -r1.20 -r1.21 pkgsrc/multimedia/xfce4-mpc-plugin/Makefile
diff -r1.72 -r1.73 pkgsrc/net/proftpd/Makefile
diff -r1.29 -r1.30 pkgsrc/net/xfce4-wavelan-plugin/Makefile
diff -r1.19 -r1.20 pkgsrc/sysutils/xenkernel33/Makefile
diff -r1.17 -r1.18 pkgsrc/sysutils/xenkernel41/Makefile
diff -r1.31 -r1.32 pkgsrc/sysutils/xentools3/Makefile
diff -r1.35 -r1.36 pkgsrc/sysutils/xentools33/Makefile
diff -r1.2 -r1.3 pkgsrc/textproc/regxml/Makefile
diff -r1.6 -r1.7 pkgsrc/textproc/xhtmldiff/Makefile
diff -r1.16 -r1.17 pkgsrc/time/xalarm/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/www/phraseanet/Makefile.common
diff -r1.9 -r1.10 pkgsrc/x11/fltk13/Makefile
cvs diff -r1.111 -r1.112 pkgsrc/devel/kdevelop-base/Attic/Makefile (switch to unified diff)

--- pkgsrc/devel/kdevelop-base/Attic/Makefile 2013/02/16 11:20:46 1.111
+++ pkgsrc/devel/kdevelop-base/Attic/Makefile 2013/04/06 13:01:26 1.112
@@ -1,72 +1,71 @@ @@ -1,72 +1,71 @@
1# $NetBSD: Makefile,v 1.111 2013/02/16 11:20:46 wiz Exp $ 1# $NetBSD: Makefile,v 1.112 2013/04/06 13:01:26 rodent Exp $
2 2
3DISTNAME= kdevelop_3.5.5.orig 3DISTNAME= kdevelop_3.5.5.orig
4PKGNAME= kdevelop-base-3.5.5 4PKGNAME= kdevelop-base-3.5.5
5PKGREVISION= 29 5PKGREVISION= 29
6CATEGORIES= devel kde 6CATEGORIES= devel kde
7MASTER_SITES= http://download.opensuse.org/repositories/home:/amilcarlucas/xUbuntu_6.06/ 7MASTER_SITES= http://download.opensuse.org/repositories/home:/amilcarlucas/xUbuntu_6.06/
8EXTRACT_SUFX= .tar.gz 
9 8
10HOMEPAGE= http://www.kdevelop.org/ 9HOMEPAGE= http://www.kdevelop.org/
11COMMENT= Base modules for IDE for Unix/X11/KDE 10COMMENT= Base modules for IDE for Unix/X11/KDE
12LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2 11LICENSE= gnu-gpl-v2 AND gnu-lgpl-v2
13 12
14WRKSRC= ${WRKDIR}/kdevelop-3.5.5 13WRKSRC= ${WRKDIR}/kdevelop-3.5.5
15 14
16.include "../../meta-pkgs/kde3/Makefile.kde3" 15.include "../../meta-pkgs/kde3/Makefile.kde3"
17 16
18DEPENDS+= automake>=1.7:../../devel/automake 17DEPENDS+= automake>=1.7:../../devel/automake
19DEPENDS+= doxygen>=1.3.5:../../devel/doxygen 18DEPENDS+= doxygen>=1.3.5:../../devel/doxygen
20DEPENDS+= graphviz>=1.10nb1:../../graphics/graphviz 19DEPENDS+= graphviz>=1.10nb1:../../graphics/graphviz
21DEPENDS+= htdig>=3.2.0:../../www/htdig 20DEPENDS+= htdig>=3.2.0:../../www/htdig
22DEPENDS+= a2ps>=4.12:../../print/a2ps 21DEPENDS+= a2ps>=4.12:../../print/a2ps
23DEPENDS+= kdelibdocs>=3.2:../../x11/kdelibdocs3 22DEPENDS+= kdelibdocs>=3.2:../../x11/kdelibdocs3
24DEPENDS+= qt3-docs>=3.1.1:../../x11/qt3-docs 23DEPENDS+= qt3-docs>=3.1.1:../../x11/qt3-docs
25DEPENDS+= qt3-tools>=3.1.1:../../x11/qt3-tools 24DEPENDS+= qt3-tools>=3.1.1:../../x11/qt3-tools
26 25
27CONFLICTS+= kdevelop<=1.3 26CONFLICTS+= kdevelop<=1.3
28 27
29BDB_ACCEPTED= db4 db5 28BDB_ACCEPTED= db4 db5
30USE_LANGUAGES= c c++ fortran77 29USE_LANGUAGES= c c++ fortran77
31USE_TOOLS+= msgfmt perl:run 30USE_TOOLS+= msgfmt perl:run
32MAKE_JOBS_SAFE= no 31MAKE_JOBS_SAFE= no
33 32
34REPLACE_PERL+= kdevprj2kdevelop 33REPLACE_PERL+= kdevprj2kdevelop
35REPLACE_PERL+= doc/tools/index-python 34REPLACE_PERL+= doc/tools/index-python
36REPLACE_PERL+= doc/tools/index-texi 35REPLACE_PERL+= doc/tools/index-texi
37REPLACE_PERL+= doc/tools/toc-docbook 36REPLACE_PERL+= doc/tools/toc-docbook
38REPLACE_PERL+= doc/tools/toc-gsdoc 37REPLACE_PERL+= doc/tools/toc-gsdoc
39REPLACE_PERL+= doc/tools/toc-python 38REPLACE_PERL+= doc/tools/toc-python
40REPLACE_PERL+= doc/tools/toc-texi 39REPLACE_PERL+= doc/tools/toc-texi
41REPLACE_PERL+= languages/perl/app_templates/perlhello/app.pl 40REPLACE_PERL+= languages/perl/app_templates/perlhello/app.pl
42REPLACE_PERL+= languages/perl/file_templates/pl 41REPLACE_PERL+= languages/perl/file_templates/pl
43 42
44SUBST_CLASSES+= perlpath 43SUBST_CLASSES+= perlpath
45SUBST_STAGE.perlpath= post-patch 44SUBST_STAGE.perlpath= post-patch
46SUBST_MESSAGE.perlpath= Fix perl path. 45SUBST_MESSAGE.perlpath= Fix perl path.
47SUBST_FILES.perlpath= languages/perl/perlparser.cpp parts/doxygen/config.cpp 46SUBST_FILES.perlpath= languages/perl/perlparser.cpp parts/doxygen/config.cpp
48SUBST_SED.perlpath= -e s:/usr/bin/perl:${PERL5:Q}: 47SUBST_SED.perlpath= -e s:/usr/bin/perl:${PERL5:Q}:
49 48
50EVAL_PREFIX+= QT3DIR=qt3 49EVAL_PREFIX+= QT3DIR=qt3
51EVAL_PREFIX+= KDELIBDIR=kdelibs 50EVAL_PREFIX+= KDELIBDIR=kdelibs
52 51
53CONFIGURE_ARGS+= --with-db-includedir=${BDBBASE}/include/${BDB_TYPE} 52CONFIGURE_ARGS+= --with-db-includedir=${BDBBASE}/include/${BDB_TYPE}
54CONFIGURE_ARGS+= --with-db-libdir=${BDBBASE}/lib 53CONFIGURE_ARGS+= --with-db-libdir=${BDBBASE}/lib
55CONFIGURE_ARGS+= --with-db-lib=${BDB_TYPE} 54CONFIGURE_ARGS+= --with-db-lib=${BDB_TYPE}
56CONFIGURE_ARGS+= --with-qtdoc-dir=${QT3DIR}/qt3/doc/html 55CONFIGURE_ARGS+= --with-qtdoc-dir=${QT3DIR}/qt3/doc/html
57CONFIGURE_ARGS+= --with-kdelibsdoxy-dir=${KDELIBDIR}/share/doc/kde/HTML/en/kdelibs-apidocs 56CONFIGURE_ARGS+= --with-kdelibsdoxy-dir=${KDELIBDIR}/share/doc/kde/HTML/en/kdelibs-apidocs
58 57
59.include "options.mk" 58.include "options.mk"
60 59
61.include "../../meta-pkgs/kde3/kde3.mk" 60.include "../../meta-pkgs/kde3/kde3.mk"
62 61
63# XXX: need to include compiler.mk before including bdb.buildlink3.mk, 62# XXX: need to include compiler.mk before including bdb.buildlink3.mk,
64# otherwise f2c is not added as a dependency correctly 63# otherwise f2c is not added as a dependency correctly
65.include "../../mk/compiler.mk" 64.include "../../mk/compiler.mk"
66.include "../../devel/kdesdk3/buildlink3.mk" 65.include "../../devel/kdesdk3/buildlink3.mk"
67.include "../../graphics/hicolor-icon-theme/buildlink3.mk" 66.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
68.include "../../x11/kdebase3/buildlink3.mk" 67.include "../../x11/kdebase3/buildlink3.mk"
69.include "../../x11/kdelibs3/buildlink3.mk" 68.include "../../x11/kdelibs3/buildlink3.mk"
70.include "../../sysutils/desktop-file-utils/desktopdb.mk" 69.include "../../sysutils/desktop-file-utils/desktopdb.mk"
71.include "../../mk/bdb.buildlink3.mk" 70.include "../../mk/bdb.buildlink3.mk"
72.include "../../mk/bsd.pkg.mk" 71.include "../../mk/bsd.pkg.mk"
cvs diff -r1.27 -r1.28 pkgsrc/devel/libthrift/Makefile (switch to unified diff)

--- pkgsrc/devel/libthrift/Makefile 2013/03/16 07:21:20 1.27
+++ pkgsrc/devel/libthrift/Makefile 2013/04/06 13:01:26 1.28
@@ -1,38 +1,37 @@ @@ -1,38 +1,37 @@
1# $NetBSD: Makefile,v 1.27 2013/03/16 07:21:20 obache Exp $ 1# $NetBSD: Makefile,v 1.28 2013/04/06 13:01:26 rodent Exp $
2 2
3DISTNAME= thrift-${THRIFT_VERSION} 3DISTNAME= thrift-${THRIFT_VERSION}
4PKGNAME= libthrift-${THRIFT_VERSION} 4PKGNAME= libthrift-${THRIFT_VERSION}
5PKGREVISION= 13 5PKGREVISION= 13
6CATEGORIES= devel 6CATEGORIES= devel
7MASTER_SITES= ${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/} 7MASTER_SITES= ${MASTER_SITE_APACHE:=thrift/${THRIFT_VERSION}/}
8EXTRACT_SUFX= .tar.gz 
9 8
10MAINTAINER= tonnerre@NetBSD.org 9MAINTAINER= tonnerre@NetBSD.org
11HOMEPAGE= http://incubator.apache.org/thrift/ 10HOMEPAGE= http://incubator.apache.org/thrift/
12COMMENT= Cross-language data serialization library 11COMMENT= Cross-language data serialization library
13LICENSE= apache-2.0 12LICENSE= apache-2.0
14 13
15MAKE_JOBS_SAFE= no 14MAKE_JOBS_SAFE= no
16 15
17USE_LANGUAGES= c c++ 16USE_LANGUAGES= c c++
18USE_LIBTOOL= yes 17USE_LIBTOOL= yes
19USE_PKGLOCALEDIR= yes 18USE_PKGLOCALEDIR= yes
20USE_TOOLS+= gmake pkg-config 19USE_TOOLS+= gmake pkg-config
21GNU_CONFIGURE= yes 20GNU_CONFIGURE= yes
22CONFIGURE_ENV+= LEXLIB="" 21CONFIGURE_ENV+= LEXLIB=""
23 22
24WRKSRC= ${WRKDIR}/thrift-${THRIFT_VERSION} 23WRKSRC= ${WRKDIR}/thrift-${THRIFT_VERSION}
25THRIFT_VERSION= 0.7.0 24THRIFT_VERSION= 0.7.0
26TEST_TARGET= check 25TEST_TARGET= check
27 26
28pre-build: 27pre-build:
29 ${CHMOD} 0755 ${WRKSRC}/lib/erl/rebar 28 ${CHMOD} 0755 ${WRKSRC}/lib/erl/rebar
30 29
31.include "options.mk" 30.include "options.mk"
32 31
33.include "../../security/openssl/buildlink3.mk" 32.include "../../security/openssl/buildlink3.mk"
34.include "../../devel/zlib/buildlink3.mk" 33.include "../../devel/zlib/buildlink3.mk"
35.include "../../devel/libevent/buildlink3.mk" 34.include "../../devel/libevent/buildlink3.mk"
36.include "../../devel/boost-libs/buildlink3.mk" 35.include "../../devel/boost-libs/buildlink3.mk"
37 36
38.include "../../mk/bsd.pkg.mk" 37.include "../../mk/bsd.pkg.mk"
cvs diff -r1.30 -r1.31 pkgsrc/fonts/intlfonts/Makefile (switch to unified diff)

--- pkgsrc/fonts/intlfonts/Makefile 2012/10/03 18:28:24 1.30
+++ pkgsrc/fonts/intlfonts/Makefile 2013/04/06 13:01:26 1.31
@@ -1,73 +1,72 @@ @@ -1,73 +1,72 @@
1# $NetBSD: Makefile,v 1.30 2012/10/03 18:28:24 asau Exp $ 1# $NetBSD: Makefile,v 1.31 2013/04/06 13:01:26 rodent Exp $
2 2
3DISTNAME= intlfonts-1.2.1 3DISTNAME= intlfonts-1.2.1
4PKGREVISION= 5 4PKGREVISION= 5
5CATEGORIES= fonts x11 5CATEGORIES= fonts x11
6MASTER_SITES= ${MASTER_SITE_GNU:=intlfonts/intlfonts-1.2.1-split/} 6MASTER_SITES= ${MASTER_SITE_GNU:=intlfonts/intlfonts-1.2.1-split/}
7DISTFILES= ${FONT_SETS:=${EXTRACT_SUFX}} ${MISC_FILES} 7DISTFILES= ${FONT_SETS:=${EXTRACT_SUFX}} ${MISC_FILES}
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= Free X11 fonts (BDF format) for all characters that Emacs can handle 10COMMENT= Free X11 fonts (BDF format) for all characters that Emacs can handle
11 11
12FONT_SETS= Asian \ 12FONT_SETS= Asian \
13 Chinese \ 13 Chinese \
14 Ethiopic \ 14 Ethiopic \
15 European \ 15 European \
16 Japanese \ 16 Japanese \
17 Misc 17 Misc
18 18
19USE_TOOLS+= bdftopcf 19USE_TOOLS+= bdftopcf
20 20
21# Use the X font set for Korean, as there isn't anything better 21# Use the X font set for Korean, as there isn't anything better
22FONT_SETS+= Korean.X 22FONT_SETS+= Korean.X
23 23
24# These are extra files that not many folks will likely need or want 24# These are extra files that not many folks will likely need or want
25# They are all bigger than 24 dots -- you'll only want them if you 25# They are all bigger than 24 dots -- you'll only want them if you
26# want to display text in really big fonts. 26# want to display text in really big fonts.
27# 27#
28EXTRA_FONTS= Chinese.BIG \ 28EXTRA_FONTS= Chinese.BIG \
29 European.BIG \ 29 European.BIG \
30 Japanese.BIG 30 Japanese.BIG
31 31
32# Type1/TrueType fonts for Latin1, Thai and Vietnamese 32# Type1/TrueType fonts for Latin1, Thai and Vietnamese
33# XXX need "fonts.scale" for them 33# XXX need "fonts.scale" for them
34# 34#
35EXTRA_FONTS+= Type1 \ 35EXTRA_FONTS+= Type1 \
36 TrueType 36 TrueType
37CONFIGURE_ARGS+= --with-type1 --with-truetype 37CONFIGURE_ARGS+= --with-type1 --with-truetype
38 38
39MISC_FILES= README.split 39MISC_FILES= README.split
40 40
41DIST_SUBDIR= ${PKGNAME_NOREV} 41DIST_SUBDIR= ${PKGNAME_NOREV}
42EXTRACT_SUFX= .tar.gz 
43EXTRACT_ONLY= ${FONT_SETS:=${EXTRACT_SUFX}} 42EXTRACT_ONLY= ${FONT_SETS:=${EXTRACT_SUFX}}
44 43
45GNU_CONFIGURE= yes 44GNU_CONFIGURE= yes
46CONFIGURE_ARGS+=--with-fontdir=${FONTS_DIR} \ 45CONFIGURE_ARGS+=--with-fontdir=${FONTS_DIR} \
47 --enable-compress=gzip 46 --enable-compress=gzip
48INSTALL_MAKE_FLAGS+= fontdir=${DESTDIR}${FONTS_DIR} 47INSTALL_MAKE_FLAGS+= fontdir=${DESTDIR}${FONTS_DIR}
49 48
50FONTS_DIR= ${PREFIX}/lib/X11/fonts/intlfonts 49FONTS_DIR= ${PREFIX}/lib/X11/fonts/intlfonts
51 50
52FONTS_DIRS.x11+= ${FONTS_DIR} 51FONTS_DIRS.x11+= ${FONTS_DIR}
53FONTS_DIRS.x11+= ${FONTS_DIR}/bdf 52FONTS_DIRS.x11+= ${FONTS_DIR}/bdf
54FONTS_DIRS.type1+= ${FONTS_DIR}/Type1 53FONTS_DIRS.type1+= ${FONTS_DIR}/Type1
55FONTS_DIRS.ttf+= ${FONTS_DIR}/TrueType 54FONTS_DIRS.ttf+= ${FONTS_DIR}/TrueType
56REQD_DIRS+= ${FONTS_DIR} 55REQD_DIRS+= ${FONTS_DIR}
57REQD_DIRS+= ${FONTS_DIR}/bdf 56REQD_DIRS+= ${FONTS_DIR}/bdf
58REQD_DIRS+= ${FONTS_DIR}/Type1 57REQD_DIRS+= ${FONTS_DIR}/Type1
59REQD_DIRS+= ${FONTS_DIR}/TrueType 58REQD_DIRS+= ${FONTS_DIR}/TrueType
60 59
61.include "../../mk/bsd.prefs.mk" 60.include "../../mk/bsd.prefs.mk"
62 61
63.if !defined(NO_EXTRA_FONTS) 62.if !defined(NO_EXTRA_FONTS)
64FONT_SETS+= ${EXTRA_FONTS} 63FONT_SETS+= ${EXTRA_FONTS}
65PLIST_SRC= PLIST PLIST.extrafonts 64PLIST_SRC= PLIST PLIST.extrafonts
66.endif 65.endif
67 66
68post-extract: 67post-extract:
69.for FILE in ${MISC_FILES} 68.for FILE in ${MISC_FILES}
70 ${CP} ${_DISTDIR}/${FILE} ${WRKSRC} 69 ${CP} ${_DISTDIR}/${FILE} ${WRKSRC}
71.endfor 70.endfor
72 71
73.include "../../mk/bsd.pkg.mk" 72.include "../../mk/bsd.pkg.mk"
cvs diff -r1.28 -r1.29 pkgsrc/misc/molden/Attic/Makefile (switch to unified diff)

--- pkgsrc/misc/molden/Attic/Makefile 2012/10/08 09:57:30 1.28
+++ pkgsrc/misc/molden/Attic/Makefile 2013/04/06 13:01:26 1.29
@@ -1,40 +1,39 @@ @@ -1,40 +1,39 @@
1# $NetBSD: Makefile,v 1.28 2012/10/08 09:57:30 asau Exp $ 1# $NetBSD: Makefile,v 1.29 2013/04/06 13:01:26 rodent Exp $
2 2
3DISTNAME= molden4.6 3DISTNAME= molden4.6
4PKGNAME= ${DISTNAME:S/molden/&-/} 4PKGNAME= ${DISTNAME:S/molden/&-/}
5PKGREVISION= 1 5PKGREVISION= 1
6CATEGORIES= misc # chemistry 6CATEGORIES= misc # chemistry
7MASTER_SITES= ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/ 7MASTER_SITES= ftp://ftp.cmbi.kun.nl/pub/molgraph/molden/
8EXTRACT_SUFX= .tar.gz 
9 8
10MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
11HOMEPAGE= http://www.cmbi.ru.nl/molden/molden.html 10HOMEPAGE= http://www.cmbi.ru.nl/molden/molden.html
12COMMENT= Displaying MOLecular DENsity 11COMMENT= Displaying MOLecular DENsity
13LICENSE= molden-license 12LICENSE= molden-license
14 13
15RESTRICTED= Redistributing Molden by unregistered user is prohibited. 14RESTRICTED= Redistributing Molden by unregistered user is prohibited.
16NO_SRC_ON_CDROM= ${RESTRICTED} 15NO_SRC_ON_CDROM= ${RESTRICTED}
17NO_BIN_ON_CDROM= ${RESTRICTED} 16NO_BIN_ON_CDROM= ${RESTRICTED}
18NO_SRC_ON_FTP= ${RESTRICTED} 17NO_SRC_ON_FTP= ${RESTRICTED}
19NO_BIN_ON_FTP= ${RESTRICTED} 18NO_BIN_ON_FTP= ${RESTRICTED}
20 19
21DIST_SUBDIR= ${PKGNAME_NOREV} 20DIST_SUBDIR= ${PKGNAME_NOREV}
22PKG_INSTALLATION_TYPES= overwrite pkgviews 21PKG_INSTALLATION_TYPES= overwrite pkgviews
23 22
24MAKE_FILE= makefile 23MAKE_FILE= makefile
25BUILD_TARGET= molden 24BUILD_TARGET= molden
26 25
27USE_LANGUAGES= c fortran77 26USE_LANGUAGES= c fortran77
28 27
29INSTALLATION_DIRS= bin share/molden/doc share/molden/test share/molden/utils 28INSTALLATION_DIRS= bin share/molden/doc share/molden/test share/molden/utils
30 29
31do-install: 30do-install:
32 ${INSTALL_PROGRAM} ${WRKSRC}/molden ${DESTDIR}${PREFIX}/bin 31 ${INSTALL_PROGRAM} ${WRKSRC}/molden ${DESTDIR}${PREFIX}/bin
33 for d in doc test utils ; do \ 32 for d in doc test utils ; do \
34 for f in ${WRKSRC}/$${d}/* ; do \ 33 for f in ${WRKSRC}/$${d}/* ; do \
35 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/molden/$${d} ; \ 34 ${INSTALL_DATA} $${f} ${DESTDIR}${PREFIX}/share/molden/$${d} ; \
36 done ; \ 35 done ; \
37 done 36 done
38 37
39.include "../../graphics/MesaLib/buildlink3.mk" 38.include "../../graphics/MesaLib/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 39.include "../../mk/bsd.pkg.mk"
cvs diff -r1.5 -r1.6 pkgsrc/multimedia/ming/Makefile.common (switch to unified diff)

--- pkgsrc/multimedia/ming/Makefile.common 2012/05/12 08:24:43 1.5
+++ pkgsrc/multimedia/ming/Makefile.common 2013/04/06 13:01:26 1.6
@@ -1,12 +1,11 @@ @@ -1,12 +1,11 @@
1# $NetBSD: Makefile.common,v 1.5 2012/05/12 08:24:43 obache Exp $ 1# $NetBSD: Makefile.common,v 1.6 2013/04/06 13:01:26 rodent Exp $
2# 2#
3# used by multimedia/php-ming/Makefile 3# used by multimedia/php-ming/Makefile
4# used by multimedia/py-ming/Makefile 4# used by multimedia/py-ming/Makefile
5 5
6MING_VERSION= 0.4.4 6MING_VERSION= 0.4.4
7DISTNAME= ming-${MING_VERSION} 7DISTNAME= ming-${MING_VERSION}
8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ming/} 8MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=ming/}
9EXTRACT_SUFX= .tar.gz 
10 9
11DISTINFO_FILE= ${.CURDIR}/../../multimedia/ming/distinfo 10DISTINFO_FILE= ${.CURDIR}/../../multimedia/ming/distinfo
12PATCHDIR= ${.CURDIR}/../../multimedia/ming/patches 11PATCHDIR= ${.CURDIR}/../../multimedia/ming/patches
cvs diff -r1.20 -r1.21 pkgsrc/multimedia/xfce4-mpc-plugin/Makefile (switch to unified diff)

--- pkgsrc/multimedia/xfce4-mpc-plugin/Makefile 2013/02/16 11:18:31 1.20
+++ pkgsrc/multimedia/xfce4-mpc-plugin/Makefile 2013/04/06 13:01:27 1.21
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.20 2013/02/16 11:18:31 wiz Exp $ 1# $NetBSD: Makefile,v 1.21 2013/04/06 13:01:27 rodent Exp $
2 2
3.include "../../meta-pkgs/xfce4/Makefile.common" 3.include "../../meta-pkgs/xfce4/Makefile.common"
4 4
5XFCE4_VERSION= 0.3.2 5XFCE4_VERSION= 0.3.2
6 6
7DISTNAME= xfce4-mpc-plugin-${XFCE4_VERSION} 7DISTNAME= xfce4-mpc-plugin-${XFCE4_VERSION}
8PKGREVISION= 15 8PKGREVISION= 15
9CATEGORIES= multimedia 9CATEGORIES= multimedia
10MASTER_SITES= http://goodies.xfce.org/releases/xfce4-mpc-plugin/ 10MASTER_SITES= http://goodies.xfce.org/releases/xfce4-mpc-plugin/
11EXTRACT_SUFX= .tar.gz 
12COMMENT= Xfce Music Player Client plugin 11COMMENT= Xfce Music Player Client plugin
13 12
14LIBS.SunOS+= -lsocket -lnsl 13LIBS.SunOS+= -lsocket -lnsl
15 14
16.include "../../x11/xfce4-panel/buildlink3.mk" 15.include "../../x11/xfce4-panel/buildlink3.mk"
17.include "../../mk/bsd.pkg.mk" 16.include "../../mk/bsd.pkg.mk"
cvs diff -r1.72 -r1.73 pkgsrc/net/proftpd/Makefile (switch to unified diff)

--- pkgsrc/net/proftpd/Makefile 2013/03/15 13:34:32 1.72
+++ pkgsrc/net/proftpd/Makefile 2013/04/06 13:01:27 1.73
@@ -1,66 +1,65 @@ @@ -1,66 +1,65 @@
1# $NetBSD: Makefile,v 1.72 2013/03/15 13:34:32 kim Exp $ 1# $NetBSD: Makefile,v 1.73 2013/04/06 13:01:27 rodent Exp $
2 2
3DISTNAME= proftpd-1.3.4c 3DISTNAME= proftpd-1.3.4c
4CATEGORIES= net 4CATEGORIES= net
5MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \ 5MASTER_SITES= ftp://ftp.proftpd.org/distrib/source/ \
6 ftp://ftp.servus.at/ProFTPD/distrib/source/ \ 6 ftp://ftp.servus.at/ProFTPD/distrib/source/ \
7 ftp://ftp.fsn.hu/pub/proftpd/distrib/source/ 7 ftp://ftp.fsn.hu/pub/proftpd/distrib/source/
8EXTRACT_SUFX= .tar.gz 
9 8
10MAINTAINER= kim@tac.nyc.ny.us 9MAINTAINER= kim@tac.nyc.ny.us
11HOMEPAGE= http://www.proftpd.org/ 10HOMEPAGE= http://www.proftpd.org/
12COMMENT= FTP server with Apache like configuration 11COMMENT= FTP server with Apache like configuration
13LICENSE= gnu-gpl-v2 12LICENSE= gnu-gpl-v2
14 13
15WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} 14WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
16 15
17USE_TOOLS+= gmake intltool msgfmt perl:run 16USE_TOOLS+= gmake intltool msgfmt perl:run
18GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
19CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} 18CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
20CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run 19CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run
21CONFIGURE_ARGS+= --disable-sendfile 20CONFIGURE_ARGS+= --disable-sendfile
22CONFIGURE_ARGS+= --enable-ctrls 21CONFIGURE_ARGS+= --enable-ctrls
23CONFIGURE_ARGS+= --enable-nls 22CONFIGURE_ARGS+= --enable-nls
24CONFIGURE_ENV+= install_group=${ROOT_GROUP} 23CONFIGURE_ENV+= install_group=${ROOT_GROUP}
25CONFIGURE_ENV+= install_user=${ROOT_USER} 24CONFIGURE_ENV+= install_user=${ROOT_USER}
26 25
27BUILD_DEFS+= VARBASE 26BUILD_DEFS+= VARBASE
28 27
29RCD_SCRIPTS= proftpd 28RCD_SCRIPTS= proftpd
30REPLACE_PERL+= contrib/ftpasswd 29REPLACE_PERL+= contrib/ftpasswd
31REPLACE_PERL+= contrib/ftpmail 30REPLACE_PERL+= contrib/ftpmail
32REPLACE_PERL+= contrib/ftpquota 31REPLACE_PERL+= contrib/ftpquota
33REPLACE_PERL+= src/prxs.in 32REPLACE_PERL+= src/prxs.in
34 33
35CONF_FILES= ${PREFIX}/share/examples/proftpd/basic.conf \ 34CONF_FILES= ${PREFIX}/share/examples/proftpd/basic.conf \
36 ${PKG_SYSCONFDIR}/proftpd.conf 35 ${PKG_SYSCONFDIR}/proftpd.conf
37 36
38INSTALLATION_DIRS+= lib/proftpd 37INSTALLATION_DIRS+= lib/proftpd
39INSTALLATION_DIRS+= share/doc/proftpd 38INSTALLATION_DIRS+= share/doc/proftpd
40INSTALLATION_DIRS+= share/examples/proftpd 39INSTALLATION_DIRS+= share/examples/proftpd
41 40
42PLIST_SRC+= ${PKGDIR}/PLIST 41PLIST_SRC+= ${PKGDIR}/PLIST
43 42
44.include "options.mk" 43.include "options.mk"
45 44
46SUBST_CLASSES+= libwrap 45SUBST_CLASSES+= libwrap
47SUBST_STAGE.libwrap= post-patch 46SUBST_STAGE.libwrap= post-patch
48SUBST_FILES.libwrap= contrib/mod_wrap.c 47SUBST_FILES.libwrap= contrib/mod_wrap.c
49SUBST_SED.libwrap= -e '/^...\$$Libraries: /s/ -lnsl\$$$$/$$/' 48SUBST_SED.libwrap= -e '/^...\$$Libraries: /s/ -lnsl\$$$$/$$/'
50 49
51post-install: 50post-install:
52.for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \ 51.for i in NEWS README README.IPv6 README.LDAP README.PAM README.capabilities \
53 README.classes README.controls README.facl README.modules 52 README.classes README.controls README.facl README.modules
54 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd 53 ${INSTALL_DATA} ${WRKSRC}/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd
55.endfor 54.endfor
56.for i in Configuration.html faq.html license.txt 55.for i in Configuration.html faq.html license.txt
57 ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd 56 ${INSTALL_DATA} ${WRKSRC}/doc/${i} ${DESTDIR}${PREFIX}/share/doc/proftpd
58.endfor 57.endfor
59 ${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \ 58 ${INSTALL_DATA} ${WRKSRC}/sample-configurations/*.conf \
60 ${DESTDIR}${PREFIX}/share/examples/proftpd 59 ${DESTDIR}${PREFIX}/share/examples/proftpd
61 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ftpasswd \ 60 ${INSTALL_SCRIPT} ${WRKSRC}/contrib/ftpasswd \
62 ${DESTDIR}${PREFIX}/share/examples/proftpd 61 ${DESTDIR}${PREFIX}/share/examples/proftpd
63 62
64.include "../../devel/gettext-lib/buildlink3.mk" 63.include "../../devel/gettext-lib/buildlink3.mk"
65.include "../../mk/curses.buildlink3.mk" 64.include "../../mk/curses.buildlink3.mk"
66.include "../../mk/bsd.pkg.mk" 65.include "../../mk/bsd.pkg.mk"
cvs diff -r1.29 -r1.30 pkgsrc/net/xfce4-wavelan-plugin/Makefile (switch to unified diff)

--- pkgsrc/net/xfce4-wavelan-plugin/Makefile 2013/02/16 11:19:16 1.29
+++ pkgsrc/net/xfce4-wavelan-plugin/Makefile 2013/04/06 13:01:27 1.30
@@ -1,15 +1,14 @@ @@ -1,15 +1,14 @@
1# $NetBSD: Makefile,v 1.29 2013/02/16 11:19:16 wiz Exp $ 1# $NetBSD: Makefile,v 1.30 2013/04/06 13:01:27 rodent Exp $
2 2
3.include "../../meta-pkgs/xfce4/Makefile.common" 3.include "../../meta-pkgs/xfce4/Makefile.common"
4 4
5XFCE4_VERSION= 0.5.4 5XFCE4_VERSION= 0.5.4
6 6
7DISTNAME= xfce4-wavelan-plugin-${XFCE4_VERSION} 7DISTNAME= xfce4-wavelan-plugin-${XFCE4_VERSION}
8PKGREVISION= 15 8PKGREVISION= 15
9CATEGORIES= sysutils 9CATEGORIES= sysutils
10MASTER_SITES= http://goodies.xfce.org/releases/xfce4-wavelan-plugin/ 10MASTER_SITES= http://goodies.xfce.org/releases/xfce4-wavelan-plugin/
11EXTRACT_SUFX= .tar.gz 
12COMMENT= Xfce WLAN plugin 11COMMENT= Xfce WLAN plugin
13 12
14.include "../../x11/xfce4-panel/buildlink3.mk" 13.include "../../x11/xfce4-panel/buildlink3.mk"
15.include "../../mk/bsd.pkg.mk" 14.include "../../mk/bsd.pkg.mk"
cvs diff -r1.19 -r1.20 pkgsrc/sysutils/xenkernel33/Attic/Makefile (switch to unified diff)

--- pkgsrc/sysutils/xenkernel33/Attic/Makefile 2012/10/23 19:51:36 1.19
+++ pkgsrc/sysutils/xenkernel33/Attic/Makefile 2013/04/06 13:01:27 1.20
@@ -1,63 +1,62 @@ @@ -1,63 +1,62 @@
1# $NetBSD: Makefile,v 1.19 2012/10/23 19:51:36 asau Exp $ 1# $NetBSD: Makefile,v 1.20 2013/04/06 13:01:27 rodent Exp $
2# 2#
3 3
4VERSION= 3.3.2 4VERSION= 3.3.2
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xenkernel33-${VERSION} 6PKGNAME= xenkernel33-${VERSION}
7PKGREVISION= 6 7PKGREVISION= 6
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10EXTRACT_SUFX= .tar.gz 
11 10
12MAINTAINER= cegger@NetBSD.org 11MAINTAINER= cegger@NetBSD.org
13HOMEPAGE= http://xen.org/ 12HOMEPAGE= http://xen.org/
14COMMENT= Xen 3.3.2 Kernel 13COMMENT= Xen 3.3.2 Kernel
15 14
16LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
17 16
18ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 17ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64
19ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 18ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
20 19
21CONFLICTS= xenkernel30-* xentools30-* 20CONFLICTS= xenkernel30-* xentools30-*
22CONFLICTS+= xenkernel3-* xentools3-* 21CONFLICTS+= xenkernel3-* xentools3-*
23CONFLICTS+= xenkernel32-* xentools32-* 22CONFLICTS+= xenkernel32-* xentools32-*
24 23
25WRKSRC= ${WRKDIR}/xen-${VERSION} 24WRKSRC= ${WRKDIR}/xen-${VERSION}
26 25
27NO_CONFIGURE= yes 26NO_CONFIGURE= yes
28USE_TOOLS+= gmake 27USE_TOOLS+= gmake
29 28
30PYTHON_FOR_BUILD_ONLY= # empty 29PYTHON_FOR_BUILD_ONLY= # empty
31PY_PATCHPLIST= NO 30PY_PATCHPLIST= NO
32 31
33SUBST_CLASSES+= py 32SUBST_CLASSES+= py
34SUBST_STAGE.py= pre-build 33SUBST_STAGE.py= pre-build
35SUBST_FILES.py+= xen/tools/get-fields.sh 34SUBST_FILES.py+= xen/tools/get-fields.sh
36SUBST_SED.py= -e "s,python,${PYTHONBIN},g" 35SUBST_SED.py= -e "s,python,${PYTHONBIN},g"
37 36
38#PY_PATCHPLIST doesn't work because we have NO_CONFIGURE 37#PY_PATCHPLIST doesn't work because we have NO_CONFIGURE
39SUBST_CLASSES+= py2 38SUBST_CLASSES+= py2
40SUBST_STAGE.py2= pre-build 39SUBST_STAGE.py2= pre-build
41SUBST_FILES.py2= xen/tools/compat-build-source.py 40SUBST_FILES.py2= xen/tools/compat-build-source.py
42SUBST_FILES.py2+= xen/tools/compat-build-header.py 41SUBST_FILES.py2+= xen/tools/compat-build-header.py
43SUBST_SED.py2= -e "s,/usr/bin/env python,${PYTHONBIN},g" 42SUBST_SED.py2= -e "s,/usr/bin/env python,${PYTHONBIN},g"
44 43
45INSTALLATION_DIRS= xen3-kernel 44INSTALLATION_DIRS= xen3-kernel
46XENKERNELDIR= ${PREFIX}/${INSTALLATION_DIRS} 45XENKERNELDIR= ${PREFIX}/${INSTALLATION_DIRS}
47 46
48MESSAGE_SUBST+= XENKERNELDIR=${XENKERNELDIR:Q} 47MESSAGE_SUBST+= XENKERNELDIR=${XENKERNELDIR:Q}
49 48
50do-build: 49do-build:
51 cd ${WRKSRC} && ${GMAKE} debug=n xen 50 cd ${WRKSRC} && ${GMAKE} debug=n xen
52 ${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen.gz 51 ${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen.gz
53 cd ${WRKSRC} && ${GMAKE} clean && ${GMAKE} debug=y xen 52 cd ${WRKSRC} && ${GMAKE} clean && ${GMAKE} debug=y xen
54 ${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen-debug.gz 53 ${CP} ${WRKSRC}/dist/install/boot/xen.gz ${WRKDIR}/xen-debug.gz
55 54
56do-install: 55do-install:
57 ${INSTALL_DATA} ${WRKDIR}/xen.gz \ 56 ${INSTALL_DATA} ${WRKDIR}/xen.gz \
58 ${DESTDIR}${XENKERNELDIR}/xen.gz 57 ${DESTDIR}${XENKERNELDIR}/xen.gz
59 ${INSTALL_DATA} ${WRKDIR}/xen-debug.gz \ 58 ${INSTALL_DATA} ${WRKDIR}/xen-debug.gz \
60 ${DESTDIR}${XENKERNELDIR}/xen-debug.gz 59 ${DESTDIR}${XENKERNELDIR}/xen-debug.gz
61 60
62.include "../../lang/python/application.mk" 61.include "../../lang/python/application.mk"
63.include "../../mk/bsd.pkg.mk" 62.include "../../mk/bsd.pkg.mk"
cvs diff -r1.17 -r1.18 pkgsrc/sysutils/xenkernel41/Attic/Makefile (switch to unified diff)

--- pkgsrc/sysutils/xenkernel41/Attic/Makefile 2013/01/17 19:37:54 1.17
+++ pkgsrc/sysutils/xenkernel41/Attic/Makefile 2013/04/06 13:01:27 1.18
@@ -1,50 +1,49 @@ @@ -1,50 +1,49 @@
1# $NetBSD: Makefile,v 1.17 2013/01/17 19:37:54 drochner Exp $ 1# $NetBSD: Makefile,v 1.18 2013/04/06 13:01:27 rodent Exp $
2# 2#
3 3
4VERSION= 4.1.4 4VERSION= 4.1.4
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xenkernel41-${VERSION} 6PKGNAME= xenkernel41-${VERSION}
7CATEGORIES= sysutils 7CATEGORIES= sysutils
8MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 8MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
9EXTRACT_SUFX= .tar.gz 
10 9
11MAINTAINER= cegger@NetBSD.org 10MAINTAINER= cegger@NetBSD.org
12HOMEPAGE= http://xen.org/ 11HOMEPAGE= http://xen.org/
13COMMENT= Xen 4.1.x Kernel 12COMMENT= Xen 4.1.x Kernel
14 13
15LICENSE= gnu-gpl-v2 14LICENSE= gnu-gpl-v2
16 15
17ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 16ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64
18ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 17ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
19 18
20NO_CONFIGURE= yes 19NO_CONFIGURE= yes
21USE_TOOLS+= gmake 20USE_TOOLS+= gmake
22 21
23PYTHON_FOR_BUILD_ONLY= # empty 22PYTHON_FOR_BUILD_ONLY= # empty
24PY_PATCHPLIST= NO 23PY_PATCHPLIST= NO
25 24
26# XXX Why does this not work? 25# XXX Why does this not work?
27# See work/xen-4.1.2/Config.mk:41 why PYTHON must be set and what for 26# See work/xen-4.1.2/Config.mk:41 why PYTHON must be set and what for
28MAKE_ENV+= PYTHON=${PYTHONBIN:Q} 27MAKE_ENV+= PYTHON=${PYTHONBIN:Q}
29MAKE_ENV+= OCAML_TOOLS=no 28MAKE_ENV+= OCAML_TOOLS=no
30 29
31INSTALLATION_DIRS= xen41-kernel 30INSTALLATION_DIRS= xen41-kernel
32XENKERNELDIR= ${PREFIX}/${INSTALLATION_DIRS} 31XENKERNELDIR= ${PREFIX}/${INSTALLATION_DIRS}
33 32
34MESSAGE_SUBST+= XENKERNELDIR=${XENKERNELDIR:Q} 33MESSAGE_SUBST+= XENKERNELDIR=${XENKERNELDIR:Q}
35 34
36do-build: 35do-build:
37 cd ${WRKSRC}/xen && ${BUILD_MAKE_CMD} debug=n build 36 cd ${WRKSRC}/xen && ${BUILD_MAKE_CMD} debug=n build
38 ${CP} ${WRKSRC}/xen/xen.gz ${WRKDIR}/xen.gz 37 ${CP} ${WRKSRC}/xen/xen.gz ${WRKDIR}/xen.gz
39 cd ${WRKSRC}/xen && ${MAKE_PROGRAM} clean 38 cd ${WRKSRC}/xen && ${MAKE_PROGRAM} clean
40 cd ${WRKSRC}/xen && ${BUILD_MAKE_CMD} debug=y build 39 cd ${WRKSRC}/xen && ${BUILD_MAKE_CMD} debug=y build
41 ${CP} ${WRKSRC}/xen/xen.gz ${WRKDIR}/xen-debug.gz 40 ${CP} ${WRKSRC}/xen/xen.gz ${WRKDIR}/xen-debug.gz
42 41
43do-install: 42do-install:
44 ${INSTALL_DATA} ${WRKDIR}/xen.gz \ 43 ${INSTALL_DATA} ${WRKDIR}/xen.gz \
45 ${DESTDIR}${XENKERNELDIR}/xen.gz 44 ${DESTDIR}${XENKERNELDIR}/xen.gz
46 ${INSTALL_DATA} ${WRKDIR}/xen-debug.gz \ 45 ${INSTALL_DATA} ${WRKDIR}/xen-debug.gz \
47 ${DESTDIR}${XENKERNELDIR}/xen-debug.gz 46 ${DESTDIR}${XENKERNELDIR}/xen-debug.gz
48 47
49.include "../../lang/python/application.mk" 48.include "../../lang/python/application.mk"
50.include "../../mk/bsd.pkg.mk" 49.include "../../mk/bsd.pkg.mk"
cvs diff -r1.31 -r1.32 pkgsrc/sysutils/xentools3/Attic/Makefile (switch to unified diff)

--- pkgsrc/sysutils/xentools3/Attic/Makefile 2013/02/06 23:23:54 1.31
+++ pkgsrc/sysutils/xentools3/Attic/Makefile 2013/04/06 13:01:27 1.32
@@ -1,202 +1,201 @@ @@ -1,202 +1,201 @@
1# $NetBSD: Makefile,v 1.31 2013/02/06 23:23:54 jperkin Exp $ 1# $NetBSD: Makefile,v 1.32 2013/04/06 13:01:27 rodent Exp $
2# 2#
3 3
4VERSION= 3.1.4 4VERSION= 3.1.4
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xentools3-${VERSION} 6PKGNAME= xentools3-${VERSION}
7PKGREVISION= 13 7PKGREVISION= 13
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10EXTRACT_SUFX= .tar.gz 
11 10
12MAINTAINER= bouyer@NetBSD.org 11MAINTAINER= bouyer@NetBSD.org
13HOMEPAGE= http://xen.org/ 12HOMEPAGE= http://xen.org/
14COMMENT= Userland Tools for Xen 13COMMENT= Userland Tools for Xen
15 14
16#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted 15#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
17DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline 16DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
18 17
19MAKE_JOBS_SAFE= no 18MAKE_JOBS_SAFE= no
20 19
21PKG_SYSCONFSUBDIR= xen 20PKG_SYSCONFSUBDIR= xen
22 21
23ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 Linux-2.[46]*-x86_64 22ONLY_FOR_PLATFORM= Linux-2.[46]*-i386 Linux-2.[46]*-x86_64
24ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64 23ONLY_FOR_PLATFORM+= NetBSD-*-i386 NetBSD-*-x86_64
25 24
26CONFLICTS+= libxen-[0-9]* 25CONFLICTS+= libxen-[0-9]*
27CONFLICTS+= xentools20-[0-9]* 26CONFLICTS+= xentools20-[0-9]*
28CONFLICTS+= xentools30-* xentools33-* 27CONFLICTS+= xentools30-* xentools33-*
29CONFLICTS+= xenstoretools-* 28CONFLICTS+= xenstoretools-*
30 29
31WRKSRC= ${WRKDIR}/xen-${VERSION}/tools 30WRKSRC= ${WRKDIR}/xen-${VERSION}/tools
32CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh 31CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh
33 32
34EGDIR= ${PREFIX}/share/examples/xen 33EGDIR= ${PREFIX}/share/examples/xen
35MESSAGE_SUBST= EGDIR=${EGDIR} 34MESSAGE_SUBST= EGDIR=${EGDIR}
36 35
37USE_TOOLS+= perl #for pod2man 36USE_TOOLS+= perl #for pod2man
38USE_TOOLS+= gmake 37USE_TOOLS+= gmake
39MAKE_ENV+= CONFIG_NetBSD=yes 38MAKE_ENV+= CONFIG_NetBSD=yes
40MAKE_ENV+= CONFIG_MBOOTPACK=no 39MAKE_ENV+= CONFIG_MBOOTPACK=no
41MAKE_ENV+= EGDIR=${EGDIR:Q} 40MAKE_ENV+= EGDIR=${EGDIR:Q}
42MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} 41MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
43.if ${MACHINE_ARCH} == "i386" 42.if ${MACHINE_ARCH} == "i386"
44MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32" 43MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32"
45.elif ${MACHINE_ARCH} == "x86_64" 44.elif ${MACHINE_ARCH} == "x86_64"
46MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64" 45MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
47.else 46.else
48MAKE_ENV+= XEN_TARGET_ARCH="unsupported" 47MAKE_ENV+= XEN_TARGET_ARCH="unsupported"
49.endif 48.endif
50PY_PATCHPLIST= yes 49PY_PATCHPLIST= yes
51PYTHON_PATCH_SCRIPTS+= misc/xm 50PYTHON_PATCH_SCRIPTS+= misc/xm
52PYTHON_PATCH_SCRIPTS+= misc/netfix 51PYTHON_PATCH_SCRIPTS+= misc/netfix
53PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool 52PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool
54PYTHON_PATCH_SCRIPTS+= misc/xencons 53PYTHON_PATCH_SCRIPTS+= misc/xencons
55PYTHON_PATCH_SCRIPTS+= misc/xend 54PYTHON_PATCH_SCRIPTS+= misc/xend
56PYTHON_PATCH_SCRIPTS+= misc/xensymoops 55PYTHON_PATCH_SCRIPTS+= misc/xensymoops
57PYTHON_PATCH_SCRIPTS+= misc/xen-python-path 56PYTHON_PATCH_SCRIPTS+= misc/xen-python-path
58PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub 57PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub
59PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py 58PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py
60PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py 59PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py
61PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py 60PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py
62PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py 61PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py
63PYTHON_PATCH_SCRIPTS+= python/*.py 62PYTHON_PATCH_SCRIPTS+= python/*.py
64PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi 63PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi
65PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py 64PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py
66PYTHON_PATCH_SCRIPTS+= security/python/*.py 65PYTHON_PATCH_SCRIPTS+= security/python/*.py
67PYTHON_PATCH_SCRIPTS+= security/*.py 66PYTHON_PATCH_SCRIPTS+= security/*.py
68PYTHON_PATCH_SCRIPTS+= xenmon/*.py 67PYTHON_PATCH_SCRIPTS+= xenmon/*.py
69PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format 68PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format
70 69
71SUBST_CLASSES+= paths 70SUBST_CLASSES+= paths
72SUBST_STAGE.paths= pre-configure 71SUBST_STAGE.paths= pre-configure
73SUBST_FILES.paths= ioemu/vl.c 72SUBST_FILES.paths= ioemu/vl.c
74SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g" 73SUBST_SED.paths= -e "s|/usr/sbin|${PREFIX}/sbin|g"
75SUBST_MESSAGE.paths= Fixing hardcoded paths. 74SUBST_MESSAGE.paths= Fixing hardcoded paths.
76 75
77SUBST_CLASSES+= pathsvar 76SUBST_CLASSES+= pathsvar
78SUBST_STAGE.pathsvar= pre-configure 77SUBST_STAGE.pathsvar= pre-configure
79SUBST_FILES.pathsvar= examples/init.d/sysconfig.xendomains \ 78SUBST_FILES.pathsvar= examples/init.d/sysconfig.xendomains \
80 examples/xend-config.sxp \ 79 examples/xend-config.sxp \
81 python/xen/xend/server/relocate.py \ 80 python/xen/xend/server/relocate.py \
82 python/xen/xend/XendOptions.py \ 81 python/xen/xend/XendOptions.py \
83 security/Makefile security/python/xensec_gen/main.py \ 82 security/Makefile security/python/xensec_gen/main.py \
84 xenstore/xs_lib.c 83 xenstore/xs_lib.c
85SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" 84SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g"
86 85
87SUBST_CLASSES+= py 86SUBST_CLASSES+= py
88SUBST_STAGE.py= pre-configure 87SUBST_STAGE.py= pre-configure
89SUBST_FILES.py= pygrub/Makefile 88SUBST_FILES.py= pygrub/Makefile
90SUBST_FILES.py+= python/Makefile 89SUBST_FILES.py+= python/Makefile
91SUBST_FILES.py+= security/Makefile 90SUBST_FILES.py+= security/Makefile
92SUBST_FILES.py+= ../xen/include/public/foreign/Makefile 91SUBST_FILES.py+= ../xen/include/public/foreign/Makefile
93SUBST_SED.py= -e "s,python,${PYTHONBIN},g" 92SUBST_SED.py= -e "s,python,${PYTHONBIN},g"
94 93
95SUBST_CLASSES+= conf 94SUBST_CLASSES+= conf
96SUBST_STAGE.conf= pre-configure 95SUBST_STAGE.conf= pre-configure
97SUBST_FILES.conf= python/xen/xend/XendOptions.py 96SUBST_FILES.conf= python/xen/xend/XendOptions.py
98SUBST_FILES.conf+= python/xen/xend/osdep.py 97SUBST_FILES.conf+= python/xen/xend/osdep.py
99SUBST_FILES.conf+= python/xen/xm/create.py 98SUBST_FILES.conf+= python/xen/xm/create.py
100SUBST_FILES.conf+= python/xen/xm/addlabel.py 99SUBST_FILES.conf+= python/xen/xm/addlabel.py
101SUBST_FILES.conf+= python/xen/xm/getlabel.py 100SUBST_FILES.conf+= python/xen/xm/getlabel.py
102SUBST_FILES.conf+= python/xen/xm/rmlabel.py 101SUBST_FILES.conf+= python/xen/xm/rmlabel.py
103SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" 102SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
104 103
105SUBST_CLASSES+= prefix 104SUBST_CLASSES+= prefix
106SUBST_STAGE.prefix= pre-configure 105SUBST_STAGE.prefix= pre-configure
107SUBST_FILES.prefix= python/xen/util/auxbin.py 106SUBST_FILES.prefix= python/xen/util/auxbin.py
108SUBST_FILES.prefix+= python/xen/xend/osdep.py 107SUBST_FILES.prefix+= python/xen/xend/osdep.py
109SUBST_FILES.prefix+= misc/xen-python-path 108SUBST_FILES.prefix+= misc/xen-python-path
110SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},g" 109SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},g"
111 110
112.include "../../mk/bsd.prefs.mk" 111.include "../../mk/bsd.prefs.mk"
113 112
114.if ${OPSYS} == "NetBSD" 113.if ${OPSYS} == "NetBSD"
115SUBST_CLASSES+= proc 114SUBST_CLASSES+= proc
116SUBST_STAGE.proc= pre-configure 115SUBST_STAGE.proc= pre-configure
117SUBST_FILES.proc= python/xen/xend/XendVnet.py 116SUBST_FILES.proc= python/xen/xend/XendVnet.py
118SUBST_FILES.proc+= xenstore/xs_lib.c 117SUBST_FILES.proc+= xenstore/xs_lib.c
119SUBST_SED.proc= -e "s|/proc|/kern|g" 118SUBST_SED.proc= -e "s|/proc|/kern|g"
120PROCPATH= /kern 119PROCPATH= /kern
121.else 120.else
122PROCPATH= /proc 121PROCPATH= /proc
123.endif 122.endif
124 123
125RCD_SCRIPTS= xend xenbackendd xendomains 124RCD_SCRIPTS= xend xenbackendd xendomains
126FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q} 125FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q}
127FILES_SUBST+= PROCPATH=${PROCPATH:Q} 126FILES_SUBST+= PROCPATH=${PROCPATH:Q}
128FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 127FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
129 128
130XEND_SCRIPTS= block vif-bridge vif-ip xen-subr 129XEND_SCRIPTS= block vif-bridge vif-ip xen-subr
131 130
132CONF_FILES= ${EGDIR}/xend-config.sxp \ 131CONF_FILES= ${EGDIR}/xend-config.sxp \
133 ${PKG_SYSCONFDIR}/xend-config.sxp 132 ${PKG_SYSCONFDIR}/xend-config.sxp
134.for s in ${XEND_SCRIPTS} 133.for s in ${XEND_SCRIPTS}
135CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ 134CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \
136 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 135 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
137.endfor 136.endfor
138 137
139OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen 138OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen
140 139
141pre-build: 140pre-build:
142.if !exists(/usr/include/xen/xenio.h) 141.if !exists(/usr/include/xen/xenio.h)
143 ${MKDIR} ${WRKSRC}/libxc/xen 142 ${MKDIR} ${WRKSRC}/libxc/xen
144 ${TEST} -f ${WRKSRC}/libxc/xen/xenio.h || \ 143 ${TEST} -f ${WRKSRC}/libxc/xen/xenio.h || \
145 ${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen 144 ${CP} ${FILESDIR}/xenio.h ${WRKSRC}/libxc/xen
146 ${TEST} -f ${WRKSRC}/libxc/xen/xenio3.h || \ 145 ${TEST} -f ${WRKSRC}/libxc/xen/xenio3.h || \
147 ${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen 146 ${CP} ${FILESDIR}/xenio3.h ${WRKSRC}/libxc/xen
148.endif 147.endif
149 ${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/ 148 ${CP} ${FILESDIR}/NetBSD.mk ${WRKSRC}/../config/
150 pod2man ${WRKSRC}/../docs/man/xend-config.sxp.pod.5 |\ 149 pod2man ${WRKSRC}/../docs/man/xend-config.sxp.pod.5 |\
151 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 150 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
152 >${WRKDIR}/xend-config.sxp.5 151 >${WRKDIR}/xend-config.sxp.5
153 pod2man ${WRKSRC}/../docs/man/xmdomain.cfg.pod.5 |\ 152 pod2man ${WRKSRC}/../docs/man/xmdomain.cfg.pod.5 |\
154 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 153 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
155 >${WRKDIR}/xmdomain.cfg.5 154 >${WRKDIR}/xmdomain.cfg.5
156 pod2man ${WRKSRC}/../docs/man/xm.pod.1 |\ 155 pod2man ${WRKSRC}/../docs/man/xm.pod.1 |\
157 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 156 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
158 >${WRKDIR}/xm.1 157 >${WRKDIR}/xm.1
159 158
160.if ${OPSYS} == "NetBSD" 159.if ${OPSYS} == "NetBSD"
161post-build: 160post-build:
162 cd ${FILESDIR}; for src in *-nbsd; do \ 161 cd ${FILESDIR}; for src in *-nbsd; do \
163 dst="$${src%-nbsd}"; \ 162 dst="$${src%-nbsd}"; \
164 ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ 163 ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
165 -e "s|@PREFIX@|${PREFIX}|g" \ 164 -e "s|@PREFIX@|${PREFIX}|g" \
166 $$src > ${WRKSRC}/examples/$$dst; \ 165 $$src > ${WRKSRC}/examples/$$dst; \
167 done 166 done
168 ${CC} ${CFLAGS} ${LDFLAGS} \ 167 ${CC} ${CFLAGS} ${LDFLAGS} \
169 -DVBD_SCRIPT=\"${PKG_SYSCONFDIR}/scripts/block\" \ 168 -DVBD_SCRIPT=\"${PKG_SYSCONFDIR}/scripts/block\" \
170 -DLOG_FILE=\"${VARBASE}/log/xenbackendd.log\" \ 169 -DLOG_FILE=\"${VARBASE}/log/xenbackendd.log\" \
171 -DPID_FILE=\"${VARBASE}/run/xenbackendd.pid\" \ 170 -DPID_FILE=\"${VARBASE}/run/xenbackendd.pid\" \
172 -o ${WRKDIR}/xenbackendd.bin ${FILESDIR}/xenbackendd.c \ 171 -o ${WRKDIR}/xenbackendd.bin ${FILESDIR}/xenbackendd.c \
173 -I${WRKSRC}/libxc -L${WRKSRC}/libxc \ 172 -I${WRKSRC}/libxc -L${WRKSRC}/libxc \
174 -I${WRKSRC}/xenstore -L${WRKSRC}/xenstore \ 173 -I${WRKSRC}/xenstore -L${WRKSRC}/xenstore \
175 -lxenctrl -lxenstore 174 -lxenctrl -lxenstore
176 175
177.endif 176.endif
178 177
179INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR} 178INSTALLATION_DIRS= ${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${EGDIR}
180 179
181post-install: 180post-install:
182 ${INSTALL_PROGRAM} ${WRKDIR}/xenbackendd.bin ${DESTDIR}${PREFIX}/sbin/xenbackendd 181 ${INSTALL_PROGRAM} ${WRKDIR}/xenbackendd.bin ${DESTDIR}${PREFIX}/sbin/xenbackendd
183 for f in xend-config.sxp xmexample1 xmexample2 xmexample3 netbsd1; do \ 182 for f in xend-config.sxp xmexample1 xmexample2 xmexample3 netbsd1; do \
184 ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f; \ 183 ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f; \
185 done 184 done
186.for s in ${XEND_SCRIPTS} 185.for s in ${XEND_SCRIPTS}
187 ${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${DESTDIR}${EGDIR}/${s} 186 ${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${DESTDIR}${EGDIR}/${s}
188.endfor 187.endfor
189 ${RM} -rf ${DESTDIR}${PREFIX}/lib/xen 188 ${RM} -rf ${DESTDIR}${PREFIX}/lib/xen
190 ${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 189 ${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
191 ${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 190 ${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
192 ${INSTALL_DATA} ${WRKDIR}/xm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 191 ${INSTALL_DATA} ${WRKDIR}/xm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
193 192
194.include "../../lang/python/application.mk" 193.include "../../lang/python/application.mk"
195.include "../../lang/python/extension.mk" 194.include "../../lang/python/extension.mk"
196.include "../../textproc/py-xml/buildlink3.mk" 195.include "../../textproc/py-xml/buildlink3.mk"
197#.include "../../devel/zlib/buildlink3.mk" 196#.include "../../devel/zlib/buildlink3.mk"
198#.include "../../www/curl/buildlink3.mk" 197#.include "../../www/curl/buildlink3.mk"
199.include "../../devel/py-curses/buildlink3.mk" 198.include "../../devel/py-curses/buildlink3.mk"
200.include "../../devel/ncurses/buildlink3.mk" 199.include "../../devel/ncurses/buildlink3.mk"
201 200
202.include "../../mk/bsd.pkg.mk" 201.include "../../mk/bsd.pkg.mk"
cvs diff -r1.35 -r1.36 pkgsrc/sysutils/xentools33/Attic/Makefile (switch to unified diff)

--- pkgsrc/sysutils/xentools33/Attic/Makefile 2012/10/23 19:51:36 1.35
+++ pkgsrc/sysutils/xentools33/Attic/Makefile 2013/04/06 13:01:27 1.36
@@ -1,209 +1,208 @@ @@ -1,209 +1,208 @@
1# $NetBSD: Makefile,v 1.35 2012/10/23 19:51:36 asau Exp $ 1# $NetBSD: Makefile,v 1.36 2013/04/06 13:01:27 rodent Exp $
2# 2#
3 3
4VERSION= 3.3.2 4VERSION= 3.3.2
5DISTNAME= xen-${VERSION} 5DISTNAME= xen-${VERSION}
6PKGNAME= xentools33-${VERSION} 6PKGNAME= xentools33-${VERSION}
7PKGREVISION= 14 7PKGREVISION= 14
8CATEGORIES= sysutils 8CATEGORIES= sysutils
9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/ 9MASTER_SITES= http://bits.xensource.com/oss-xen/release/${VERSION}/
10EXTRACT_SUFX= .tar.gz 
11 10
12MAINTAINER= cegger@NetBSD.org 11MAINTAINER= cegger@NetBSD.org
13HOMEPAGE= http://xen.org/ 12HOMEPAGE= http://xen.org/
14COMMENT= Userland Tools for Xen 3.3.x 13COMMENT= Userland Tools for Xen 3.3.x
15 14
16LICENSE= gnu-gpl-v2 15LICENSE= gnu-gpl-v2
17 16
18#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted 17#DEPENDS+= ${PYPKGPREFIX}-twisted-[0-9]*:../../net/py-twisted
19DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline 18DEPENDS+= ${PYPKGPREFIX}-readline-[0-9]*:../../devel/py-readline
20 19
21BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware 20BUILD_DEPENDS+= dev86-[0-9]*:../../devel/dev86 # needed to build firmware
22 21
23PKG_SYSCONFSUBDIR= xen 22PKG_SYSCONFSUBDIR= xen
24 23
25ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64 24ONLY_FOR_PLATFORM= Linux-2.6*-i386 Linux-2.6*-x86_64
26ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386 25ONLY_FOR_PLATFORM+= NetBSD-[5-9].*-x86_64 NetBSD-[5-9].*-i386
27 26
28CONFLICTS+= libxen-[0-9]* 27CONFLICTS+= libxen-[0-9]*
29CONFLICTS+= xentools20-[0-9]* 28CONFLICTS+= xentools20-[0-9]*
30CONFLICTS+= xentools30-* xentools3-* 29CONFLICTS+= xentools30-* xentools3-*
31CONFLICTS+= xenstoretools-* 30CONFLICTS+= xenstoretools-*
32 31
33WRKSRC= ${WRKDIR}/xen-${VERSION}/tools 32WRKSRC= ${WRKDIR}/xen-${VERSION}/tools
34CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh 33CHECK_PORTABILITY_SKIP= examples/* xm-test/ramdisk/make-release.sh
35 34
36EGDIR= ${PREFIX}/share/examples/xen 35EGDIR= ${PREFIX}/share/examples/xen
37MESSAGE_SUBST= EGDIR=${EGDIR} 36MESSAGE_SUBST= EGDIR=${EGDIR}
38 37
39USE_TOOLS+= perl #for pod2man 38USE_TOOLS+= perl #for pod2man
40USE_TOOLS+= gmake 39USE_TOOLS+= gmake
41MAKE_ENV+= CONFIG_NetBSD=yes 40MAKE_ENV+= CONFIG_NetBSD=yes
42MAKE_ENV+= CONFIG_MBOOTPACK=no 41MAKE_ENV+= CONFIG_MBOOTPACK=no
43MAKE_ENV+= EGDIR=${EGDIR:Q} 42MAKE_ENV+= EGDIR=${EGDIR:Q}
44MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q} 43MAKE_ENV+= MV=${MV:Q} PYTHON=${PYTHONBIN:Q} SED=${SED:Q}
45.if ${MACHINE_ARCH} == "i386" 44.if ${MACHINE_ARCH} == "i386"
46MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32" 45MAKE_ENV+= XEN_TARGET_ARCH="x86_32" XEN_COMPILE_ARCH="x86_32"
47.elif ${MACHINE_ARCH} == "x86_64" 46.elif ${MACHINE_ARCH} == "x86_64"
48MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64" 47MAKE_ENV+= XEN_TARGET_ARCH="x86_64" XEN_COMPILE_ARCH="x86_64"
49.else 48.else
50MAKE_ENV+= XEN_TARGET_ARCH="unsupported" 49MAKE_ENV+= XEN_TARGET_ARCH="unsupported"
51.endif 50.endif
52PY_PATCHPLIST= yes 51PY_PATCHPLIST= yes
53PYTHON_PATCH_SCRIPTS+= misc/xm 52PYTHON_PATCH_SCRIPTS+= misc/xm
54PYTHON_PATCH_SCRIPTS+= misc/netfix 53PYTHON_PATCH_SCRIPTS+= misc/netfix
55PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool 54PYTHON_PATCH_SCRIPTS+= misc/xen-bugtool
56PYTHON_PATCH_SCRIPTS+= misc/xencons 55PYTHON_PATCH_SCRIPTS+= misc/xencons
57PYTHON_PATCH_SCRIPTS+= misc/xend 56PYTHON_PATCH_SCRIPTS+= misc/xend
58PYTHON_PATCH_SCRIPTS+= misc/xensymoops 57PYTHON_PATCH_SCRIPTS+= misc/xensymoops
59PYTHON_PATCH_SCRIPTS+= misc/xen-python-path 58PYTHON_PATCH_SCRIPTS+= misc/xen-python-path
60PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub 59PYTHON_PATCH_SCRIPTS+= pygrub/src/pygrub
61PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py 60PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py
62PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py 61PYTHON_PATCH_SCRIPTS+= python/xen/xend/*.py
63PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py 62PYTHON_PATCH_SCRIPTS+= python/xen/xm/*.py
64PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py 63PYTHON_PATCH_SCRIPTS+= python/xen/util/*.py
65PYTHON_PATCH_SCRIPTS+= python/*.py 64PYTHON_PATCH_SCRIPTS+= python/*.py
66PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi 65PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/cgi-bin/policy.cgi
67PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py 66PYTHON_PATCH_SCRIPTS+= security/python/xensec_gen/*.py
68PYTHON_PATCH_SCRIPTS+= security/python/*.py 67PYTHON_PATCH_SCRIPTS+= security/python/*.py
69PYTHON_PATCH_SCRIPTS+= security/*.py 68PYTHON_PATCH_SCRIPTS+= security/*.py
70PYTHON_PATCH_SCRIPTS+= xenmon/*.py 69PYTHON_PATCH_SCRIPTS+= xenmon/*.py
71PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format 70PYTHON_PATCH_SCRIPTS+= xentrace/xentrace_format
72 71
73SUBST_CLASSES+= pathsvar 72SUBST_CLASSES+= pathsvar
74SUBST_STAGE.pathsvar= pre-configure 73SUBST_STAGE.pathsvar= pre-configure
75SUBST_FILES.pathsvar= examples/init.d/sysconfig.xendomains \ 74SUBST_FILES.pathsvar= examples/init.d/sysconfig.xendomains \
76 examples/xend-config.sxp \ 75 examples/xend-config.sxp \
77 python/xen/xend/server/relocate.py \ 76 python/xen/xend/server/relocate.py \
78 python/xen/xend/XendOptions.py \ 77 python/xen/xend/XendOptions.py \
79 security/Makefile security/python/xensec_gen/main.py \ 78 security/Makefile security/python/xensec_gen/main.py \
80 xenstore/xs_lib.c 79 xenstore/xs_lib.c
81SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g" 80SUBST_SED.pathsvar= -e "s|/var/lib|${VARBASE}/run|g"
82 81
83SUBST_CLASSES+= py 82SUBST_CLASSES+= py
84SUBST_STAGE.py= pre-configure 83SUBST_STAGE.py= pre-configure
85SUBST_FILES.py= check/check_python 84SUBST_FILES.py= check/check_python
86SUBST_FILES.py+= check/check_python_devel 85SUBST_FILES.py+= check/check_python_devel
87SUBST_FILES.py+= pygrub/Makefile 86SUBST_FILES.py+= pygrub/Makefile
88SUBST_FILES.py+= python/Makefile 87SUBST_FILES.py+= python/Makefile
89SUBST_FILES.py+= security/Makefile 88SUBST_FILES.py+= security/Makefile
90SUBST_FILES.py+= include/xen-foreign/Makefile 89SUBST_FILES.py+= include/xen-foreign/Makefile
91SUBST_FILES.py+= include/xen-foreign/mkheader.py 90SUBST_FILES.py+= include/xen-foreign/mkheader.py
92SUBST_FILES.py+= ../xen/tools/get-fields.sh 91SUBST_FILES.py+= ../xen/tools/get-fields.sh
93SUBST_SED.py= -e "s,python,${PYTHONBIN},g" 92SUBST_SED.py= -e "s,python,${PYTHONBIN},g"
94 93
95SUBST_CLASSES+= conf 94SUBST_CLASSES+= conf
96SUBST_STAGE.conf= pre-configure 95SUBST_STAGE.conf= pre-configure
97SUBST_FILES.conf= python/xen/xend/XendOptions.py 96SUBST_FILES.conf= python/xen/xend/XendOptions.py
98SUBST_FILES.conf+= python/xen/xend/osdep.py 97SUBST_FILES.conf+= python/xen/xend/osdep.py
99SUBST_FILES.conf+= python/xen/xm/create.py 98SUBST_FILES.conf+= python/xen/xm/create.py
100SUBST_FILES.conf+= python/xen/xm/addlabel.py 99SUBST_FILES.conf+= python/xen/xm/addlabel.py
101SUBST_FILES.conf+= python/xen/xm/getlabel.py 100SUBST_FILES.conf+= python/xen/xm/getlabel.py
102SUBST_FILES.conf+= python/xen/xm/rmlabel.py 101SUBST_FILES.conf+= python/xen/xm/rmlabel.py
103SUBST_FILES.conf+= xentrace/Makefile 102SUBST_FILES.conf+= xentrace/Makefile
104SUBST_FILES.conf+= ioemu/configure 103SUBST_FILES.conf+= ioemu/configure
105SUBST_FILES.conf+= ioemu/vl.c 104SUBST_FILES.conf+= ioemu/vl.c
106SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" 105SUBST_SED.conf= -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g"
107 106
108SUBST_CLASSES+= prefix 107SUBST_CLASSES+= prefix
109SUBST_STAGE.prefix= pre-configure 108SUBST_STAGE.prefix= pre-configure
110SUBST_FILES.prefix= python/xen/util/auxbin.py 109SUBST_FILES.prefix= python/xen/util/auxbin.py
111SUBST_FILES.prefix+= python/xen/xend/osdep.py 110SUBST_FILES.prefix+= python/xen/xend/osdep.py
112SUBST_FILES.prefix+= misc/xen-python-path 111SUBST_FILES.prefix+= misc/xen-python-path
113SUBST_FILES.prefix+= ioemu/vl.c 112SUBST_FILES.prefix+= ioemu/vl.c
114SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},g" 113SUBST_SED.prefix= -e "s,@PREFIX@,${PREFIX},g"
115 114
116REPLACE_PYTHON+= misc/xsview 115REPLACE_PYTHON+= misc/xsview
117 116
118.include "../../mk/bsd.prefs.mk" 117.include "../../mk/bsd.prefs.mk"
119 118
120.if ${OPSYS} == "NetBSD" 119.if ${OPSYS} == "NetBSD"
121SUBST_CLASSES+= proc 120SUBST_CLASSES+= proc
122SUBST_STAGE.proc= pre-configure 121SUBST_STAGE.proc= pre-configure
123SUBST_FILES.proc= python/xen/xend/XendVnet.py 122SUBST_FILES.proc= python/xen/xend/XendVnet.py
124SUBST_SED.proc= -e "s|/proc|/kern|g" 123SUBST_SED.proc= -e "s|/proc|/kern|g"
125PROCPATH= /kern 124PROCPATH= /kern
126.else 125.else
127PROCPATH= /proc 126PROCPATH= /proc
128.endif 127.endif
129 128
130RCD_SCRIPTS= xend xenbackendd xendomains 129RCD_SCRIPTS= xend xenbackendd xendomains
131FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q} 130FILES_SUBST+= RCD_INTERPRETER=${PYTHONBIN:Q}
132FILES_SUBST+= PROCPATH=${PROCPATH:Q} 131FILES_SUBST+= PROCPATH=${PROCPATH:Q}
133FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} 132FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
134 133
135BLKTAP_FILES= blk_netbsd.c blktapctrl_netbsd.c 134BLKTAP_FILES= blk_netbsd.c blktapctrl_netbsd.c
136 135
137XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup xen-subr 136XEND_SCRIPTS= block vif-bridge vif-ip qemu-ifup xen-subr
138 137
139CONF_FILES= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats 138CONF_FILES= ${EGDIR}/formats ${PKG_SYSCONFDIR}/formats
140 139
141CONF_FILES+= ${EGDIR}/xend-config.sxp \ 140CONF_FILES+= ${EGDIR}/xend-config.sxp \
142 ${PKG_SYSCONFDIR}/xend-config.sxp 141 ${PKG_SYSCONFDIR}/xend-config.sxp
143.for s in ${XEND_SCRIPTS} 142.for s in ${XEND_SCRIPTS}
144CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \ 143CONF_FILES_PERMS+= ${EGDIR}/${s} ${PKG_SYSCONFDIR}/scripts/${s} \
145 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755 144 ${REAL_ROOT_USER} ${REAL_ROOT_GROUP} 0755
146.endfor 145.endfor
147 146
148OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen 147OWN_DIRS= ${PKG_SYSCONFDIR}/scripts /var/log/xen
149 148
150pre-build: 149pre-build:
151 rm -f ${WRKSRC}/check/check_x11_devel 150 rm -f ${WRKSRC}/check/check_x11_devel
152.for s in ${BLKTAP_FILES} 151.for s in ${BLKTAP_FILES}
153 cp ${FILESDIR}/${s} ${WRKSRC}/blktap/drivers/ 152 cp ${FILESDIR}/${s} ${WRKSRC}/blktap/drivers/
154.endfor 153.endfor
155 pod2man ${WRKSRC}/../docs/man/xend-config.sxp.pod.5 |\ 154 pod2man ${WRKSRC}/../docs/man/xend-config.sxp.pod.5 |\
156 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 155 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
157 >${WRKDIR}/xend-config.sxp.5 156 >${WRKDIR}/xend-config.sxp.5
158 pod2man ${WRKSRC}/../docs/man/xmdomain.cfg.pod.5 |\ 157 pod2man ${WRKSRC}/../docs/man/xmdomain.cfg.pod.5 |\
159 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 158 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
160 >${WRKDIR}/xmdomain.cfg.5 159 >${WRKDIR}/xmdomain.cfg.5
161 pod2man ${WRKSRC}/../docs/man/xm.pod.1 |\ 160 pod2man ${WRKSRC}/../docs/man/xm.pod.1 |\
162 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \ 161 sed -e "s,@XENDCONFDIR@,${PKG_SYSCONFDIR},g" \
163 >${WRKDIR}/xm.1 162 >${WRKDIR}/xm.1
164 163
165.if ${OPSYS} == "NetBSD" 164.if ${OPSYS} == "NetBSD"
166post-build: 165post-build:
167 cd ${FILESDIR}; for src in *-nbsd; do \ 166 cd ${FILESDIR}; for src in *-nbsd; do \
168 dst="$${src%-nbsd}"; \ 167 dst="$${src%-nbsd}"; \
169 ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \ 168 ${SED} -e "s|@PKG_SYSCONFDIR@|${PKG_SYSCONFDIR}|g" \
170 -e "s|@PREFIX@|${PREFIX}|g" \ 169 -e "s|@PREFIX@|${PREFIX}|g" \
171 $$src > ${WRKSRC}/examples/$$dst; \ 170 $$src > ${WRKSRC}/examples/$$dst; \
172 done 171 done
173 ${CC} ${CFLAGS} ${LDFLAGS} \ 172 ${CC} ${CFLAGS} ${LDFLAGS} \
174 -DVBD_SCRIPT=\"${PKG_SYSCONFDIR}/scripts/block\" \ 173 -DVBD_SCRIPT=\"${PKG_SYSCONFDIR}/scripts/block\" \
175 -DLOG_FILE=\"${VARBASE}/log/xenbackendd.log\" \ 174 -DLOG_FILE=\"${VARBASE}/log/xenbackendd.log\" \
176 -DPID_FILE=\"${VARBASE}/run/xenbackendd.pid\" \ 175 -DPID_FILE=\"${VARBASE}/run/xenbackendd.pid\" \
177 -o ${WRKDIR}/xenbackendd.bin ${FILESDIR}/xenbackendd.c \ 176 -o ${WRKDIR}/xenbackendd.bin ${FILESDIR}/xenbackendd.c \
178 -I${WRKSRC}/libxc -I${WRKSRC}/include -L${WRKSRC}/libxc \ 177 -I${WRKSRC}/libxc -I${WRKSRC}/include -L${WRKSRC}/libxc \
179 -I${WRKSRC}/xenstore -L${WRKSRC}/xenstore \ 178 -I${WRKSRC}/xenstore -L${WRKSRC}/xenstore \
180 -lxenctrl -lxenstore 179 -lxenctrl -lxenstore
181 180
182.endif 181.endif
183 182
184INSTALLATION_DIRS= ${EGDIR} ${PKGMANDIR}/man5 183INSTALLATION_DIRS= ${EGDIR} ${PKGMANDIR}/man5
185 184
186post-install: 185post-install:
187 ${INSTALL_PROGRAM} ${WRKDIR}/xenbackendd.bin \ 186 ${INSTALL_PROGRAM} ${WRKDIR}/xenbackendd.bin \
188 ${DESTDIR}${PREFIX}/sbin/xenbackendd 187 ${DESTDIR}${PREFIX}/sbin/xenbackendd
189 for f in xend-config.sxp xmexample1 xmexample2 xmexample3 netbsd1; do \ 188 for f in xend-config.sxp xmexample1 xmexample2 xmexample3 netbsd1; do \
190 ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f; \ 189 ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f; \
191 done 190 done
192.for s in ${XEND_SCRIPTS} 191.for s in ${XEND_SCRIPTS}
193 ${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${DESTDIR}${EGDIR}/${s} 192 ${INSTALL_SCRIPT} ${WRKSRC}/examples/${s} ${DESTDIR}${EGDIR}/${s}
194.endfor 193.endfor
195 ${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 194 ${INSTALL_DATA} ${WRKDIR}/xend-config.sxp.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
196 ${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5 195 ${INSTALL_DATA} ${WRKDIR}/xmdomain.cfg.5 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man5
197 ${INSTALL_DATA} ${WRKDIR}/xm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1 196 ${INSTALL_DATA} ${WRKDIR}/xm.1 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
198 for f in hvm qemu-ifup; do \ 197 for f in hvm qemu-ifup; do \
199 ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f; \ 198 ${INSTALL_DATA} ${WRKSRC}/examples/$$f ${DESTDIR}${EGDIR}/$$f; \
200 done 199 done
201 200
202.include "../../lang/python/application.mk" 201.include "../../lang/python/application.mk"
203.include "../../lang/python/extension.mk" 202.include "../../lang/python/extension.mk"
204.include "../../textproc/py-xml/buildlink3.mk" 203.include "../../textproc/py-xml/buildlink3.mk"
205.include "../../devel/py-curses/buildlink3.mk" 204.include "../../devel/py-curses/buildlink3.mk"
206.include "../../devel/ncurses/buildlink3.mk" 205.include "../../devel/ncurses/buildlink3.mk"
207#.include "../../devel/SDL/buildlink3.mk" 206#.include "../../devel/SDL/buildlink3.mk"
208 207
209.include "../../mk/bsd.pkg.mk" 208.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/textproc/regxml/Makefile (switch to unified diff)

--- pkgsrc/textproc/regxml/Makefile 2012/10/25 06:56:54 1.2
+++ pkgsrc/textproc/regxml/Makefile 2013/04/06 13:01:28 1.3
@@ -1,69 +1,68 @@ @@ -1,69 +1,68 @@
1# $NetBSD: Makefile,v 1.2 2012/10/25 06:56:54 asau Exp $ 1# $NetBSD: Makefile,v 1.3 2013/04/06 13:01:28 rodent Exp $
2# 2#
3 3
4DISTNAME= regxml-${SNAPSHOT_DATE}-${SNAPSHOT_HASH:C/(......).*/\1/} 4DISTNAME= regxml-${SNAPSHOT_DATE}-${SNAPSHOT_HASH:C/(......).*/\1/}
5PKGNAME= regxml-0.0.${SNAPSHOT_DATE} 5PKGNAME= regxml-0.0.${SNAPSHOT_DATE}
6CATEGORIES= textproc 6CATEGORIES= textproc
7EXTRACT_SUFX= .tar.gz 
8 7
9# The master site does not have a stable distfile. 8# The master site does not have a stable distfile.
10# 9#
11# You can download a distfile from 10# You can download a distfile from
12# <http://git.huoc.org/?p=regxml.git;a=snapshot;h=${SNAPSHOT_HASH};sf=tgz> 11# <http://git.huoc.org/?p=regxml.git;a=snapshot;h=${SNAPSHOT_HASH};sf=tgz>
13# but the timestamp in the gzip compression layer will be different 12# but the timestamp in the gzip compression layer will be different
14# almost every time, so it will fail the pkgsrc integrity tests. 13# almost every time, so it will fail the pkgsrc integrity tests.
15# To deal with this, we keep a distfile in MASTER_SITE_LOCAL. 14# To deal with this, we keep a distfile in MASTER_SITE_LOCAL.
16# 15#
17# To update to a newer snapshot: 16# To update to a newer snapshot:
18# 17#
19# 1. Go to <http://git.huoc.org/?p=regxml.git;a=summary> and 18# 1. Go to <http://git.huoc.org/?p=regxml.git;a=summary> and
20# choose an appropriate snapshot. Make a note of the date 19# choose an appropriate snapshot. Make a note of the date
21# and the git hash. 20# and the git hash.
22# 2. Download the snapshot to your own computer. 21# 2. Download the snapshot to your own computer.
23# 3. Rename the downloaded snapshot to 22# 3. Rename the downloaded snapshot to
24# regxml-${YYYYMMDD}-${FIRST_6_CHARS_OF_GIT_HASH}.tar.gz 23# regxml-${YYYYMMDD}-${FIRST_6_CHARS_OF_GIT_HASH}.tar.gz
25# 4. Edit the SNAPSHOT_DATE and SNAPSHOT_HASH in thie Makefile. 24# 4. Edit the SNAPSHOT_DATE and SNAPSHOT_HASH in thie Makefile.
26# 5. Upload your copy of the snapshot to MASTER_SITE_LOCAL, which is 25# 5. Upload your copy of the snapshot to MASTER_SITE_LOCAL, which is
27# <http://ftp.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/> 26# <http://ftp.NetBSD.org/pub/pkgsrc/distfiles/LOCAL_PORTS/>
28# 6. Everything else you would normally do when updating to a new version 27# 6. Everything else you would normally do when updating to a new version
29# of a package. 28# of a package.
30# 29#
31SNAPSHOT_DATE= 20100901 30SNAPSHOT_DATE= 20100901
32SNAPSHOT_HASH= d9f32668e0f75204abe7acfaf22981893520c7b6 31SNAPSHOT_HASH= d9f32668e0f75204abe7acfaf22981893520c7b6
33MASTER_SITES= ${MASTER_SITE_LOCAL} 32MASTER_SITES= ${MASTER_SITE_LOCAL}
34 33
35MAINTAINER= pkgsrc-users@NetBSD.org 34MAINTAINER= pkgsrc-users@NetBSD.org
36HOMEPAGE= http://git.huoc.org/?p=regxml.git;a=summary 35HOMEPAGE= http://git.huoc.org/?p=regxml.git;a=summary
37 36
38COMMENT= Command line utilities for XML stream manipulation 37COMMENT= Command line utilities for XML stream manipulation
39LICENSE= 2-clause-bsd 38LICENSE= 2-clause-bsd
40 39
41USE_TOOLS+= gmake 40USE_TOOLS+= gmake
42MAKE_FILE= GNUmakefile 41MAKE_FILE= GNUmakefile
43 42
44WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*//} 43WRKSRC= ${WRKDIR}/${DISTNAME:C/-.*//}
45 44
46INSTALLATION_DIRS+= bin 45INSTALLATION_DIRS+= bin
47INSTALLATION_DIRS+= ${PKGMANDIR} ${PKGMANDIR}/man1 46INSTALLATION_DIRS+= ${PKGMANDIR} ${PKGMANDIR}/man1
48INSTALLATION_DIRS+= ${PKGMANDIR}/man3 ${PKGMANDIR}/man7 47INSTALLATION_DIRS+= ${PKGMANDIR}/man3 ${PKGMANDIR}/man7
49 48
50do-install: 49do-install:
51 ${INSTALL_PROGRAM} ${WRKSRC}/xmlgrep/xmlgrep \ 50 ${INSTALL_PROGRAM} ${WRKSRC}/xmlgrep/xmlgrep \
52 ${DESTDIR}${PREFIX}/bin/xmlgrep 51 ${DESTDIR}${PREFIX}/bin/xmlgrep
53 ${INSTALL_PROGRAM} ${WRKSRC}/xmlsed/xmlsed \ 52 ${INSTALL_PROGRAM} ${WRKSRC}/xmlsed/xmlsed \
54 ${DESTDIR}${PREFIX}/bin/xmlsed 53 ${DESTDIR}${PREFIX}/bin/xmlsed
55 ${INSTALL_MAN} ${WRKSRC}/doc/xmlgrep.1 \ 54 ${INSTALL_MAN} ${WRKSRC}/doc/xmlgrep.1 \
56 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ 55 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
57 ${INSTALL_MAN} ${WRKSRC}/doc/xmlsed.1 \ 56 ${INSTALL_MAN} ${WRKSRC}/doc/xmlsed.1 \
58 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/ 57 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/
59 ${INSTALL_MAN} ${WRKSRC}/doc/regxml.3 \ 58 ${INSTALL_MAN} ${WRKSRC}/doc/regxml.3 \
60 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/ 59 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/
61 ${INSTALL_MAN} ${WRKSRC}/doc/regxml_xml.3 \ 60 ${INSTALL_MAN} ${WRKSRC}/doc/regxml_xml.3 \
62 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/ 61 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man3/
63 ${INSTALL_MAN} ${WRKSRC}/doc/xmltools.7 \ 62 ${INSTALL_MAN} ${WRKSRC}/doc/xmltools.7 \
64 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/ 63 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man7/
65 64
66.include "../../textproc/expat/buildlink3.mk" 65.include "../../textproc/expat/buildlink3.mk"
67 66
68# url2pkg-marker (please do not remove this line.) 67# url2pkg-marker (please do not remove this line.)
69.include "../../mk/bsd.pkg.mk" 68.include "../../mk/bsd.pkg.mk"
cvs diff -r1.6 -r1.7 pkgsrc/textproc/xhtmldiff/Attic/Makefile (switch to unified diff)

--- pkgsrc/textproc/xhtmldiff/Attic/Makefile 2010/09/23 09:22:14 1.6
+++ pkgsrc/textproc/xhtmldiff/Attic/Makefile 2013/04/06 13:01:28 1.7
@@ -1,23 +1,22 @@ @@ -1,23 +1,22 @@
1# $NetBSD: Makefile,v 1.6 2010/09/23 09:22:14 taca Exp $ 1# $NetBSD: Makefile,v 1.7 2013/04/06 13:01:28 rodent Exp $
2 2
3DISTNAME= xhtmldiff-1.2.2 3DISTNAME= xhtmldiff-1.2.2
4PKGREVISION= 2 4PKGREVISION= 2
5CATEGORIES= textproc 5CATEGORIES= textproc
6MASTER_SITES= http://theinternetco.net/projects/ruby/ 6MASTER_SITES= http://theinternetco.net/projects/ruby/
7EXTRACT_SUFX= .tar.gz 
8 7
9MAINTAINER= minskim@NetBSD.org 8MAINTAINER= minskim@NetBSD.org
10HOMEPAGE= # http://theinternetco.net/projects/ruby/xhtmldiff.html 9HOMEPAGE= # http://theinternetco.net/projects/ruby/xhtmldiff.html
11COMMENT= Tool for generating valid XHTML redline documents 10COMMENT= Tool for generating valid XHTML redline documents
12 11
13DEPENDS+= ${RUBY_PKGPREFIX}-diff-lcs>=1.1.1:../../textproc/ruby-diff-lcs 12DEPENDS+= ${RUBY_PKGPREFIX}-diff-lcs>=1.1.1:../../textproc/ruby-diff-lcs
14 13
15CONFLICTS+= ruby[1-9][0-9]-xhtmldiff-[0-9]* xhtmldiff-[0-9]* 14CONFLICTS+= ruby[1-9][0-9]-xhtmldiff-[0-9]* xhtmldiff-[0-9]*
16 15
17RUBY_VERSION_SUPPORTED= 18 16RUBY_VERSION_SUPPORTED= 18
18 17
19post-extract: 18post-extract:
20 cp ${WRKSRC}/packaging/xhtmldiff.gemspec ${GEM_SPECFILE} 19 cp ${WRKSRC}/packaging/xhtmldiff.gemspec ${GEM_SPECFILE}
21 20
22.include "../../lang/ruby/gem.mk" 21.include "../../lang/ruby/gem.mk"
23.include "../../mk/bsd.pkg.mk" 22.include "../../mk/bsd.pkg.mk"
cvs diff -r1.16 -r1.17 pkgsrc/time/xalarm/Makefile (switch to unified diff)

--- pkgsrc/time/xalarm/Makefile 2013/02/17 18:55:44 1.16
+++ pkgsrc/time/xalarm/Makefile 2013/04/06 13:01:28 1.17
@@ -1,59 +1,58 @@ @@ -1,59 +1,58 @@
1# $NetBSD: Makefile,v 1.16 2013/02/17 18:55:44 dholland Exp $ 1# $NetBSD: Makefile,v 1.17 2013/04/06 13:01:28 rodent Exp $
2 2
3DISTNAME= xalarm-3.06 3DISTNAME= xalarm-3.06
4PKGREVISION= 3 4PKGREVISION= 3
5CATEGORIES= time 5CATEGORIES= time
6MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/} 6MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
7EXTRACT_SUFX= .tar.gz 
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10COMMENT= X11 interactive alarm clock 9COMMENT= X11 interactive alarm clock
11 10
12DEPENDS+= skill>=4.0:../../sysutils/skill 11DEPENDS+= skill>=4.0:../../sysutils/skill
13 12
14USE_IMAKE= yes 13USE_IMAKE= yes
15XAW_TYPE?= 3d 14XAW_TYPE?= 3d
16 15
17FORTUNE= "Sorry, xfortune is unavailable - no fortune!" 16FORTUNE= "Sorry, xfortune is unavailable - no fortune!"
18YOW= "Sorry, xyow is unavailable - no yow!" 17YOW= "Sorry, xyow is unavailable - no yow!"
19KILL= /bin/kill # should this be in bsd.pkg.mk ? 18KILL= /bin/kill # should this be in bsd.pkg.mk ?
20 19
21.include "../../mk/bsd.prefs.mk" 20.include "../../mk/bsd.prefs.mk"
22 21
23.if defined(XALARM_USE_YOW) 22.if defined(XALARM_USE_YOW)
24DEPENDS+= emacs20>=20.7:../../editors/emacs 23DEPENDS+= emacs20>=20.7:../../editors/emacs
25.endif 24.endif
26 25
27.if ${OPSYS} == "NetBSD" 26.if ${OPSYS} == "NetBSD"
28.if exists(/usr/games/fortune) 27.if exists(/usr/games/fortune)
29FORTUNE= `/usr/games/fortune` 28FORTUNE= `/usr/games/fortune`
30.endif 29.endif
31MAKE_FLAGS+= EXTRA_DEFINES=-DFORKRETURNSPID_T 30MAKE_FLAGS+= EXTRA_DEFINES=-DFORKRETURNSPID_T
32.endif 31.endif
33 32
34pre-configure: 33pre-configure:
35.if defined(XALARM_USE_YOW) 34.if defined(XALARM_USE_YOW)
36 # if multiple version emacs of emacs are there, take the higher one... 35 # if multiple version emacs of emacs are there, take the higher one...
37 YOW=`${FIND} ${LOCALBASE}/libexec/emacs -name yow -print 2>/dev/null | ${SORT} -rn | ${HEAD} -1` ; \ 36 YOW=`${FIND} ${LOCALBASE}/libexec/emacs -name yow -print 2>/dev/null | ${SORT} -rn | ${HEAD} -1` ; \
38 if ${TEST} x$${YOW} = x ; then \ 37 if ${TEST} x$${YOW} = x ; then \
39 YOW=${YOW} ; \ 38 YOW=${YOW} ; \
40 fi ; ${SETENV} YOW=$${YOW} \ 39 fi ; ${SETENV} YOW=$${YOW} \
41 ${SED} -e "s|@PRG@|\`$${YOW}\`|" \ 40 ${SED} -e "s|@PRG@|\`$${YOW}\`|" \
42 -e 's|@XPRG@|xyow|' \ 41 -e 's|@XPRG@|xyow|' \
43 ${FILESDIR}/xprg > ${WRKSRC}/xyow 42 ${FILESDIR}/xprg > ${WRKSRC}/xyow
44.else 43.else
45 ${SED} -e 's|@PRG@|${YOW}|' \ 44 ${SED} -e 's|@PRG@|${YOW}|' \
46 -e 's|@XPRG@|xyow|' \ 45 -e 's|@XPRG@|xyow|' \
47 ${FILESDIR}/xprg > ${WRKSRC}/xyow 46 ${FILESDIR}/xprg > ${WRKSRC}/xyow
48.endif 47.endif
49 ${SED} -e 's|@PRG@|${FORTUNE}|' \ 48 ${SED} -e 's|@PRG@|${FORTUNE}|' \
50 -e 's|@XPRG@|xfortune|' \ 49 -e 's|@XPRG@|xfortune|' \
51 ${FILESDIR}/xprg > ${WRKSRC}/xfortune 50 ${FILESDIR}/xprg > ${WRKSRC}/xfortune
52 ${SED} -e 's|@SKILL@|${LOCALBASE}/bin/skill|' \ 51 ${SED} -e 's|@SKILL@|${LOCALBASE}/bin/skill|' \
53 -e 's|@GREP@|${GREP}|' \ 52 -e 's|@GREP@|${GREP}|' \
54 -e 's|@KILL@|${KILL}|' ${FILESDIR}/fns.h.in > ${WRKSRC}/fns.h 53 -e 's|@KILL@|${KILL}|' ${FILESDIR}/fns.h.in > ${WRKSRC}/fns.h
55 ${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/ 54 ${CP} ${FILESDIR}/XAlarm-color.ad ${WRKSRC}/
56 55
57.include "../../x11/libXpm/buildlink3.mk" 56.include "../../x11/libXpm/buildlink3.mk"
58.include "../../mk/xaw.buildlink3.mk" 57.include "../../mk/xaw.buildlink3.mk"
59.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1.1.1 -r1.2 pkgsrc/www/phraseanet/Makefile.common (switch to unified diff)

--- pkgsrc/www/phraseanet/Makefile.common 2011/10/04 08:03:43 1.1.1.1
+++ pkgsrc/www/phraseanet/Makefile.common 2013/04/06 13:01:28 1.2
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile.common,v 1.1.1.1 2011/10/04 08:03:43 manu Exp $ 1# $NetBSD: Makefile.common,v 1.2 2013/04/06 13:01:28 rodent Exp $
2# 2#
3 3
4# used by www/phraseanet/Makefile 4# used by www/phraseanet/Makefile
5# used by www/php-phrasea2/Makefile 5# used by www/php-phrasea2/Makefile
6# used by www/phraseanet-indexer/Makefile 6# used by www/phraseanet-indexer/Makefile
7 7
8VERS= 3.1.4 8VERS= 3.1.4
9DISTNAME= phraseanet-v3.1.4-linux 9DISTNAME= phraseanet-v3.1.4-linux
10CATEGORIES= www multimedia 10CATEGORIES= www multimedia
11MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phraseanet/} 11MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=phraseanet/}
12EXTRACT_SUFX= .tar.gz 
13 12
14MAINTAINER= pkgsrc-users@NetBSD.org 13MAINTAINER= pkgsrc-users@NetBSD.org
15HOMEPAGE= http://www.phraseanet.com/ 14HOMEPAGE= http://www.phraseanet.com/
16COMMENT= Digital asset management 15COMMENT= Digital asset management
17LICENSE= gnu-gpl-v3 16LICENSE= gnu-gpl-v3
cvs diff -r1.9 -r1.10 pkgsrc/x11/fltk13/Makefile (switch to unified diff)

--- pkgsrc/x11/fltk13/Makefile 2013/02/16 11:18:11 1.9
+++ pkgsrc/x11/fltk13/Makefile 2013/04/06 13:01:28 1.10
@@ -1,76 +1,75 @@ @@ -1,76 +1,75 @@
1# $NetBSD: Makefile,v 1.9 2013/02/16 11:18:11 wiz Exp $ 1# $NetBSD: Makefile,v 1.10 2013/04/06 13:01:28 rodent Exp $
2 2
3DISTNAME= fltk-1.3.0-source 3DISTNAME= fltk-1.3.0-source
4PKGNAME= ${DISTNAME:S/-source//} 4PKGNAME= ${DISTNAME:S/-source//}
5VERS= ${DISTNAME:S/fltk-//:S/-source//} 5VERS= ${DISTNAME:S/fltk-//:S/-source//}
6PKGREVISION= 10 6PKGREVISION= 10
7CATEGORIES= x11 7CATEGORIES= x11
8MASTER_SITES= http://ftp.easysw.com/pub/fltk/${VERS}/ \ 8MASTER_SITES= http://ftp.easysw.com/pub/fltk/${VERS}/ \
9 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \ 9 ftp://ftp.funet.fi/pub/mirrors/ftp.easysw.com/pub/fltk/${VERS}/ \
10 ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/ 10 ftp://ftp.rz.tu-bs.de/pub/mirror/ftp.easysw.com/ftp/pub/fltk/${VERS}/
11EXTRACT_SUFX= .tar.gz 
12 11
13MAINTAINER= pkgsrc-users@NetBSD.org 12MAINTAINER= pkgsrc-users@NetBSD.org
14HOMEPAGE= http://www.fltk.org/ 13HOMEPAGE= http://www.fltk.org/
15COMMENT= Fast Light Tool Kit for graphical user interfaces 14COMMENT= Fast Light Tool Kit for graphical user interfaces
16LICENSE= gnu-lgpl-v2 15LICENSE= gnu-lgpl-v2
17 16
18CONFLICTS= fltk-1.[012].* 17CONFLICTS= fltk-1.[012].*
19 18
20WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//} 19WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
21USE_LANGUAGES= c c++ 20USE_LANGUAGES= c c++
22USE_LIBTOOL= yes 21USE_LIBTOOL= yes
23USE_TOOLS+= gmake 22USE_TOOLS+= gmake
24TEST_TARGET= test 23TEST_TARGET= test
25 24
26PKG_OPTIONS_VAR= PKG_OPTIONS.fltk13 25PKG_OPTIONS_VAR= PKG_OPTIONS.fltk13
27PKG_SUPPORTED_OPTIONS= opengl # cairo 26PKG_SUPPORTED_OPTIONS= opengl # cairo
28PKG_SUGGESTED_OPTIONS= opengl # cairo 27PKG_SUGGESTED_OPTIONS= opengl # cairo
29#PLIST_VARS+= cairo 28#PLIST_VARS+= cairo
30PLIST_VARS+= opengl 29PLIST_VARS+= opengl
31 30
32.include "../../mk/bsd.prefs.mk" 31.include "../../mk/bsd.prefs.mk"
33.include "../../mk/bsd.options.mk" 32.include "../../mk/bsd.options.mk"
34 33
35PTHREAD_OPTS+= require 34PTHREAD_OPTS+= require
36GNU_CONFIGURE= yes 35GNU_CONFIGURE= yes
37CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q} 36CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q}
38CONFIGURE_ARGS+= --enable-threads 37CONFIGURE_ARGS+= --enable-threads
39CONFIGURE_ARGS+= ac_cv_have_overlay=yes 38CONFIGURE_ARGS+= ac_cv_have_overlay=yes
40 39
41PLIST_VARS+= cs # case-sensitive 40PLIST_VARS+= cs # case-sensitive
42.if !exists(./descr) 41.if !exists(./descr)
43CONFIGURE_ARGS+= --with-links 42CONFIGURE_ARGS+= --with-links
44PLIST.cs= yes 43PLIST.cs= yes
45.endif 44.endif
46 45
47BUILDLINK_DEPMETHOD.libXt?= build 46BUILDLINK_DEPMETHOD.libXt?= build
48 47
49#.if !empty(PKG_OPTIONS:Mcairo) 48#.if !empty(PKG_OPTIONS:Mcairo)
50#. include "../../graphics/cairo/buildlink3.mk" 49#. include "../../graphics/cairo/buildlink3.mk"
51#CONFIGURE_ARGS+= --enable-cairo 50#CONFIGURE_ARGS+= --enable-cairo
52#PLIST.cairo= yes 51#PLIST.cairo= yes
53#.else 52#.else
54#CONFIGURE_ARGS+= --disable-cairo 53#CONFIGURE_ARGS+= --disable-cairo
55#.endif 54#.endif
56 55
57.if !empty(PKG_OPTIONS:Mopengl) 56.if !empty(PKG_OPTIONS:Mopengl)
58. include "../../graphics/Mesa/buildlink3.mk" 57. include "../../graphics/Mesa/buildlink3.mk"
59CONFIGURE_ARGS+= --enable-gl 58CONFIGURE_ARGS+= --enable-gl
60PLIST.opengl= yes 59PLIST.opengl= yes
61.else 60.else
62CONFIGURE_ARGS+= --disable-gl 61CONFIGURE_ARGS+= --disable-gl
63.endif 62.endif
64 63
65CONFIGURE_ARGS+= --enable-shared 64CONFIGURE_ARGS+= --enable-shared
66# Use pkgsrc versions, not package's bundled versions. 65# Use pkgsrc versions, not package's bundled versions.
67CONFIGURE_ARGS+= --disable-localjpeg --disable-localzlib --disable-localpng 66CONFIGURE_ARGS+= --disable-localjpeg --disable-localzlib --disable-localpng
68 67
69.include "../../graphics/MesaLib/buildlink3.mk" 68.include "../../graphics/MesaLib/buildlink3.mk"
70.include "../../graphics/glu/buildlink3.mk" 69.include "../../graphics/glu/buildlink3.mk"
71.include "../../mk/jpeg.buildlink3.mk" 70.include "../../mk/jpeg.buildlink3.mk"
72.include "../../graphics/png/buildlink3.mk" 71.include "../../graphics/png/buildlink3.mk"
73.include "../../x11/libXext/buildlink3.mk" 72.include "../../x11/libXext/buildlink3.mk"
74.include "../../x11/libXt/buildlink3.mk" 73.include "../../x11/libXt/buildlink3.mk"
75.include "../../mk/pthread.buildlink3.mk" 74.include "../../mk/pthread.buildlink3.mk"
76.include "../../mk/bsd.pkg.mk" 75.include "../../mk/bsd.pkg.mk"