[csw-devel] SF.net SVN: gar:[7687] csw/mgar/pkg/watch/trunk

[skayser at users.sourceforge.net]

Revision: 7687
          http://gar.svn.sourceforge.net/gar/?rev=7687&view=rev
Author:   skayser
Date:     2009-12-20 19:12:17 +0000 (Sun, 20 Dec 2009)

Log Message:
-----------
watch: updated to procps 3.2.8, refactored Makefile, non-ASCII handling still broken

Modified Paths:
--------------
    csw/mgar/pkg/watch/trunk/Makefile
    csw/mgar/pkg/watch/trunk/checksums

Modified: csw/mgar/pkg/watch/trunk/Makefile
===================================================================
--- csw/mgar/pkg/watch/trunk/Makefile	2009-12-20 18:52:04 UTC (rev 7686)
+++ csw/mgar/pkg/watch/trunk/Makefile	2009-12-20 19:12:17 UTC (rev 7687)
@@ -1,3 +1,8 @@
+# TODO
+# - Although watch links against ncursesw, non-ASCII character handling
+#   is broken. German umlauts for example won't display at all. Try: 
+#   python -c 'print u"\u00E4"' vs. watch -d python -c 'print u"\u00E4"'
+#   Needs further investigation.
 GARNAME = watch
 GARVERSION = 0.2.0
 CATEGORIES = utils
@@ -10,7 +15,7 @@
 # Usually we would use $(SF_MIRROR), but the procps folks didn't upload
 # procps the usual way
 SF_PROJ 	= procps
-SF_PROJ_VER	= 3.2.7
+SF_PROJ_VER	= 3.2.8
 MASTER_SITES 	= http://$(SF_PROJ).sourceforge.net/
 DISTFILES  	= $(SF_PROJ)-$(SF_PROJ_VER).tar.gz
 DISTNAME   	= $(SF_PROJ)-$(SF_PROJ_VER)
@@ -30,7 +35,7 @@
 
 CONFIGURE_ARGS = $(DIRPATHS)
 
-EXTRA_INC = /opt/csw/include/ncurses
+EXTRA_INC = /opt/csw/include/ncursesw
 
 include gar/category.mk
 
@@ -43,36 +48,39 @@
 # GNU getopt taken from 
 #   http://svn.cherokee-project.com/browser/cherokee/trunk/cherokee/getopt
 # snprintf.c taken from http://www.jhweiss.de/software/snprintf.html
-#
 
-# Don't tell snprintf.c that you have v?snprintf, output will be garbled 
+pre-build-modulated:
+	rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk
+	cp $(FILEDIR)/snprintf* $(WORKSRC)
+	cp $(FILEDIR)/getopt* $(WORKSRC)
+	cp $(FILEDIR)/gettext.h* $(WORKSRC)
+	@$(MAKECOOKIE)
+
+# Feature flags for snprintf.c. Don't tell it that you have v?snprintf,
+# output will be garbled.
 CFLAGS := $(CFLAGS) -DHAVE_STDARG_H -DHAVE_STDLIB_H -DHAVE_STDDEF
 CFLAGS := $(CFLAGS) -DHAVE_INTTYPES_H -DHAVE_LOCALE_H -DHAVE_LOCALECONV
 CFLAGS := $(CFLAGS) -DHAVE_LOCALECONV -DHAVE_UINTMAX_T -DHAVE_VA_COPY
 
-pre-build-modulated:
-	@rm $(WORKSRC)/ps/module.mk $(WORKSRC)/proc/module.mk
-	@cp $(FILEDIR)/snprintf* $(WORKSRC)
-	@cp $(FILEDIR)/getopt* $(WORKSRC)
-	@cp $(FILEDIR)/gettext.h* $(WORKSRC)
-	$(MAKECOOKIE)
-
+# CURSES and BUILD_ARGS w/ ALL_?FLAGS req. for $(WORKSRC)/Makefile
+build-custom: CURSES=-lncursesw
 build-custom: BUILD_ARGS:=ALL_CFLAGS="$(CFLAGS)" ALL_LDFLAGS="$(LDFLAGS)"
 build-custom:
-	@$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o
-	@$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o
-	@$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o
-	@$(BUILD_ENV) gmake -C $(WORKSRC) \
+	$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) snprintf.o
+	$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt.o
+	$(BUILD_ENV) gmake -C $(WORKSRC) $(BUILD_ARGS) getopt1.o
+	$(BUILD_ENV) gmake -C $(WORKSRC) \
 		ALL_CFLAGS="$(CFLAGS) snprintf.o getopt.o getopt1.o" \
-	        ALL_LDFLAGS="$(LDFLAGS)" watch
-	$(MAKECOOKIE)
+	        ALL_LDFLAGS="$(LDFLAGS)" \
+		CURSES=$(CURSES) watch
+	@$(MAKECOOKIE)
 
 install-custom: DOCDEST=$(DESTDIR)$(docdir)/$(GARNAME)
 install-custom:
-	@ginstall -d $(DESTDIR)$(bindir)
-	@ginstall -d $(DESTDIR)$(mandir)/man1
-	@ginstall -d $(DOCDEST)
-	@ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir)
-	@cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1
-	@cp $(FILEDIR)/changelog.CSW $(DOCDEST)
-	$(MAKECOOKIE)
+	ginstall -d $(DESTDIR)$(bindir)
+	ginstall -d $(DESTDIR)$(mandir)/man1
+	ginstall -d $(DOCDEST)
+	ginstall -m 755 $(WORKSRC)/watch $(DESTDIR)$(bindir)
+	cp $(WORKSRC)/watch.1 $(DESTDIR)$(mandir)/man1
+	cp $(FILEDIR)/changelog.CSW $(DOCDEST)
+	@$(MAKECOOKIE)

Modified: csw/mgar/pkg/watch/trunk/checksums
===================================================================
--- csw/mgar/pkg/watch/trunk/checksums	2009-12-20 18:52:04 UTC (rev 7686)
+++ csw/mgar/pkg/watch/trunk/checksums	2009-12-20 19:12:17 UTC (rev 7687)
@@ -1,3 +1,4 @@
-f490bca772b16472962c7b9f23b1e97d  download/procps-3.2.7.tar.gz
-05f5e9e304c4300b056ffd61eafebffa  download/patch-extralibs.diff
-c29461ef280f8a7dca7ef1d5aeec8e2d  download/patch-sigpipe.diff
+05f5e9e304c4300b056ffd61eafebffa  patch-extralibs.diff
+c29461ef280f8a7dca7ef1d5aeec8e2d  patch-sigpipe.diff
+9532714b6846013ca9898984ba4cd7e0  procps-3.2.8.tar.gz
+b8b8809849fa14e39da359fb2bd2d955  wide-char-fix.patch


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.