Minix/pkgsrc-ng
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Import of pkgsrc-2016Q3

Browse Source
This commit is contained in:
sambuc
2016-11-18 22:39:22 +01:00
committed by sambuc
parent 9d819b6d54
commit 1242aa1e36
35952 changed files with 949747 additions and 377081 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mail/sympa/patches/patch-aa
+25 -35
View File
@@ -1,18 +1,20 @@
$NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
$NetBSD: patch-aa,v 1.8 2015/09/26 14:56:10 bouyer Exp $
--- Makefile.in.orig 2014-06-06 18:09:50.000000000 +0200
+++ Makefile.in 2014-08-30 20:13:04.000000000 +0200
@@ -643,60 +643,28 @@
--- Makefile.in.orig 2015-09-25 10:55:02.000000000 +0200
+++ Makefile.in 2015-09-25 16:11:44.000000000 +0200
@@ -709,8 +709,6 @@
echo "Creating $(DESTDIR)$$dir"; \
install -d -m 755 $(DESTDIR)$$dir; \
$(INSTALL) -d -m 755 $(DESTDIR)$$dir; \
fi; \
- chown $(USER) $(DESTDIR)$$dir || /bin/true; \
- chgrp $(GROUP) $(DESTDIR)$$dir || /bin/true; \
+ chown $(USER) $(DESTDIR)$$dir || true; \
+ chgrp $(GROUP) $(DESTDIR)$$dir || true; \
done
installconfig: installdir
sympa_wizard.pl.inst: $(top_srcdir)/src/sbin/sympa_wizard.pl.in Makefile
@@ -720,48 +718,17 @@
< $(top_srcdir)/src/sbin/sympa_wizard.pl.in > $@
installconfig: installdir sympa_wizard.pl.inst
- @echo "Installing basic configuration ..."
- export PERL5LIB=$(DESTDIR)$(modulesdir); \
- if [ ! -f $(DESTDIR)$(confdir)/sympa.conf ]; then \
@@ -20,24 +22,15 @@ $NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
- if [ ! -d $(DESTDIR)$(confdir) ]; then \
- $(INSTALL) -d -m 755 $(DESTDIR)$(confdir); \
- fi; \
- $(SED) \
- -e 's|--PERL--|$(PERL)|' \
- -e 's|--modulesdir--|$(top_srcdir)/src/lib|' \
- < $(top_srcdir)/src/sympa_wizard.pl.in > \
- $(top_srcdir)/src/sympa_wizard.pl.install; \
- chmod +x $(top_srcdir)/src/sympa_wizard.pl.install; \
- $(top_srcdir)/src/sympa_wizard.pl.install \
- chown $(USER) $(DESTDIR)$(confdir) || /bin/true; \
- chgrp $(GROUP) $(DESTDIR)$(confdir) || /bin/true; \
- $(PERL) sympa_wizard.pl.inst \
- --create sympa.conf \
- --target $(DESTDIR)$(confdir)/sympa.conf \
- || /bin/true; \
- $(top_srcdir)/src/sympa_wizard.pl.install \
- --create wwsympa.conf \
- --target $(DESTDIR)$(confdir)/wwsympa.conf \
- || /bin/true; \
- rm -f $(top_srcdir)/src/sympa_wizard.pl.install; \
+ if [ ! -d $(DESTDIR)$(prefix)/share/examples/sympa ]; then \
+ $(INSTALL) -d -m 755 $(DESTDIR)$(prefix)/share/examples/sympa; \
fi; \
- chown $(USER) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
- chgrp $(GROUP) $(DESTDIR)$(confdir)/sympa.conf || /bin/true; \
- fi; \
- if [ ! -f $(DESTDIR)$(sysconfdir)/data_structure.version ]; then \
- cd $(DESTDIR)$(sysconfdir); \
- echo "# automatically created file" >> data_structure.version; \
@@ -46,12 +39,12 @@ $NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
- chown $(USER) data_structure.version || /bin/true; \
- chgrp $(GROUP) data_structure.version || /bin/true; \
- fi
- @for dir in create_list_templates families \
- global_task_models list_task_models scenari search_filters \
- mail_tt2 web_tt2; do \
- @for dir in create_list_templates custom_actions custom_conditions \
- data_sources families global_task_models list_task_models \
- mail_tt2 scenari search_filters web_tt2; do \
- if [ ! -d $(DESTDIR)$(sysconfdir)/$$dir ] ; then \
- echo "Creating $(DESTDIR)$(sysconfdir)/$$dir"; \
- install -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
- $(INSTALL) -d -m 755 $(DESTDIR)$(sysconfdir)/$$dir; \
- fi; \
- chown $(USER) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
- chgrp $(GROUP) $(DESTDIR)$(sysconfdir)/$$dir || /bin/true; \
@@ -64,20 +57,17 @@ $NetBSD: patch-aa,v 1.7 2014/08/30 20:26:45 bouyer Exp $
- etc_README > $(DESTDIR)$(sysconfdir)/README; \
- chmod 444 $(DESTDIR)$(sysconfdir)/README; \
- fi
+ if [ ! -d $(DESTDIR)$(prefix)/share/examples/sympa ]; then \
+ $(INSTALL) -d -m 755 $(DESTDIR)$(prefix)/share/examples/sympa; \
+ fi;\
+ env PERL5LIB=$(DESTDIR)$(prefix)/sympa/bin $(DESTDIR)$(sbindir)/sympa_wizard.pl \
+ --create sympa.conf \
+ --target $(DESTDIR)$(prefix)/share/examples/sympa/sympa.conf \
+ || true; \
+ env PERL5LIB=$(DESTDIR)$(prefix)/sympa/bin $(DESTDIR)$(sbindir)/sympa_wizard.pl \
+ --create wwsympa.conf \
+ --target $(DESTDIR)$(prefix)/share/examples/sympa/wwsympa.conf \
+ || true; \
+ || true; \
+ cd $(DESTDIR)$(prefix)/share/examples/sympa; \
+ echo "# automatically created file" >> data_structure.version; \
+ echo "# you should not modify it" >> data_structure.version; \
+ echo $(VERSION) >> data_structure.version; \
+ chown $(USER) data_structure.version || true; \
+ chgrp $(GROUP) data_structure.version || true;
+ echo $(VERSION) >> data_structure.version
nextstep:
@echo ""