[arch-commits] Commit in dmenu/repos (8 files)

Thayer Williams thayer at archlinux.org
Thu Nov 6 05:33:19 UTC 2008 

    Date: Thursday, November 6, 2008 @ 00:33:19
  Author: thayer
Revision: 18492

Merged revisions 356,18490-18491 via svnmerge from 
svn+ssh://archlinux.org/home/svn-packages/dmenu/trunk

........
  r356 | aaron | 2008-04-18 15:56:27 -0700 (Fri, 18 Apr 2008) | 1 line
  
  Added svn:keywords to all PKGBUILDs
........
  r18490 | thayer | 2008-11-05 16:05:47 -0800 (Wed, 05 Nov 2008) | 2 lines
  
  upgpkg: dmenu 3.9-1
      upstream release v3.9
........
  r18491 | thayer | 2008-11-05 16:39:42 -0800 (Wed, 05 Nov 2008) | 2 lines
  
  upgpkg: dmenu 3.9-1
      upstream release v3.9
........

Modified:
  dmenu/repos/extra-i686/	(properties)
  dmenu/repos/extra-i686/PKGBUILD
  dmenu/repos/extra-i686/dmenu.patch
  dmenu/repos/extra-x86_64/	(properties)
  dmenu/repos/extra-x86_64/PKGBUILD
  dmenu/repos/extra-x86_64/dmenu.patch
Deleted:
  dmenu/repos/extra-i686/config.mk
  dmenu/repos/extra-x86_64/config.mk

--------------------------+
 extra-i686/PKGBUILD      |   16 +++++++---------
 extra-i686/config.mk     |   30 ------------------------------
 extra-i686/dmenu.patch   |   11 +++++------
 extra-x86_64/PKGBUILD    |   15 +++++++--------
 extra-x86_64/config.mk   |   30 ------------------------------
 extra-x86_64/dmenu.patch |   11 +++++------
 6 files changed, 24 insertions(+), 89 deletions(-)


Property changes on: dmenu/repos/extra-i686
___________________________________________________________________
Name: svnmerge-integrated
   - /dmenu/trunk:1
   + /dmenu/trunk:1-18490

Modified: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD	2008-11-06 00:39:42 UTC (rev 18491)
+++ extra-i686/PKGBUILD	2008-11-06 05:33:19 UTC (rev 18492)
@@ -1,16 +1,19 @@
 # $Id$
-# Maintainer: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=dmenu
-pkgver=3.4
+pkgver=3.9
 pkgrel=1
 pkgdesc="Dynamic X menu"
-url="http://www.suckless.org/wiki/tools/xlib"
+url="http://www.suckless.org/programs/dmenu.html"
 arch=('i686' 'x86_64')
 license=('MIT')
 depends=('libx11')
-source=(http://suckless.org/download/$pkgname-$pkgver.tar.gz 
+source=(http://code.suckless.org/dl/tools/$pkgname-$pkgver.tar.gz 
 		dmenu.patch)
+md5sums=('36d546dd4ac21660b20cdb056f5cb341'
+         'd74a6665a19cb0403720f1f3abcd280d')
 
 build()
 {
@@ -23,8 +26,3 @@
   mkdir -p $startdir/pkg/usr/share/licenses/$pkgname
   cp LICENSE $startdir/pkg/usr/share/licenses/$pkgname/
 }
-
-md5sums=('9b5c9d427c6896e50da1dc77a2405065'
-         '067b6e08e48c535d7f3fdecd4d602700')
-sha1sums=('f9defb210da9fcce35982ba5a2ff5ad8fe8d6a63'
-          '94390111c586116c57f3a901bf5baa49c5ef1aec')

Deleted: extra-i686/config.mk
===================================================================
--- extra-i686/config.mk	2008-11-06 00:39:42 UTC (rev 18491)
+++ extra-i686/config.mk	2008-11-06 05:33:19 UTC (rev 18492)
@@ -1,30 +0,0 @@
-# dmenu version
-VERSION = 1.8
-
-# Customize below to fit your system
-
-# paths
-PREFIX = /usr
-MANPREFIX = ${PREFIX}/man
-
-X11INC = /usr/include/X11
-X11LIB = /usr/lib/X11
-
-# includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-
-# flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = -g ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-#CFLAGS += -xtarget=ultra
-
-# compiler and linker
-CC = cc
-LD = ${CC}

Modified: extra-i686/dmenu.patch
===================================================================
--- extra-i686/dmenu.patch	2008-11-06 00:39:42 UTC (rev 18491)
+++ extra-i686/dmenu.patch	2008-11-06 05:33:19 UTC (rev 18492)
@@ -1,7 +1,6 @@
-diff -Naur dmenu-3.2/config.mk dmenu-3.2.patch/config.mk
---- dmenu-3.2/config.mk	2007-05-30 06:21:59.000000000 -0400
-+++ dmenu-3.2.patch/config.mk	2007-06-05 21:54:26.000000000 -0400
-@@ -4,11 +4,11 @@
+--- dmenu-3.9.orig/config.mk	2008-09-13 20:45:32.000000000 -0300
++++ dmenu-3.9/config.mk	2008-09-13 20:46:42.000000000 -0300
+@@ -4,11 +4,11 @@ VERSION = 3.9
  # Customize below to fit your system
  
  # paths
@@ -14,5 +13,5 @@
 +X11INC = /usr/include/X11
 +X11LIB = /usr/lib/X11
  
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC}
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS = -L${X11LIB} -lXinerama


