Revision: 20241
http://gar.svn.sourceforge.net/gar/?rev=20241&view=rev
Author: dmichelsen
Date: 2013-01-30 19:49:38 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
hylafax/trunk: Intermediate commit
Modified Paths:
--------------
csw/mgar/pkg/hylafax/trunk/Makefile
csw/mgar/pkg/hylafax/trunk/checksums
csw/mgar/pkg/hylafax/trunk/files/config.site.CSW
Added Paths:
-----------
csw/mgar/pkg/hylafax/trunk/files/0001-Use-relative-path.patch
Modified: csw/mgar/pkg/hylafax/trunk/Makefile
===================================================================
--- csw/mgar/pkg/hylafax/trunk/Makefile 2013-01-30 11:57:54 UTC (rev 20240)
+++ csw/mgar/pkg/hylafax/trunk/Makefile 2013-01-30 19:49:38 UTC (rev 20241)
@@ -1,6 +1,6 @@
NAME = hylafax
-VERSION = 5.2.5
-GARTYPE = v1
+VERSION = 5.5.2
+GARTYPE = v2
DESCRIPTION = An enterprise-class system for sending and receiving facsimiles
and alpha-numeric pages
define BLURB
@@ -9,7 +9,7 @@
SF_PROJECT = hylafax
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += $(call admfiles,CSWhylafax,prototype depend postinstall preremove
postremove)
+# DISTFILES += $(call admfiles,CSWhylafax,prototype depend postinstall
preremove postremove)
DISTFILES += config.site.CSW
#DISTFILES += cswhylafax.init cswhylafax.xml svc-cswhylafax
@@ -20,8 +20,10 @@
PATCHFILES = patch-hylafax.diff
-BUILD_DEP_PKGS = CSWoldapdevel
+# PATCHFILES += 0001-Use-relative-path.patch
+BUILD_DEP_PKGS += CSWopenldap-dev
+
#export CC=/opt/SUNWspro/bin/cc
#export CXX=/opt/SUNWspro/bin/CC
#export CFLAGS="-I/opt/csw/include -L/opt/csw/lib -lsocket -lnsl"
@@ -34,30 +36,46 @@
#export LD_LIBRARY_PATH=/opt/csw/lib:/opt/hylafax/lib
#export MANPATH=/usr/share/man:/opt/hylafax/man
-CONFIGURE_ENV = PATH_GSRIP=$(bindir)/gs PS=gs DIR_MAN=$(mandir)
-BUILD_ENV = PATH_GSRIP=$(bindir)/gs PS=gs DIR_MAN=$(mandir)
+#CONFIGURE_ENV = PATH_GSRIP=$(bindir)/gs PS=gs DIR_MAN=$(mandir)
+#BUILD_ENV = PATH_GSRIP=$(bindir)/gs PS=gs DIR_MAN=$(mandir)
-CONFIGURE_ARGS = --nointeractive --with-INSTALLROOT=$(DESTDIR)
+#EXTRA_CONFIGURE_EXPORTS += PATH_GSRIP
+CONFIGURE_ENV_PATH_GSRIP = $(bindir)/gs
+#EXTRA_CONFIGURE_EXPORTS += PS
+CONFIGURE_ENV_PS = gs
+#EXTRA_CONFIGURE_EXPORTS += DIR_MAN
+CONFIGURE_ENV_DIR_MAN = $(mandir)
-# Hylafax doesn't has a testsuite
+#EXTRA_BUILD_EXPORTS += PATH_GSRIP
+BUILD_ENV_PATH_GSRIP = $(bindir)/gs
+#EXTRA_BUILD_EXPORTS += PS
+BUILD_ENV_PS = gs
+#EXTRA_BUILD_EXPORTS += DIR_MAN
+BUILD_ENV_DIR_MAN = $(mandir)
+
+#EXTRA_LINKER_FLAGS += -lsocket -lnsl
+
+CONFIGURE_ARGS += --nointeractive
+#CONFIGURE_ARGS += --with-INSTALLROOT=$(DESTDIR)
+
+# Hylafax doesn't have a testsuite
TEST_SCRIPTS =
-SPKG_CLASSES = none cswinitsmf
-
include gar/category.mk
-CFLAGS := $(CFLAGS) -L$(libdir) -R$(libdir) -lsocket -lnsl
-CXXFLAGS := $(CXXFLAGS) -L$(libdir) -R$(libdir) -lsocket -lnsl
+#CFLAGS := $(CFLAGS) -L$(libdir) -R$(libdir) -lsocket -lnsl
+#CXXFLAGS := $(CXXFLAGS) -L$(libdir) -R$(libdir) -lsocket -lnsl
post-extract:
- @echo " ==> Putting config.site in place"
- @cp $(WORKDIR)/config.site.CSW $(WORKSRC)/config.site
+ #cp $(WORKDIR)/config.site.CSW $(WORKSRC)/config.site
+ cd $(WORKSRC) && perl -npi -e
's{\$$\{DEPTH\}/\$$\{TOPSRCDIR\}}{\$${TOPSRCDIR}}' `find . -type f`
+ banner ex
@$(MAKECOOKIE)
post-install:
@echo " ==> Fixing permissions"
- chown -R uucp:uucp $(addprefix
$(DESTDIR)$(localstatedir)/spool/hylafax/,info log recvq status sendq doneq
docq tmp pollq archive FIFO)
- @echo " ==> Adding RC-Scripts"
+ #chown -R uucp:uucp $(addprefix
$(DESTDIR)$(localstatedir)/spool/hylafax/,info log recvq status sendq doneq
docq tmp pollq archive FIFO)
+ #@echo " ==> Adding RC-Scripts"
#-ginstall $(WORKSRC)/etc/hylafax $(DESTDIR)/etc/init.d/cswhylafax
#-gln -s ../init.d/cswhylafax $(DESTDIR)/etc/rc2.d/S80cswhylafax
#-$(foreach D,rc0.d rc1.d rcS.d,gln -s ../init.d/hylafax
$(DESTDIR)/etc/$D/K20cswhylafax;)
Modified: csw/mgar/pkg/hylafax/trunk/checksums
===================================================================
--- csw/mgar/pkg/hylafax/trunk/checksums 2013-01-30 11:57:54 UTC (rev
20240)
+++ csw/mgar/pkg/hylafax/trunk/checksums 2013-01-30 19:49:38 UTC (rev
20241)
@@ -1,9 +1 @@
-efa68f52bdb3400a5205c78b40febbf5 download/hylafax-5.2.5.tar.gz
-bb5dfc39a59cd7af4aaba9d7e0edf2d7 download/CSWhylafax.gspec
-a4a8709a4e8e78c37cb639e8029bbc92 download/CSWhylafax.prototype
-5e5c2c1671c343d90eae5fec6dbd380c download/CSWhylafax.depend
-1bdafc1257ae4ca41d9a5395a245bc17 download/CSWhylafax.postinstall
-ee279bfdf2c80050ce1f345bf3eca351 download/CSWhylafax.preremove
-4f0cf062d03f78aaa244e914915719d8 download/CSWhylafax.postremove
-cab16587d677bfdc27fbc9d1dd81a94c download/config.site.CSW
-d64caf7a392502ee9cdd4b405432a9fc download/patch-hylafax.diff
+170d32041c44391d6bd5dc44349a8961 hylafax-5.5.2.tar.gz
Added: csw/mgar/pkg/hylafax/trunk/files/0001-Use-relative-path.patch
===================================================================
--- csw/mgar/pkg/hylafax/trunk/files/0001-Use-relative-path.patch
(rev 0)
+++ csw/mgar/pkg/hylafax/trunk/files/0001-Use-relative-path.patch
2013-01-30 19:49:38 UTC (rev 20241)
@@ -0,0 +1,48 @@
+From 50ac9f880f039aabca94ff1172c1c1a17570ba4c Mon Sep 17 00:00:00 2001
+From: Dagobert Michelsen <d...@opencsw.org>
+Date: Wed, 30 Jan 2013 17:03:38 +0100
+Subject: [PATCH] Use relative path
+
+---
+ configure | 2 +-
+ defs.in | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure b/configure
+index 47075a9..091b835 100755
+--- a/configure
++++ b/configure
+@@ -1613,7 +1613,7 @@ if [ "$REGEX" = "auto" ]; then
+ else
+ REGEX=yes
+ LIBREGEX='-L${DEPTH}/regex -lregex'
+- REGEXINC='-I${DEPTH}/${TOPSRCDIR}/regex'
++ REGEXINC='-I${TOPSRCDIR}/regex'
+ Note "... not found. Using built-in regular expression support."
+ fi
+ fi
+diff --git a/defs.in b/defs.in
+index fa22d2e..1bff766 100644
+--- a/defs.in
++++ b/defs.in
+@@ -216,7 +216,7 @@ CINCS = ${VCINCS} ${LCINCS} ${GCINCS}
+ GCOPTS = @GCOPTS@ ${OPTIMIZER} @PROTOTYPES@
+ GCDEFS = @ANSICPP@
+ GCINCS = -I. -I${DEPTH} -I${SRCDIR} \
+- -I${DEPTH}/${TOPSRCDIR}/util ${REGEXINC} ${TIFFINC}
++ -I${TOPSRCDIR}/util ${REGEXINC} ${TIFFINC}
+ #
+ # C++ flags are decomposed using the same hierarchy as C flags.
+ #
+@@ -232,7 +232,7 @@ C++INCS = ${VC++INCS} ${LC++INCS} ${GC++INCS}
+
+ GC++OPTS = @GCXXOPTS@ ${OPTIMIZER}
+ GC++INCS = -I. -I${DEPTH} -I${SRCDIR} \
+- -I${DEPTH}/${TOPSRCDIR}/util ${REGEXINC} ${TIFFINC}
++ -I${TOPSRCDIR}/util ${REGEXINC} ${TIFFINC}
+ GC++DEFS = @ANSICXXPP@
+
+ #
+--
+1.8.1
+
Modified: csw/mgar/pkg/hylafax/trunk/files/config.site.CSW
===================================================================
--- csw/mgar/pkg/hylafax/trunk/files/config.site.CSW 2013-01-30 11:57:54 UTC
(rev 20240)
+++ csw/mgar/pkg/hylafax/trunk/files/config.site.CSW 2013-01-30 19:49:38 UTC
(rev 20241)
@@ -158,9 +158,9 @@
# to link against. If libtiff is installed in a
# non-standard location then setup LIBTIFF accordingly.
#
-LIBTIFF="-L/opt/csw/lib -ltiff" # linkage convention for libtiff
-TIFFINC="/opt/csw/include" # place to find tiffio.h
-TIFFBIN="/opt/csw/bin" # where TIFF tools live
+LIBTIFF="-L/opt/csw/lib -ltiff" # linkage convention for libtiff
+TIFFINC="-I/opt/csw/include" # place to find tiffio.h
+TIFFBIN="/opt/csw/bin" # where TIFF tools live
#
# The source for the ZLIB library is not required
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
