summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordanw <danw@pkgsrc.org>2003-10-08 03:01:32 +0000
committerdanw <danw@pkgsrc.org>2003-10-08 03:01:32 +0000
commit79fb809cbff4fa4c2b2dc561226e6743ba3d6363 (patch)
tree7b50a59581294e838d07bee3304d096e66a41838
parent93611ee472b230b9aec4ca81b4a5ab13b1b2105f (diff)
downloadpkgsrc-79fb809cbff4fa4c2b2dc561226e6743ba3d6363.tar.gz
Since we're already patching Makefile to not install libdialog.a, patch
it further to not even build it, and just link the objects in directly, to save us from having to drag in libtool so the library gets ranlibbed properly on darwin. PR 20487
-rw-r--r--misc/dialog/distinfo4
-rw-r--r--misc/dialog/patches/patch-aa36
2 files changed, 24 insertions, 16 deletions
diff --git a/misc/dialog/distinfo b/misc/dialog/distinfo
index d85733444fc..6e361607e98 100644
--- a/misc/dialog/distinfo
+++ b/misc/dialog/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.4 2003/09/15 15:02:54 jschauma Exp $
+$NetBSD: distinfo,v 1.5 2003/10/08 03:01:32 danw Exp $
SHA1 (dialog-0.6z.tar.gz) = 3c9483554bbb63bb8838e1f7b31f2600a33198ad
Size (dialog-0.6z.tar.gz) = 50901 bytes
-SHA1 (patch-aa) = 267ffec46c4c7ae070df8eb78ac7db77310a2bad
+SHA1 (patch-aa) = 39dddd7e772d2d0e796ba80eb9309db8b5c679f5
SHA1 (patch-ab) = 39318c50019277ffa1cecdb33f16e16c11ad37af
SHA1 (patch-ac) = 5862dd0163f2979b8071d8dbc6388c466a162042
SHA1 (patch-ad) = 90a88a838923423cfe3bdbfc5d9de6d40bd10cee
diff --git a/misc/dialog/patches/patch-aa b/misc/dialog/patches/patch-aa
index af0ea832a5a..499c091eafc 100644
--- a/misc/dialog/patches/patch-aa
+++ b/misc/dialog/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.8 2001/06/19 15:53:11 jlam Exp $
+$NetBSD: patch-aa,v 1.9 2003/10/08 03:01:32 danw Exp $
--- Makefile.orig Thu Jan 9 01:19:34 1997
-+++ Makefile
-@@ -17,20 +17,20 @@
++++ Makefile Tue Oct 7 22:51:21 2003
+@@ -17,21 +17,19 @@
# can be disabled to make dialog a bit smaller (could be done for more things)
HAVE_GUAGE=true
@@ -25,12 +25,12 @@ $NetBSD: patch-aa,v 1.8 2001/06/19 15:53:11 jlam Exp $
-CFLAGS = $(OPTIM) -DLOCALE -DVERSION=\"0.6z\"
-LDFLAGS = -L .
+-LDLIBS = -ldialog
+CFLAGS += $(OPTIM) -DLOCALE -DVERSION=\"0.6z\"
-+LDFLAGS += -L .
- LDLIBS = -ldialog
OBJS = checklist.o inputbox.o menubox.o msgbox.o \
-@@ -42,7 +42,7 @@
+ textbox.o util.o yesno.o
+@@ -42,7 +40,7 @@
OBJS+=mouse.o
endif
ifeq ($(HAVE_NCURSES), true)
@@ -39,25 +39,33 @@ $NetBSD: patch-aa,v 1.8 2001/06/19 15:53:11 jlam Exp $
LDLIBS+=-lncurses
endif
ifeq ($(HAVE_RC_FILE), true)
-@@ -59,7 +59,7 @@
- all: libdialog.a dialog
+@@ -56,12 +54,9 @@
- libdialog.a: $(OBJS)
+ SRCS = $(OBJS:.o=.c)
+
+-all: libdialog.a dialog
++all: dialog
+
+-libdialog.a: $(OBJS)
- ar rcs libdialog.a $(OBJS)
-+ ar rc libdialog.a $(OBJS)
+-
+-dialog: dialog.o
++dialog: dialog.o $(OBJS)
- dialog: dialog.o
+ clean:
+ rm -f core *.o *~ dialog .depend libdialog.a dialog.1 dialog.in
+@@ -69,8 +64,8 @@
-@@ -70,7 +70,7 @@
include .depend
- install: dialog libdialog.a
+-install: dialog libdialog.a
- install -s dialog $(BINDIR)
++install: dialog
+ ${BSD_INSTALL_PROGRAM} dialog $(BINDIR)
cp dialog.man dialog.1
ifeq ($(HAVE_RC_FILE),false)
mv dialog.1 dialog.in
-@@ -82,7 +82,7 @@
+@@ -82,7 +77,7 @@
endif
mv dialog.1 dialog.in
sed -e "/COMMENTSTART/,/COMMENTEND/d" dialog.in >dialog.1