Property changes on: dmenu/repos/extra-x86_64
___________________________________________________________________
Name: svnmerge-integrated
   - /dmenu/trunk:1
   + /dmenu/trunk:1-18491

Modified: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD	2008-11-06 00:39:42 UTC (rev 18491)
+++ extra-x86_64/PKGBUILD	2008-11-06 05:33:19 UTC (rev 18492)
@@ -1,16 +1,19 @@
 # $Id$
-# Maintainer: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Contributor: Jeff 'codemac' Mickey <jeff at archlinux.org>
+# Maintainer: Thayer Williams <thayer at archlinux.org>
 
 pkgname=dmenu
-pkgver=3.4
+pkgver=3.9
 pkgrel=1
 pkgdesc="Dynamic X menu"
-url="http://www.suckless.org/wiki/tools/xlib"
+url="http://www.suckless.org/programs/dmenu.html"
 arch=('i686' 'x86_64')
 license=('MIT')
 depends=('libx11')
-source=(http://suckless.org/download/$pkgname-$pkgver.tar.gz 
+source=(http://code.suckless.org/dl/tools/$pkgname-$pkgver.tar.gz 
 		dmenu.patch)
+md5sums=('36d546dd4ac21660b20cdb056f5cb341'
+         'd74a6665a19cb0403720f1f3abcd280d')
 
 build()
 {
@@ -24,7 +27,3 @@
   cp LICENSE $startdir/pkg/usr/share/licenses/$pkgname/
 }
 
-md5sums=('9b5c9d427c6896e50da1dc77a2405065'
-         '067b6e08e48c535d7f3fdecd4d602700')
-sha1sums=('f9defb210da9fcce35982ba5a2ff5ad8fe8d6a63'
-          '94390111c586116c57f3a901bf5baa49c5ef1aec')

Deleted: extra-x86_64/config.mk
===================================================================
--- extra-x86_64/config.mk	2008-11-06 00:39:42 UTC (rev 18491)
+++ extra-x86_64/config.mk	2008-11-06 05:33:19 UTC (rev 18492)
@@ -1,30 +0,0 @@
-# dmenu version
-VERSION = 1.8
-
-# Customize below to fit your system
-
-# paths
-PREFIX = /usr
-MANPREFIX = ${PREFIX}/man
-
-X11INC = /usr/include/X11
-X11LIB = /usr/lib/X11
-
-# includes and libs
-INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
-
-# flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
-LDFLAGS = ${LIBS}
-#CFLAGS = -g -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = -g ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-#CFLAGS += -xtarget=ultra
-
-# compiler and linker
-CC = cc
-LD = ${CC}

Modified: extra-x86_64/dmenu.patch
===================================================================
--- extra-x86_64/dmenu.patch	2008-11-06 00:39:42 UTC (rev 18491)
+++ extra-x86_64/dmenu.patch	2008-11-06 05:33:19 UTC (rev 18492)
@@ -1,7 +1,6 @@
-diff -Naur dmenu-3.2/config.mk dmenu-3.2.patch/config.mk
---- dmenu-3.2/config.mk	2007-05-30 06:21:59.000000000 -0400
-+++ dmenu-3.2.patch/config.mk	2007-06-05 21:54:26.000000000 -0400
-@@ -4,11 +4,11 @@
+--- dmenu-3.9.orig/config.mk	2008-09-13 20:45:32.000000000 -0300
++++ dmenu-3.9/config.mk	2008-09-13 20:46:42.000000000 -0300
+@@ -4,11 +4,11 @@ VERSION = 3.9
  # Customize below to fit your system
  
  # paths
@@ -14,5 +13,5 @@
 +X11INC = /usr/include/X11
 +X11LIB = /usr/lib/X11
  
- # includes and libs
- INCS = -I. -I/usr/include -I${X11INC}
+ # Xinerama, comment if you don't want it
+ XINERAMALIBS = -L${X11LIB} -lXinerama

More information about the arch-commits mailing list