[Kolab-devel] CVS Makefiles update (permission to commit)

Stephan Buys s.buys at codefusion.co.za
Tue May 27 14:08:33 CEST 2003


Like this? Will commit if ok.

On Tuesday 27 May 2003 09:16, Martin Konold wrote:
> Am Dienstag, 27. Mai 2003 12:42 schrieb Stephan Buys:
>
> Hi Stephan,
>
> > Please check the changes below and let me know if I can commit?
>
> Please use unified diff in the future.
>
> > In short, this allows the user to specify an environment variable:
> > KOLABPKGDIR which will allow them to use the makefiles without the
> > need to download the files from FTP if they already exist locally.
>
> I like it. Please rename KOLABPKGDIR  to KOLABPKGURI
>
> Regards,
> --- martin
>
> Dipl.-Phys. Martin Konold
>
> e r f r a k o n
> Erlewein, Frank, Konold & Partner - Beratende Ingenieure und Physiker
> Nobelstrasse 15, 70569 Stuttgart, Germany
> fon: 0711 67400963, fax: 0711 67400959
> email: martin.konold at erfrakon.de
>
> _______________________________________________
> Kolab-devel mailing list
> Kolab-devel at intevation.org
> https://kroupware.org/mailman/listinfo/kolab-devel

Index: apache/Makefile
===================================================================
RCS file: /kolabrepository/server/apache/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- apache/Makefile     26 May 2003 21:49:06 -0000      1.4
+++ apache/Makefile     27 May 2003 10:08:35 -0000
@@ -1,5 +1,11 @@
+
+ifeq "x$(KOLABPKGURI)" "x"
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
+endif
+
 all:
-       rpm -ihv ftp://ftp.openpkg.org/current/SRC/apache-1.3.27-20030516.src.rpm --define 'with_mod_ssl yes' --define 'with_mod_dav yes' --define 'with_mod_auth_ldap yes' --define 'with_mod_php_openldap yes' --define 'with_mod_php_imap yes' --define 'with_mod_php yes' --define 'with_mod_php_gettext yes'
+
+       rpm -ihv $(KOLABPKGURI)/apache-1.3.27-20030516.src.rpm --define 'with_mod_ssl yes' --define 'with_mod_dav yes' --define 'with_mod_auth_ldap yes' --define 'with_mod_php_openldap yes' --define 'with_mod_php_imap yes' --define 'with_mod_php yes' --define 'with_mod_php_gettext yes'
        rpm -ba apache.spec

 clean:

Index: db/Makefile
===================================================================
RCS file: /kolabrepository/server/db/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- db/Makefile 18 May 2003 14:24:53 -0000      1.1
+++ db/Makefile 27 May 2003 10:08:35 -0000
@@ -1,6 +1,9 @@
-
+ifeq "x$(KOLABPKGURI)" "x"
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
+endif
+
 all:
-       rpm -i ftp://ftp.openpkg.org/current/SRC/db-4.1.25.1-20030323.src.rpm
+       rpm -i $(KOLABPKGURI)/db-4.1.25.1-20030323.src.rpm
        patch < kolab.patch
        rpm -bb db.spec

Index: imapd/Makefile
===================================================================
RCS file: /kolabrepository/server/imapd/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- imapd/Makefile      22 May 2003 19:30:00 -0000      1.6
+++ imapd/Makefile      27 May 2003 10:08:36 -0000
@@ -1,6 +1,9 @@
-
+ifeq "x$(KOLABPKGURI)" "x"
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
+endif
+
 all:
-       rpm -ihv ftp://ftp.openpkg.org/current/SRC/imapd-2.1.13-20030502.src.rpm
+       rpm -ihv $(KOLABPKGURI)/imapd-2.1.13-20030502.src.rpm
        patch < kolab.patch
        rpm -ba imapd.spec --define 'with_groupfile_hack yes' --define 'with_vhost_hack yes'

Index: openldap/Makefile
===================================================================
RCS file: /kolabrepository/server/openldap/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- openldap/Makefile   22 May 2003 19:28:58 -0000      1.5
+++ openldap/Makefile   27 May 2003 10:08:39 -0000
@@ -1,5 +1,9 @@
+ifeq "x$(KOLABPKGURI)" "x"
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
+endif
+
 all:
-       rpm -ihv ftp://ftp.openpkg.org/current/SRC/openldap-2.1.20-20030520.src.rpm
+       rpm -ihv $(KOLABPKGURI)/openldap-2.1.20-20030520.src.rpm
        rpm -ba openldap.spec --define 'with_sasl no'

 clean:

Index: postfix/Makefile
===================================================================
RCS file: /kolabrepository/server/postfix/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- postfix/Makefile    26 May 2003 21:01:58 -0000      1.5
+++ postfix/Makefile    27 May 2003 10:08:39 -0000
@@ -1,5 +1,9 @@
+ifeq "x$(KOLABPKGURI)" "x"
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
+endif
+
 all:
-       rpm -ihv ftp://ftp.openpkg.org/current/SRC/postfix-2.0.10-20030524.src.rpm
+       rpm -ihv $(KOLABPKGURI)/postfix-2.0.10-20030524.src.rpm
        rpm -ba postfix.spec --define 'with_sasl yes' --define 'with_tls yes' --define 'with_ldap yes'
 clean:
        rm -rf /kolab/RPM/TMP/postfix* etc.tar fsl.postfix pfixtls*.tar.gz pflogsum* postfix-*.patch postfix-*.tar.gz postfix.patch postfix.spec rc.postfix

Index: proftpd/Makefile
===================================================================
RCS file: /kolabrepository/server/proftpd/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- proftpd/Makefile    22 May 2003 19:31:13 -0000      1.5
+++ proftpd/Makefile    27 May 2003 10:08:39 -0000
@@ -1,6 +1,9 @@
+ifeq "x$(KOLABPKGURI)" "x"
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
+endif

 all:
-       rpm -ihv ftp://ftp.openpkg.org/current/SRC/proftpd-1.2.8-20030328.src.rpm
+       rpm -ihv $(KOLABPKGURI)/proftpd-1.2.8-20030328.src.rpm
        patch < kolab.patch
        rpm -ba proftpd.spec --define 'with_ldap yes'

Index: sasl/Makefile
===================================================================
RCS file: /kolabrepository/server/sasl/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- sasl/Makefile       22 May 2003 19:31:34 -0000      1.4
+++ sasl/Makefile       27 May 2003 10:08:39 -0000
@@ -1,5 +1,9 @@
+ifeq "x$(KOLABPKGURI)" "x"
+  KOLABPKGURI = ftp://ftp.openpkg.org/current/SRC
+endif
+
 all:
-       rpm -ihv ftp://ftp.openpkg.org/current/SRC/sasl-2.1.13-20030417.src.rpm
+       rpm -ihv $(KOLABPKGURI)/sasl-2.1.13-20030417.src.rpm
        rpm -ba sasl.spec --define 'with_ldap yes'

 clean:




More information about the devel mailing list