diff options
author | wiz <wiz> | 2003-09-22 09:32:20 +0000 |
---|---|---|
committer | wiz <wiz> | 2003-09-22 09:32:20 +0000 |
commit | 87427d1ccec07e330efcf3ed893c3f24a7a4d731 (patch) | |
tree | 766c5a50fe61b94c951b3df3243edd68a725865b /misc | |
parent | 8e85fe4acd30ae1e3099deb243f1411cbda40939 (diff) | |
download | pkgsrc-87427d1ccec07e330efcf3ed893c3f24a7a4d731.tar.gz |
Fix build and install on Solaris. From Jonathan Perkin in PR 22883.
Diffstat (limited to 'misc')
-rw-r--r-- | misc/pdmenu/Makefile | 8 | ||||
-rw-r--r-- | misc/pdmenu/distinfo | 4 | ||||
-rw-r--r-- | misc/pdmenu/patches/patch-aa | 25 |
3 files changed, 20 insertions, 17 deletions
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile index 1c3e20dc686..ac10f623675 100644 --- a/misc/pdmenu/Makefile +++ b/misc/pdmenu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2003/07/17 21:49:45 grant Exp $ +# $NetBSD: Makefile,v 1.15 2003/09/22 09:32:20 wiz Exp $ # DISTNAME= pdmenu_1.2.65 @@ -30,9 +30,9 @@ pre-install: ${INSTALL_DATA_DIR} ${PREFIX}/lib/pdmenu post-install: - ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pdmenu \ - ${PREFIX}/share/examples/pdmenu \ - ${PREFIX}/share/examples/pdmenu/newbie + ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/pdmenu + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pdmenu + ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/pdmenu/newbie cd ${WRKSRC}/doc && ${INSTALL_DATA} ANNOUNCE BUGS TODO \ ${PREFIX}/share/doc/pdmenu cd ${WRKSRC}/examples && ${INSTALL_DATA} README ba.lpd pdmenurc \ diff --git a/misc/pdmenu/distinfo b/misc/pdmenu/distinfo index f0264ad9437..619a13116ac 100644 --- a/misc/pdmenu/distinfo +++ b/misc/pdmenu/distinfo @@ -1,5 +1,5 @@ -$NetBSD: distinfo,v 1.4 2002/01/01 17:36:28 wiz Exp $ +$NetBSD: distinfo,v 1.5 2003/09/22 09:32:20 wiz Exp $ SHA1 (pdmenu_1.2.65.tar.gz) = d25a7cc5f0c316cbfdcd84ec22a1766ee8c50272 Size (pdmenu_1.2.65.tar.gz) = 88453 bytes -SHA1 (patch-aa) = e8d10f390785e1971e13b515e8d71c747353a0cc +SHA1 (patch-aa) = b5d2d0620e466ab2b13a530b0611e15d517b452d diff --git a/misc/pdmenu/patches/patch-aa b/misc/pdmenu/patches/patch-aa index 3d9f943c636..74ac80999f4 100644 --- a/misc/pdmenu/patches/patch-aa +++ b/misc/pdmenu/patches/patch-aa @@ -1,16 +1,19 @@ -$NetBSD: patch-aa,v 1.4 2002/01/01 17:36:29 wiz Exp $ +$NetBSD: patch-aa,v 1.5 2003/09/22 09:32:21 wiz Exp $ ---- autoconf/makeinfo.in.orig Sat Aug 28 05:27:37 1999 -+++ autoconf/makeinfo.in -@@ -33,7 +33,7 @@ +--- autoconf/makeinfo.in.orig Sat Aug 28 04:27:37 1999 ++++ autoconf/makeinfo.in Mon Sep 22 10:14:07 2003 +@@ -16,9 +16,9 @@ + VER = @VER@ + DEFINES = -DETCDIR=\"${SYSCONFDIR}/\" -DVER=\"${VER}\" @DEFS@ \ + $(PROFILE) -D__USE_FIXED_PROTOTYPES__ -D_GNU_SOURCE +-CFLAGS_FOR_GCC = -Wall -fstrict-prototypes ++#CFLAGS_FOR_GCC = -Wall -fstrict-prototypes + CFLAGS = $(DEFINES) @gcc_cflags@ @CFLAGS@ +-LIBS = @LIBS@ $(EFENCE) ++LIBS = @LIBS@ $(EFENCE) @LDFLAGS@ + SRCDIR = src - all: pdmenu - pdmenu: .dep $(OBJFILES) -- ${CC} -o pdmenu $(OBJFILES) $(CFLAGS) $(LIBS) -+ ${CC} -o pdmenu -Wl,-R${LOCALBASE}/lib $(OBJFILES) $(CFLAGS) $(LIBS) - - - depend: .dep + #------------------- end user configurable section ------------------------# @@ -68,11 +68,6 @@ $(INSTALL) -s pdmenu $(INSTALL_PREFIX)/$(BINDIR) $(INSTALL) doc/pdmenu.man $(INSTALL_PREFIX)/$(MANDIR)/man1/pdmenu.1 -m 0644 |