diff options
author | hubertf <hubertf@pkgsrc.org> | 2006-03-02 22:58:49 +0000 |
---|---|---|
committer | hubertf <hubertf@pkgsrc.org> | 2006-03-02 22:58:49 +0000 |
commit | f91fa17ccc13bc72d1d7be86f6cf3863136c10a5 (patch) | |
tree | d46210565330835ee080b7e70552c4372999ab86 | |
parent | 16a2fd326c1e78a0de5ec0bbe0f2bb11cc85f0b2 (diff) | |
download | pkgsrc-f91fa17ccc13bc72d1d7be86f6cf3863136c10a5.tar.gz |
update xdaemon{,2} to include a netbsd flag logo. Run: xnetbsd-flag{,2}
-rw-r--r-- | doc/CHANGES | 4 | ||||
-rw-r--r-- | x11/xdaemon/Makefile | 31 | ||||
-rw-r--r-- | x11/xdaemon/PLIST | 10 | ||||
-rw-r--r-- | x11/xdaemon/distinfo | 32 | ||||
-rw-r--r-- | x11/xdaemon2/Makefile | 21 | ||||
-rw-r--r-- | x11/xdaemon2/PLIST | 6 | ||||
-rw-r--r-- | x11/xdaemon2/distinfo | 8 |
7 files changed, 79 insertions, 33 deletions
diff --git a/doc/CHANGES b/doc/CHANGES index daafe99fce6..3275eef82ce 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,4 +1,4 @@ -$NetBSD: CHANGES,v 1.13145 2006/03/02 21:12:15 wiz Exp $ +$NetBSD: CHANGES,v 1.13146 2006/03/02 22:59:06 hubertf Exp $ Changes to the packages collection and infrastructure in 2006: @@ -1300,3 +1300,5 @@ Changes to the packages collection and infrastructure in 2006: Updated devel/cqual to 0.991nb5 [wiz 2006-03-02] Updated pkgtools/digest to 20060302 [agc 2006-03-02] Updated mail/gld to 1.6 [wiz 2006-03-02] + Updated x11/xdaemon to 1.1 [hubertf 2006-03-02] + Updated x11/xdaemon2 to 2.1 [hubertf 2006-03-02] diff --git a/x11/xdaemon/Makefile b/x11/xdaemon/Makefile index 65c4c5bff07..d2b270893bb 100644 --- a/x11/xdaemon/Makefile +++ b/x11/xdaemon/Makefile @@ -1,10 +1,13 @@ -# $NetBSD: Makefile,v 1.16 2006/02/05 23:11:45 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2006/03/02 22:58:49 hubertf Exp $ -DISTNAME= xdaemon-1.0 -PKGREVISION= 2 +DISTNAME= xdaemon-1.1 CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_LOCAL} -DISTFILES= ${PIX} Daemon.README +DISTFILES= Daemon.README \ + ${IMAGES:=_bw.xbm} \ + ${IMAGES:=_color.xpm} \ + ${IMAGES:=_icon.xbm} \ + ${IMAGES:=_mask.xbm} \ MAINTAINER= hubertf@NetBSD.org HOMEPAGE= http://www.NetBSD.org/ @@ -15,14 +18,12 @@ DEPENDS+= xteddy-1.*:../../x11/xteddy CONFLICTS+= xdaemon-2.* WRKSRC= ${WRKDIR} -DIST_SUBDIR= xdaemon -PIX= xdaemon_bw.xbm xdaemon2_bw.xbm \ - xdaemon_color.xpm xdaemon2_color.xpm \ - xdaemon_icon.xbm xdaemon2_icon.xbm \ - xdaemon_mask.xbm xdaemon2_mask.xbm NO_CONFIGURE= yes NO_BUILD= yes NO_MTREE= yes +DIST_SUBDIR= xdaemon + +IMAGES= xdaemon xdaemon2 xnetbsd-flag xnetbsd-flag2 INSTALLATION_DIRS= bin share/doc share/xteddy/pixmaps @@ -31,11 +32,13 @@ do-extract: @${ECHO} Bringing daemonic powers to you! do-install: -.for pic in ${PIX} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${pic} ${PREFIX}/share/xteddy/pixmaps/${pic} -.endfor +.for img in ${IMAGES} +.for sufx in _bw.xbm _color.xpm _icon.xbm _mask.xbm + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${img}${sufx} ${PREFIX}/share/xteddy/pixmaps/${img}${sufx} +.endfor # sufx + ${RM} -f ${PREFIX}/bin/${img} + ${LN} -s xteddy ${PREFIX}/bin/${img} +.endfor # img ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Daemon.README ${PREFIX}/share/doc/xdaemon.README - ${LN} -s ${PREFIX}/bin/xteddy ${PREFIX}/bin/xdaemon - ${LN} -s ${PREFIX}/bin/xteddy ${PREFIX}/bin/xdaemon2 .include "../../mk/bsd.pkg.mk" diff --git a/x11/xdaemon/PLIST b/x11/xdaemon/PLIST index 8d3ae1a6c9b..d8c6f36333b 100644 --- a/x11/xdaemon/PLIST +++ b/x11/xdaemon/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.2 2005/10/23 23:01:49 rillig Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/03/02 22:58:49 hubertf Exp $ bin/xdaemon bin/xdaemon2 share/doc/xdaemon.README @@ -10,3 +10,11 @@ share/xteddy/pixmaps/xdaemon_bw.xbm share/xteddy/pixmaps/xdaemon_color.xpm share/xteddy/pixmaps/xdaemon_icon.xbm share/xteddy/pixmaps/xdaemon_mask.xbm +share/xteddy/pixmaps/xnetbsd-flag_bw.xbm +share/xteddy/pixmaps/xnetbsd-flag_color.xpm +share/xteddy/pixmaps/xnetbsd-flag_icon.xbm +share/xteddy/pixmaps/xnetbsd-flag_mask.xbm +share/xteddy/pixmaps/xnetbsd-flag2_bw.xbm +share/xteddy/pixmaps/xnetbsd-flag2_color.xpm +share/xteddy/pixmaps/xnetbsd-flag2_icon.xbm +share/xteddy/pixmaps/xnetbsd-flag2_mask.xbm diff --git a/x11/xdaemon/distinfo b/x11/xdaemon/distinfo index baa427044a7..7c9c38cc5d0 100644 --- a/x11/xdaemon/distinfo +++ b/x11/xdaemon/distinfo @@ -1,29 +1,53 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 17:36:22 wiz Exp $ +$NetBSD: distinfo,v 1.4 2006/03/02 22:58:49 hubertf Exp $ +SHA1 (xdaemon/Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b +RMD160 (xdaemon/Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 +Size (xdaemon/Daemon.README) = 2191 bytes SHA1 (xdaemon/xdaemon_bw.xbm) = 0bdf4746cd3e2dc3ce863546568e628a2cb8ce88 RMD160 (xdaemon/xdaemon_bw.xbm) = 1c691d240ba10cedf799a801ed2286ad44896146 Size (xdaemon/xdaemon_bw.xbm) = 37312 bytes SHA1 (xdaemon/xdaemon2_bw.xbm) = e5c5752db1883becf449707a1c5206f31435a0c4 RMD160 (xdaemon/xdaemon2_bw.xbm) = e6ea944d3ef7edf8ca5059febd79801f81ab50ac Size (xdaemon/xdaemon2_bw.xbm) = 9721 bytes +SHA1 (xdaemon/xnetbsd-flag_bw.xbm) = 86fc8fd31659d51d112d487db351936b4383e2ad +RMD160 (xdaemon/xnetbsd-flag_bw.xbm) = e3e2070496e7e4d14c9fc15616fc600c834f7528 +Size (xdaemon/xnetbsd-flag_bw.xbm) = 54746 bytes +SHA1 (xdaemon/xnetbsd-flag2_bw.xbm) = b73f6b0b3d6217ac34b961a422138b453070101a +RMD160 (xdaemon/xnetbsd-flag2_bw.xbm) = 00a9510e2f3139361d3b53692a2b094c2285742e +Size (xdaemon/xnetbsd-flag2_bw.xbm) = 6379 bytes SHA1 (xdaemon/xdaemon_color.xpm) = f2f97bf60b75e44fca314cc2308c092ede92db2b RMD160 (xdaemon/xdaemon_color.xpm) = 7d1b008af24cafc5557a9e492b96704aacc1b268 Size (xdaemon/xdaemon_color.xpm) = 58385 bytes SHA1 (xdaemon/xdaemon2_color.xpm) = b544424a5c54c9635e66344dcc8423ad7b17d1e4 RMD160 (xdaemon/xdaemon2_color.xpm) = 40895e585ed93951ca5498396641f45bbef3c0ea Size (xdaemon/xdaemon2_color.xpm) = 33001 bytes +SHA1 (xdaemon/xnetbsd-flag_color.xpm) = bb308953781f18330056edc32e3b5076672b58bb +RMD160 (xdaemon/xnetbsd-flag_color.xpm) = da4ca9136c9107a1e6a303fdd48f3e6a416537bc +Size (xdaemon/xnetbsd-flag_color.xpm) = 70031 bytes +SHA1 (xdaemon/xnetbsd-flag2_color.xpm) = 912f688fc0a2159fddfd75d0c5810c2d7e484cac +RMD160 (xdaemon/xnetbsd-flag2_color.xpm) = 02c61cf48678203e90bc02567419d5125d6d74b8 +Size (xdaemon/xnetbsd-flag2_color.xpm) = 8119 bytes SHA1 (xdaemon/xdaemon_icon.xbm) = 2490529f3d150a41a1f87e0d4a279d3ead56cdae RMD160 (xdaemon/xdaemon_icon.xbm) = 1205decbc6dc88102fc93fb7292f31627d3d9073 Size (xdaemon/xdaemon_icon.xbm) = 2070 bytes SHA1 (xdaemon/xdaemon2_icon.xbm) = aa2fa9b6b1eedd18c413999c45ea3a7710b8c81b RMD160 (xdaemon/xdaemon2_icon.xbm) = 10d7dc5e96a0410f139f0f7afb3d0250c677a568 Size (xdaemon/xdaemon2_icon.xbm) = 2070 bytes +SHA1 (xdaemon/xnetbsd-flag_icon.xbm) = 73c7b862731080c41c7083ee143ca10d144d4846 +RMD160 (xdaemon/xnetbsd-flag_icon.xbm) = 02c22dac40ebed2542f17a52d77d6349fda6c147 +Size (xdaemon/xnetbsd-flag_icon.xbm) = 2088 bytes +SHA1 (xdaemon/xnetbsd-flag2_icon.xbm) = 73c7b862731080c41c7083ee143ca10d144d4846 +RMD160 (xdaemon/xnetbsd-flag2_icon.xbm) = 02c22dac40ebed2542f17a52d77d6349fda6c147 +Size (xdaemon/xnetbsd-flag2_icon.xbm) = 2088 bytes SHA1 (xdaemon/xdaemon_mask.xbm) = f466b978570ba77587afe11acd0e5f935519af1e RMD160 (xdaemon/xdaemon_mask.xbm) = 5990b2a8b460705e9a567cba15340c701a4fd835 Size (xdaemon/xdaemon_mask.xbm) = 37318 bytes SHA1 (xdaemon/xdaemon2_mask.xbm) = 25d8460891089a03840b118cae88d89fb8c8efce RMD160 (xdaemon/xdaemon2_mask.xbm) = f2d9e4286ddd4409c07322c013f5c3e997b60756 Size (xdaemon/xdaemon2_mask.xbm) = 9727 bytes -SHA1 (xdaemon/Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b -RMD160 (xdaemon/Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 -Size (xdaemon/Daemon.README) = 2191 bytes +SHA1 (xdaemon/xnetbsd-flag_mask.xbm) = 94bb0893df1d0cc474646285dcff789bff48ad23 +RMD160 (xdaemon/xnetbsd-flag_mask.xbm) = 1f1389cbe326575256c845cdd2d7dc5b1da20915 +Size (xdaemon/xnetbsd-flag_mask.xbm) = 54767 bytes +SHA1 (xdaemon/xnetbsd-flag2_mask.xbm) = 3afb5e64e7d6ab1bb203a1e8904d3d5ab0c5c233 +RMD160 (xdaemon/xnetbsd-flag2_mask.xbm) = e987875ba22baf93fa0c967cdeb4b6e386cd58e3 +Size (xdaemon/xnetbsd-flag2_mask.xbm) = 6400 bytes diff --git a/x11/xdaemon2/Makefile b/x11/xdaemon2/Makefile index 0d63ab5348b..523c91c53f5 100644 --- a/x11/xdaemon2/Makefile +++ b/x11/xdaemon2/Makefile @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.14 2006/02/05 23:11:45 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2006/03/02 22:58:56 hubertf Exp $ -DISTNAME= xdaemon-2.0 -PKGREVISION= 4 +DISTNAME= xdaemon-2.1 CATEGORIES= games x11 MASTER_SITES= ${MASTER_SITE_LOCAL} -DISTFILES= ${PIX} Daemon.README +DISTFILES= ${IMAGES:=.png} Daemon.README MAINTAINER= hubertf@NetBSD.org HOMEPAGE= http://www.NetBSD.org/ @@ -14,12 +13,12 @@ DEPENDS+= xteddy-2.*:../../x11/xteddy2 CONFLICTS+= xdaemon-1.* -#WRKSRC= ${WRKDIR} -DIST_SUBDIR= xdaemon -PIX= xdaemon.png xdaemon2.png NO_CONFIGURE= yes NO_BUILD= yes NO_MTREE= yes +DIST_SUBDIR= xdaemon + +IMAGES= xdaemon xdaemon2 xnetbsd-flag xnetbsd-flag2 INSTALLATION_DIRS= bin share/doc share/xteddy @@ -28,11 +27,11 @@ do-extract: @${ECHO} Bringing daemonic powers to you! do-install: -.for pic in ${PIX} - ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${pic} ${PREFIX}/share/xteddy/${pic} +.for img in ${IMAGES} + ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/${img}.png ${PREFIX}/share/xteddy/${img}.png + ${RM} -f ${PREFIX}/bin/${img} + ${LN} -s xteddy ${PREFIX}/bin/${img} .endfor ${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/Daemon.README ${PREFIX}/share/doc/xdaemon.README - ${LN} -s ${PREFIX}/bin/xteddy ${PREFIX}/bin/xdaemon - ${LN} -s ${PREFIX}/bin/xteddy ${PREFIX}/bin/xdaemon2 .include "../../mk/bsd.pkg.mk" diff --git a/x11/xdaemon2/PLIST b/x11/xdaemon2/PLIST index 9648bc05803..d0c0090ae9f 100644 --- a/x11/xdaemon2/PLIST +++ b/x11/xdaemon2/PLIST @@ -1,6 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2005/10/23 23:04:00 rillig Exp $ +@comment $NetBSD: PLIST,v 1.3 2006/03/02 22:58:56 hubertf Exp $ bin/xdaemon bin/xdaemon2 +bin/xnetbsd-flag +bin/xnetbsd-flag2 share/doc/xdaemon.README share/xteddy/xdaemon.png share/xteddy/xdaemon2.png +share/xteddy/xnetbsd-flag.png +share/xteddy/xnetbsd-flag2.png diff --git a/x11/xdaemon2/distinfo b/x11/xdaemon2/distinfo index 48eeb92309b..def591bfb93 100644 --- a/x11/xdaemon2/distinfo +++ b/x11/xdaemon2/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.3 2005/02/23 17:36:22 wiz Exp $ +$NetBSD: distinfo,v 1.4 2006/03/02 22:58:56 hubertf Exp $ SHA1 (xdaemon/xdaemon.png) = ee7960820646c6e351aee241d34067f17d9a8a10 RMD160 (xdaemon/xdaemon.png) = 60fbb758ede9c156902bf805bc81d66bc5017876 @@ -6,6 +6,12 @@ Size (xdaemon/xdaemon.png) = 25658 bytes SHA1 (xdaemon/xdaemon2.png) = 8bc4dfa53554d7e2f0ffdfcc935766935b94dc67 RMD160 (xdaemon/xdaemon2.png) = 246de3e73a4278aec03d2268db0ffe1234497d6d Size (xdaemon/xdaemon2.png) = 16741 bytes +SHA1 (xdaemon/xnetbsd-flag.png) = df0200510b4669e8d095bdd4992b3ebb07bc74ed +RMD160 (xdaemon/xnetbsd-flag.png) = 6ef83b3cc2ffd7eba3e6ee60aa02e0e900791402 +Size (xdaemon/xnetbsd-flag.png) = 7844 bytes +SHA1 (xdaemon/xnetbsd-flag2.png) = fb2080fd70f3ad49d28f66c12964a4498376f363 +RMD160 (xdaemon/xnetbsd-flag2.png) = 35d69c44a0f1cd5fd25b76b2c5fbe52b2d05bcca +Size (xdaemon/xnetbsd-flag2.png) = 2564 bytes SHA1 (xdaemon/Daemon.README) = eb1e6af52adc02ded77af17e8953134b7e60d23b RMD160 (xdaemon/Daemon.README) = 39edd92ed4314397080f32a8caff0ac3f716ecf4 Size (xdaemon/Daemon.README) = 2191 bytes |