head 1.5; access; symbols pkgsrc-2019Q3:1.4.0.20 pkgsrc-2019Q3-base:1.4 pkgsrc-2019Q2:1.4.0.18 pkgsrc-2019Q2-base:1.4 pkgsrc-2019Q1:1.4.0.16 pkgsrc-2019Q1-base:1.4 pkgsrc-2018Q4:1.4.0.14 pkgsrc-2018Q4-base:1.4 pkgsrc-2018Q3:1.4.0.12 pkgsrc-2018Q3-base:1.4 pkgsrc-2018Q2:1.4.0.10 pkgsrc-2018Q2-base:1.4 pkgsrc-2018Q1:1.4.0.8 pkgsrc-2018Q1-base:1.4 pkgsrc-2017Q4:1.4.0.6 pkgsrc-2017Q4-base:1.4 pkgsrc-2017Q3:1.4.0.4 pkgsrc-2017Q3-base:1.4 pkgsrc-2017Q2:1.3.0.50 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.48 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.46 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.44 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.42 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.40 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.38 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.36 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.34 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.32 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.30 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.28 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.26 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.24 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.22 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.20 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.18 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.16 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.14 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.12 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.10 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.8 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.6 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.4 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.3.0.2 pkgsrc-2011Q2-base:1.3 pkgsrc-2011Q1:1.2.0.16 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.14 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.12 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.10 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.8 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.6 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.4 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.2 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.1.0.18 pkgsrc-2009Q1-base:1.1 pkgsrc-2008Q4:1.1.0.16 pkgsrc-2008Q4-base:1.1 pkgsrc-2008Q3:1.1.0.14 pkgsrc-2008Q3-base:1.1 cube-native-xorg:1.1.0.12 cube-native-xorg-base:1.1 pkgsrc-2008Q2:1.1.0.10 pkgsrc-2008Q2-base:1.1 cwrapper:1.1.0.8 pkgsrc-2008Q1:1.1.0.6 pkgsrc-2008Q1-base:1.1 pkgsrc-2007Q4:1.1.0.4 pkgsrc-2007Q4-base:1.1 pkgsrc-2007Q3:1.1.0.2 pkgsrc-2007Q3-base:1.1; locks; strict; comment @# @; 1.5 date 2019.10.10.14.17.50; author wiz; state dead; branches; next 1.4; commitid CxWNJ0lqE3i5pkGB; 1.4 date 2017.09.10.01.59.12; author dholland; state Exp; branches; next 1.3; commitid lp6DlQ6ZO10oKA6A; 1.3 date 2011.04.09.08.58.51; author obache; state Exp; branches; next 1.2; 1.2 date 2009.07.06.22.35.22; author joerg; state Exp; branches; next 1.1; 1.1 date 2007.09.21.13.00.55; author wiz; state Exp; branches; next ; desc @@ 1.5 log @lablgtk1: remove, replaced by ocaml-lablgtk @ text @$NetBSD: patch-aa,v 1.4 2017/09/10 01:59:12 dholland Exp $ - build with PIC - don't link with unix.cma twice; it doesn't work - DESTDIR support --- src/Makefile.orig 2003-05-15 14:17:53.000000000 +0000 +++ src/Makefile @@@@ -38,11 +38,12 @@@@ CFLAGS = -g $(GTKCFLAGS) MLLINK += -cclib -lcamlrund MLFLAGS = -g else -CFLAGS = -O -DGTK_NO_CHECK_CASTS -DGTK_DISABLE_COMPAT_H $(GTKCFLAGS) +CFLAGS = -O -fPIC -DGTK_NO_CHECK_CASTS -DGTK_DISABLE_COMPAT_H $(GTKCFLAGS) endif THFLAGS = -thread -THLINK = unix.cma threads.cma +#THLINK = unix.cma threads.cma $(MLLINK) # duplicates unix.cma and fails +THLINK = unix.cma threads.cma str.cma ifdef USE_CC CCOMPILER = $(CC) -c -I$(LIBDIR) $(CFLAGS) @@@@ -115,7 +116,7 @@@@ lablgtktop: $(MLLIBS) $(INITOBJS) $(TOPLEVEL) -o $@@ $(MLLINK) -I . $(MLLIBS) $(INITOBJS) lablgtktop_t: $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) - $(TOPLEVEL) $(THFLAGS) -o $@@ $(THLINK) $(MLLINK) \ + $(TOPLEVEL) $(THFLAGS) -o $@@ $(THLINK) \ -I . $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) lablgtk: Makefile $(CONFIG) lablgtk.in @@@@ -137,32 +138,39 @@@@ testcc: lablgladecc lablgtktop rm -f testcc.ml install: - if test -d $(INSTALLDIR); then : ; else mkdir -p $(INSTALLDIR); fi - cp $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) $(INSTALLDIR) - cp -p *.mli $(INSTALLDIR) - cp -p $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) $(INSTALLDIR) - cp $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) $(INSTALLDIR) - cp $(CLIBS) $(INSTALLDIR) - cd $(INSTALLDIR) && $(RANLIB) $(CLIBS) - cp lablgtktop varcc $(INSTALLDIR) - if test -f lablgtktop_t; then cp lablgtktop_t $(INSTALLDIR); fi - cp -p *.h $(INSTALLDIR) + if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} ${DESTDIR}${INSTALLDIR}; fi + for F in $(ALLOBJS:.cmo=.cmi) $(THOBJS:.cmo=.cmi) *.mli \ + $(ALLOBJS:.cmo=.ml) $(ALLTHOBJS:.cmo=.ml) \ + $(MLLIBS) $(THOBJS) $(INITOBJS) $(THINITOBJS) $(CLIBS) *.h; \ + do \ + ${BSD_INSTALL_DATA} $$F ${DESTDIR}${INSTALLDIR}; \ + done + ${BSD_INSTALL_SCRIPT} lablgtktop ${DESTDIR}$(INSTALLDIR) + ${BSD_INSTALL_SCRIPT} varcc ${DESTDIR}$(INSTALLDIR) + if test -f lablgtktop_t; then ${BSD_INSTALL_SCRIPT} lablgtktop_t ${DESTDIR}$(INSTALLDIR); fi if test -f lablgtk.cmxa; then $(MAKE) installopt; fi + ${BSD_INSTALL_DATA_DIR} ${DESTDIR}$(DLLDIR) if test -f dlllablgtk.so; then \ - if test -d $(DLLDIR); then : ; else mkdir -p $(DLLDIR); fi; \ - cp $(CLIBS:lib%.a=dll%.so) $(DLLDIR) || \ - echo "Couldn't install dlls in default location"; \ + for F in $(CLIBS:lib%.a=dll%.so); \ + do \ + ${BSD_INSTALL_DATA} $$F ${DESTDIR}$(DLLDIR); \ + done; \ fi - cp lablgtk $(BINDIR) + ${BSD_INSTALL_SCRIPT} lablgtk ${DESTDIR}$(BINDIR) if test -f lablgladecc; then cp lablgladecc $(BINDIR); fi installopt: - cp $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=.a) $(INSTALLDIR) - cd $(INSTALLDIR) && $(RANLIB) $(MLLIBS:.cma=.a) - cp $(ALLOBJS:.cmo=.cmx) $(INSTALLDIR) - cp $(INITOBJS:.cmo=.o) $(INSTALLDIR) + for F in $(MLLIBS:.cma=.cmxa) $(MLLIBS:.cma=.a) \ + $(ALLOBJS:.cmo=.cmx) $(INITOBJS:.cmo=.o); \ + do \ + ${BSD_INSTALL_DATA} $$F ${DESTDIR}$(INSTALLDIR); \ + done if test -f gtkThread.cmx; then \ - cp $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o) $(INSTALLDIR); fi + for F in $(THOBJS:.cmo=.cmx) $(THOBJS:.cmo=.o); \ + do \ + ${BSD_INSTALL_DATA} $$F ${DESTDIR}$(INSTALLDIR); \ + done; \ + fi liblablgtk.a: $(COBJS) $(LIBRARIAN) -o lablgtk $(COBJS) $(GTKLIBS) @ 1.4 log @In ocaml-land, linking with the same library twice causes the roof of the dungeon to fall in. So avoid doing that. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.3 2011/04/09 08:58:51 obache Exp $ @ 1.3 log @Add user-destdir installation support. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.2 2009/07/06 22:35:22 joerg Exp $ d3 5 a7 1 --- src/Makefile.orig 2003-05-15 16:17:53.000000000 +0200 d9 1 a9 1 @@@@ -38,7 +38,7 @@@@ CFLAGS = -g $(GTKCFLAGS) d18 16 a33 1 @@@@ -137,32 +137,39 @@@@ testcc: lablgladecc lablgtktop @ 1.2 log @Not MAKE_JOBS_SAFE. Needs -fPIC. @ text @d1 1 a1 1 $NetBSD$ d28 1 a28 1 + if test -d $(INSTALLDIR); then : ; else ${BSD_INSTALL_DATA_DIR} ${INSTALLDIR}; fi d33 1 a33 1 + ${BSD_INSTALL_DATA} $$F ${INSTALLDIR}; \ d35 3 a37 3 + ${BSD_INSTALL_SCRIPT} lablgtktop $(INSTALLDIR) + ${BSD_INSTALL_SCRIPT} varcc $(INSTALLDIR) + if test -f lablgtktop_t; then ${BSD_INSTALL_SCRIPT} lablgtktop_t $(INSTALLDIR); fi d39 1 a39 1 + ${BSD_INSTALL_DATA_DIR} $(DLLDIR) d46 1 a46 1 + ${BSD_INSTALL_DATA} $$F $(DLLDIR); \ d50 1 a50 1 + ${BSD_INSTALL_SCRIPT} lablgtk $(BINDIR) d61 1 a61 1 + ${BSD_INSTALL_DATA} $$F $(INSTALLDIR); \ d67 1 a67 1 + ${BSD_INSTALL_DATA} $$F $(INSTALLDIR); \ @ 1.1 log @Rename lablgtk to lablgtk1 and lablgtk2 to lablgtk. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.5 2005/06/16 13:09:34 hira Exp $ d5 9 @