[BACK]Return to patch-aa CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / lang / siod / patches
File: [cvs.NetBSD.org] / pkgsrc / lang / siod / patches / patch-aa (download)

Revision 1.7, Sat Aug 19 00:25:34 2017 UTC (5 years, 7 months ago) by jlam
Branch: MAIN
CVS Tags: pkgsrc-2022Q4-base, pkgsrc-2022Q4, pkgsrc-2022Q3-base, pkgsrc-2022Q3, pkgsrc-2022Q2-base, pkgsrc-2022Q2, pkgsrc-2022Q1-base, pkgsrc-2022Q1, pkgsrc-2021Q4-base, pkgsrc-2021Q4, pkgsrc-2021Q3-base, pkgsrc-2021Q3, pkgsrc-2021Q2-base, pkgsrc-2021Q2, pkgsrc-2021Q1-base, pkgsrc-2021Q1, pkgsrc-2020Q4-base, pkgsrc-2020Q4, pkgsrc-2020Q3-base, pkgsrc-2020Q3, pkgsrc-2020Q2-base, pkgsrc-2020Q2, pkgsrc-2020Q1-base, pkgsrc-2020Q1, pkgsrc-2019Q4-base, pkgsrc-2019Q4, pkgsrc-2019Q3-base, pkgsrc-2019Q3, pkgsrc-2019Q2-base, pkgsrc-2019Q2, pkgsrc-2019Q1-base, pkgsrc-2019Q1, pkgsrc-2018Q4-base, pkgsrc-2018Q4, pkgsrc-2018Q3-base, pkgsrc-2018Q3, pkgsrc-2018Q2-base, pkgsrc-2018Q2, pkgsrc-2018Q1-base, pkgsrc-2018Q1, pkgsrc-2017Q4-base, pkgsrc-2017Q4, pkgsrc-2017Q3-base, pkgsrc-2017Q3, HEAD
Changes since 1.6: +4 -2 lines 

lang/siod: Install manpages into ${PKGMANDIR}.

Modify project makefile patch to set MANDIR to point to the correct
location for installed manpages under ${PKGMANDIR}.

$NetBSD: patch-aa,v 1.7 2017/08/19 00:25:34 jlam Exp $

NetBSD definition for makefile, and make solaris into SunOS so
that we can use ${OPSYS}.

Add support for ${DESTDIR}.

--- makefile.orig	1998-02-20 15:52:04.000000000 +0300
+++ makefile	2008-08-26 01:43:42.000000000 +0400
@@ -19,10 +19,10 @@
 #
 # 
 MANSEC=1
-MANDIR=$(IROOT)/usr/local/man/man$(MANSEC)
-BINDIR=$(IROOT)/usr/local/bin
-INCDIR=$(IROOT)/usr/local/include
-LIBDIR=$(IROOT)/usr/local/lib
+MANDIR=$(IROOT)${PREFIX}/${PKGMANDIR}/man$(MANSEC)
+BINDIR=$(IROOT)${PREFIX}/bin
+INCDIR=$(IROOT)${PREFIX}/include
+LIBDIR=$(IROOT)${PREFIX}/lib
 LIBSIODDIR=$(LIBDIR)/siod
 CP_F=cp -f
 # -Wmissing-prototypes
@@ -137,10 +137,9 @@
 #       from /usr/lib/libSYBxxx.so -> /sybase/lib/libxxx.so
 #       for each shared library in /sybase/lib.
 
-solaris:
+SunOS:
 	$(MAKE) $(LDLP) \
 	PROGS="siod ndbm.so tar.so parser_pratt.so ss.so regex.so" \
-	CC=gcc \
 	LD=ld \
 	CFLAGS="$(GCCW) $(CDEBUG) -DSUN5 -O2 $(SLD)" \
 	LD_EXE_FLAGS="-R $(LIBDIR) -R $(LIBSIODDIR)" \
@@ -150,6 +149,18 @@
 	SO="so" \
         build_driver
 
+NetBSD FreeBSD DragonFly:
+	$(MAKE) $(LDLP) \
+	PROGS="siod ndbm.so tar.so parser_pratt.so ss.so regex.so" \
+	LD=ld \
+	CFLAGS="$(GCCW) $(CDEBUG) -DSUN5 -O2 $(SLD) -I${INCDIR} -fPIC -DPIC" \
+	LD_EXE_FLAGS="-Wl,-R$(LIBDIR) -L${LIBDIR} -Wl,-R$(LIBSIODDIR) -L${LIBSIODDIR}" \
+	LD_EXE_LIBS="-lm" \
+	LD_LIB_FLAGS="-G" \
+	LD_LIB_LIBS="$(LD_EXE_LIBS) -lm -lcrypt" \
+	SO="so" \
+        build_driver
+
 sybsolaris:
 	$(MAKE) $(LDLP) \
 	PROGS="siod ndbm.so tar.so parser_pratt.so ss.so regex.so\
@@ -419,30 +430,30 @@
 install: $(DISTFILES)
 	@echo "Note: This does not do a build. Only installs what already"
 	@echo "      sits in the directory."
-	-mkdir -p $(MANDIR)
-	-mkdir -p $(BINDIR)
-	-mkdir -p $(LIBDIR)
-	-mkdir -p $(INCDIR)
-	-mkdir -p $(LIBSIODDIR)
+	-mkdir -p $(DESTDIR)$(MANDIR)
+	-mkdir -p $(DESTDIR)$(BINDIR)
+	-mkdir -p $(DESTDIR)$(LIBDIR)
+	-mkdir -p $(DESTDIR)$(INCDIR)
+	-mkdir -p $(DESTDIR)$(LIBSIODDIR)
 	-for X in $(INTO_BINDIR)  ; do \
-	 $(CP_F) $$X $(BINDIR) ;\
+	 $(CP_F) $$X $(DESTDIR)$(BINDIR) ;\
 	done
 	-for X in $(LIBFILES) ; do \
-	 $(CP_F) $$X $(LIBSIODDIR) ;\
+	 $(CP_F) $$X $(DESTDIR)$(LIBSIODDIR) ;\
 	done
 	-for X in $(SOLIBFILES) ; do \
 	  for E in so sl ; do \
-	   $(CP_F) $$X.$$E $(LIBSIODDIR) ;\
+	   $(CP_F) $$X.$$E $(DESTDIR)$(LIBSIODDIR) ;\
 	  done ;\
 	done
 	-for X in $(INTO_LIBDIR) ; do \
-	 $(CP_F) $$X $(LIBDIR) ;\
+	 $(CP_F) $$X $(DESTDIR)$(LIBDIR) ;\
 	done
 	-for X in $(MANPAGES) ; do \
-	 $(CP_F) $$X.man $(MANDIR)/$$X.$(MANSEC) ;\
+	 $(CP_F) $$X.man $(DESTDIR)$(MANDIR)/$$X.$(MANSEC) ;\
 	done
 	-for X in $(PUBINCS) ; do \
-	 $(CP_F) $$X $(INCDIR) ;\
+	 $(CP_F) $$X $(DESTDIR)$(INCDIR) ;\
 	done
 	@echo "Install done."