[csw-devel] SF.net SVN: gar:[11488] csw/mgar/pkg/proftpd/trunk/Makefile

[aigoshin at users.sourceforge.net]

Revision: 11488
          http://gar.svn.sourceforge.net/gar/?rev=11488&view=rev
Author:   aigoshin
Date:     2010-11-03 16:18:46 +0000 (Wed, 03 Nov 2010)

Log Message:
-----------
proftpd: release 20101102

Modified Paths:
--------------
    csw/mgar/pkg/proftpd/trunk/Makefile

Modified: csw/mgar/pkg/proftpd/trunk/Makefile
===================================================================
--- csw/mgar/pkg/proftpd/trunk/Makefile	2010-11-03 11:13:17 UTC (rev 11487)
+++ csw/mgar/pkg/proftpd/trunk/Makefile	2010-11-03 16:18:46 UTC (rev 11488)
@@ -2,8 +2,6 @@
 GARVERSION = 1.3.3c
 CATEGORIES = server
 
-GARCOMPILER = GCC3
-
 DESCRIPTION = Advanced, incredibly configurable and secure FTP daemon
 define BLURB
   ProFTPD is a proven, high-performance, scalable FTP server written from
@@ -23,24 +21,17 @@
 # We define upstream file regex so we can be notifed of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWgcc3corert CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt
+RUNTIME_DEP_PKGS = CSWosslrt CSWggettextrt CSWiconv CSWoldaprt CSWzlib CSWmysql5rt CSWsqlite3rt
 
-EXTRA_BUILD_ISAS_i386  = pentium_pro
+EXTRA_BUILD_ISAS_i386  = amd64
 EXTRA_BUILD_ISAS_sparc = sparcv9
 
 ISAEXEC_DIRS           = $(bindir) $(sbindir)
 ISAEXEC_EXCLUDE_FILES  = $(bindir)/ftpasswd $(bindir)/ftpmail $(bindir)/ftpquota $(bindir)/prxs
 
-PR_LIBEXEC_sparcv8    = $(prefix)/lib/proftpd
-PR_LIBEXEC_i386       = $(prefix)/lib/proftpd
-PR_LIBEXEC_$(ISA)    ?= $(prefix)/lib/$(ISA)/proftpd
-PR_LIBEXEC            = $(PR_LIBEXEC_$(ISA))
+EXTRA_MERGE_EXCLUDE_FILES_isa-amd64   = $(prefix)/bin/amd64/ftpasswd $(prefix)/bin/amd64/ftpmail $(prefix)/bin/amd64/ftpquota $(prefix)/bin/amd64/prxs
+EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9 = $(prefix)/bin/sparcv9/ftpasswd $(prefix)/bin/sparcv9/ftpmail $(prefix)/bin/sparcv9/ftpquota $(prefix)/bin/sparcv9/prxs
 
-EXTRA_MERGE_EXCLUDE_FILES_isa-pentium_pro = $(prefix)/lib/pentium_pro $(prefix)/lib/pentium_pro/.* $(prefix)/lib/pkgconfig.*
-EXTRA_MERGE_EXCLUDE_FILES_isa-sparcv9     = $(prefix)/lib/sparcv9 $(prefix)/lib/sparcv9/.*
-EXTRA_MERGE_SCRIPTS_isa-pentium_pro = copy-proftpd-lib
-EXTRA_MERGE_SCRIPTS_isa-sparcv9     = copy-proftpd-lib
-
 sysconfdir      = /etc/opt/csw
 localstatedir   = /var/opt/csw
 
@@ -48,11 +39,12 @@
 
 CONFIGURE_ENV   = install_user=$(USER) install_group=csw
 CONFIGURE_ENV  += CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ENV  += LD_LIBRARY_PATH="$(libdir)"
 EXTRA_LIB       = $(prefix)/mysql5/lib/mysql
 
 NODIRPATHS      = --localstatedir --libexecdir
 CONFIGURE_ARGS += $(DIRPATHS)
-CONFIGURE_ARGS += --libexecdir=$(PR_LIBEXEC)
+CONFIGURE_ARGS += --libexecdir=$(libdir)/proftpd
 CONFIGURE_ARGS += --localstatedir=/var/run/proftpd
 CONFIGURE_ARGS += --enable-dso --disable-static
 CONFIGURE_ARGS += --enable-facl
@@ -89,14 +81,5 @@
 	cp $(WORKDIR)/cswproftpd $(DESTDIR)$(sysconfdir)/init.d/
 	cd $(WORKSRC); cp -r $(PROFTPDDOC) $(DESTDIR)$(prefix)/share/doc/proftpd
 	cd $(WORKSRC)/contrib ; cp $(CONTRIBUTILS) $(DESTDIR)$(bindir)
-	rm -f $(DESTDIR)$(libexecdir_install)/*.la
-	rm -f $(DESTDIR)$(libexecdir_install)/$(ISA)/*.la
+	rm -f $(DESTDIR)$(PR_LIBEXEC)/*.la
 	$(MAKECOOKIE)
-
-merge-copy-proftpd-lib:
-	$(_DBG_MERGE)(cd $(INSTALLISADIR); umask 022 && pax -r -w -v \
-		$(foreach DIR,$(PR_LIBEXEC_$(ISA)),-s ",^\.\($(DIR)/\),\1,p") -s ",.*,," \
-		. $(PKGROOT) \
-		)
-	@$(MAKECOOKIE)
-


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.