[arch-commits] Commit in mg/trunk (PKGBUILD cleanup.patch)

[Sergej Pupykin]

    Date: Thursday, March 13, 2014 @ 10:28:00
  Author: spupykin
Revision: 107142

upgpkg: mg 20140306-1

upd

Modified:
  mg/trunk/PKGBUILD
  mg/trunk/cleanup.patch

---------------+
 PKGBUILD      |   14 +++++++-------
 cleanup.patch |   41 +++++++++--------------------------------
 2 files changed, 16 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2014-03-13 08:59:13 UTC (rev 107141)
+++ PKGBUILD	2014-03-13 09:28:00 UTC (rev 107142)
@@ -3,18 +3,18 @@
 # Contributor: Hannes Rist <hrist at phreeknet.org>
 
 pkgname=mg
-pkgver=20130922
-pkgrel=2
+pkgver=20140306
+pkgrel=1
 pkgdesc="mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team."
 arch=('i686' 'x86_64')
 url="http://homepage.boetes.org/software/mg/"
 depends=('ncurses' 'libbsd')
-makedepends=('bmake' 'libclens')
+makedepends=('libclens')
 license=('custom')
 source=(http://homepage.boetes.org/software/mg/mg-$pkgver.tar.gz
 	cleanup.patch)
-md5sums=('35bd196ab32bae3531d6bc48be8779d0'
-         'abcea6e34c05425a52101b7c7fb60e7a')
+md5sums=('bb29858c2c0a82b78ce48ae2929ae18d'
+         '545eac98585e2f5fe0781093ddc07b36')
 
 prepare() {
   cd $srcdir/$pkgname-$pkgver
@@ -23,7 +23,7 @@
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-  bmake prefix=/usr
+  make prefix=/usr
 }
 
 package() {
@@ -30,7 +30,7 @@
   cd $srcdir/$pkgname-$pkgver
 
   mkdir -p $pkgdir/usr/bin
-  bmake install INSTALL=install prefix=/usr DESTDIR=$pkgdir BINDIR=/usr/bin
+  make install INSTALL=install prefix=/usr DESTDIR=$pkgdir BINDIR=/usr/bin
 
   mkdir -p $pkgdir/usr/share/
   install -D -m0644 README $pkgdir/usr/share/licenses/$pkgname/README

Modified: cleanup.patch
===================================================================
--- cleanup.patch	2014-03-13 08:59:13 UTC (rev 107141)
+++ cleanup.patch	2014-03-13 09:28:00 UTC (rev 107142)
@@ -1,36 +1,13 @@
-diff -wbBur mg-20130922/file.c mg-20130922.q/file.c
---- mg-20130922/file.c	2013-09-22 13:09:36.000000000 +0400
-+++ mg-20130922.q/file.c	2013-10-30 15:20:47.927840374 +0400
-@@ -669,9 +669,9 @@
- {
- 	struct stat	statbuf;
- 	int	 s;
--	char    *dp;
-+	char    *dp = malloc(strlen(fn) + 1);
- 
--	dp = dirname(fn);
-+	xdirname(dp, fn, strlen(fn));
- 
- 	if (stat(fn, &statbuf) == -1 && errno == ENOENT) {
- 		errno = 0;
-diff -wbBur mg-20130922/Makefile mg-20130922.q/Makefile
---- mg-20130922/Makefile	2013-09-22 18:06:43.000000000 +0400
-+++ mg-20130922.q/Makefile	2013-10-30 15:20:34.201173866 +0400
-@@ -4,7 +4,7 @@
- NOGCCERROR= true
- PROG=	mg
- 
--LDADD+=	-lcurses -lutil -lclens
-+LDADD+=	-lcurses -lutil -lclens -lbsd
- DPADD+=	${LIBCURSES} ${LIBUTIL}
- 
- # (Common) compile-time options:
-@@ -17,7 +17,7 @@
+diff -wbBur mg-20140306/Makefile mg-20140306.my/Makefile
+--- mg-20140306/Makefile	2014-02-20 02:30:17.000000000 +0400
++++ mg-20140306.my/Makefile	2014-03-13 13:12:46.628940661 +0400
+@@ -15,6 +15,9 @@
  #
- CFLAGS  = -O2
- CFLAGS += -Wall -DFKEYS -DREGEX -DXKEYS
--CFLAGS += -I/usr/local/include/clens
-+CFLAGS += -I/usr/include/clens -isystem /usr/include/bsd -DLIBBSD_OVERLAY
+ CFLAGS+=-Wall -DFKEYS -DREGEX -DXKEYS
  
++CFLAGS += -I/usr/include/clens -isystem /usr/include/bsd -DLIBBSD_OVERLAY -D__dead -O2
++LDADD+=<------>-lcurses -lutil -lclens -lbsd
++
  SRCS=	autoexec.c basic.c bell.c buffer.c cinfo.c dir.c display.c \
  	echo.c extend.c file.c fileio.c funmap.c help.c kbd.c keymap.c \
+ 	line.c macro.c main.c match.c modes.c paragraph.c random.c \