diff options
| author | jperkin <jperkin@pkgsrc.org> | 2016-04-01 16:11:23 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2016-04-01 16:11:23 +0000 |
| commit | faafe5ca658556187fdc8110b834d6df290c6e38 (patch) | |
| tree | ca31ad071a4f6d2edd67de55761dc6e8d3a0b1a6 /wm | |
| parent | 42988992439dc224397bda51917d397a09fb191e (diff) | |
| download | pkgsrc-faafe5ca658556187fdc8110b834d6df290c6e38.tar.gz | |
Use PKGMANDIR. Add patch comment.
Diffstat (limited to 'wm')
| -rw-r--r-- | wm/windowlab/distinfo | 4 | ||||
| -rw-r--r-- | wm/windowlab/patches/patch-aa | 17 |
2 files changed, 12 insertions, 9 deletions
diff --git a/wm/windowlab/distinfo b/wm/windowlab/distinfo index aecfec7a0f4..22e018e2179 100644 --- a/wm/windowlab/distinfo +++ b/wm/windowlab/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.7 2013/11/24 03:06:15 dholland Exp $ +$NetBSD: distinfo,v 1.8 2016/04/01 16:11:23 jperkin Exp $ SHA1 (windowlab-1.33nb7/windowlab-1.33.tar) = 7c01142056b24e959e0cd58d4e20075dbb0ffad0 RMD160 (windowlab-1.33nb7/windowlab-1.33.tar) = d816a95e3d666d5747d000c1151a6e514cdc86d7 Size (windowlab-1.33nb7/windowlab-1.33.tar) = 163840 bytes -SHA1 (patch-aa) = 028b6297d880e293845e01a20ee58d6a4db808f1 +SHA1 (patch-aa) = e7e3e2a9bf4df68474154a5787fe8994e5168db7 SHA1 (patch-ab) = 813c719455a8f670457b1a6107b2bec505d1707b diff --git a/wm/windowlab/patches/patch-aa b/wm/windowlab/patches/patch-aa index 62a4d67b3ec..d421ffb1ee3 100644 --- a/wm/windowlab/patches/patch-aa +++ b/wm/windowlab/patches/patch-aa @@ -1,8 +1,10 @@ -$NetBSD: patch-aa,v 1.2 2005/09/04 06:05:20 xtraeme Exp $ +$NetBSD: patch-aa,v 1.3 2016/04/01 16:11:23 jperkin Exp $ ---- Makefile.orig 2005-09-04 07:44:29.000000000 +0200 -+++ Makefile 2005-09-04 07:47:12.000000000 +0200 -@@ -6,7 +6,7 @@ +Use pkgsrc layout. + +--- Makefile.orig 2005-07-18 21:50:42.000000000 +0000 ++++ Makefile +@@ -6,7 +6,7 @@ EXTRA_LIBS += -lXext # Information about the location of the menurc file ifndef MENURC @@ -11,7 +13,7 @@ $NetBSD: patch-aa,v 1.2 2005/09/04 06:05:20 xtraeme Exp $ endif DEFINES += -DDEF_MENURC="\"$(MENURC)\"" -@@ -15,28 +15,28 @@ +@@ -15,28 +15,28 @@ DEFINES += -DDEF_MENURC="\"$(MENURC)\"" # Uncomment to add freetype support (requires XFree86 4.0.2 or later) # This needs -lXext above, even if you have disabled shape support @@ -38,8 +40,9 @@ $NetBSD: patch-aa,v 1.2 2005/09/04 06:05:20 xtraeme Exp $ endif BINDIR = $(DESTDIR)$(XROOT)/bin - MANDIR = $(DESTDIR)$(XROOT)/man/man1 +-MANDIR = $(DESTDIR)$(XROOT)/man/man1 -CFGDIR = $(DESTDIR)/etc/X11/windowlab ++MANDIR = $(DESTDIR)$(XROOT)/${PKGMANDIR}/man1 +#CFGDIR = $(DESTDIR)/etc/X11/windowlab INCLUDES = -I$(XROOT)/include $(EXTRA_INC) -LDPATH = -L$(XROOT)/lib @@ -47,7 +50,7 @@ $NetBSD: patch-aa,v 1.2 2005/09/04 06:05:20 xtraeme Exp $ LIBS = -lX11 $(EXTRA_LIBS) PROG = windowlab -@@ -53,9 +53,10 @@ +@@ -53,9 +53,10 @@ $(OBJS): %.o: %.c $(HEADERS) $(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c $< -o $@ install: all |