[Midnightbsd-cvs] mports [16574] trunk/security/zebedee: pods
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sat Aug 23 10:21:07 EDT 2014
Revision: 16574
http://svnweb.midnightbsd.org/mports/?rev=16574
Author: laffer1
Date: 2014-08-23 10:21:06 -0400 (Sat, 23 Aug 2014)
Log Message:
-----------
pods
Modified Paths:
--------------
trunk/security/zebedee/Makefile
trunk/security/zebedee/pkg-plist
Added Paths:
-----------
trunk/security/zebedee/files/patch-Makefile
Removed Paths:
-------------
trunk/security/zebedee/files/patch-aa
Modified: trunk/security/zebedee/Makefile
===================================================================
--- trunk/security/zebedee/Makefile 2014-08-23 13:03:21 UTC (rev 16573)
+++ trunk/security/zebedee/Makefile 2014-08-23 14:21:06 UTC (rev 16574)
@@ -7,6 +7,7 @@
MAINTAINER= ports at MidnightBSD.org
COMMENT= Encrypted, secure compressed TCP tunnel
+
LICENSE= agg
USE_OPENSSL= YES
@@ -19,7 +20,7 @@
client2.key clients.id
DOCS= README.txt LICENCE.txt CHANGES.txt zebedee.html ftpgw.tcl.html
-OPTIONS_DEFINE= DOCS
+OPTIONS_DEFINE= DOCS EXAMPLES
.include <bsd.mport.options.mk>
@@ -39,11 +40,9 @@
${INSTALL_DATA} ${WRKSRC}/${e} ${EXAMPLESDIR}
.endfor
-.if ${PORT_OPTIONS:MDOCS}
@${MKDIR} ${DOCSDIR}
.for d in ${DOCS}
${INSTALL_DATA} ${WRKSRC}/${d} ${DOCSDIR}
.endfor
-.endif
.include <bsd.port.mk>
Copied: trunk/security/zebedee/files/patch-Makefile (from rev 16568, trunk/security/zebedee/files/patch-aa)
===================================================================
--- trunk/security/zebedee/files/patch-Makefile (rev 0)
+++ trunk/security/zebedee/files/patch-Makefile 2014-08-23 14:21:06 UTC (rev 16574)
@@ -0,0 +1,87 @@
+--- Makefile.orig Tue Sep 6 07:59:53 2005
++++ Makefile Thu Sep 15 07:34:55 2005
+@@ -5,7 +5,7 @@
+
+ ZBD_VERSION = 2.5.3
+
+-OS =
++OS = freebsd
+
+ ###
+ ### Locations of tools, libraries and installation directories.
+@@ -14,13 +14,11 @@
+
+ # Choose your C compiler
+
+-CC_$(OS) = gcc
+-
+ CC_win32 = gcc -mno-cygwin
+ CC_linux = gcc -pthread
+ CC_linux64 = $(CC_linux) -m64
+ CC_solaris = gcc
+-CC_freebsd = gcc -pthread
++CC_freebsd ?= gcc
+ CC_tru64 = cc
+ CC_irix = cc -n32 -woff 1110
+ CC_hpux = cc -Ae +DAportable
+@@ -31,7 +29,7 @@
+ # Optimise/debug compilation
+
+ #OPTIM = -Wall -g
+-OPTIM = -Wall -O3
++OPTIM = -Wall
+
+ # Location of gmp include and library
+ #
+@@ -46,25 +44,26 @@
+ # BFINC = /usr/include/openssl
+ # BFLIB = -lcrypto
+
+-BFINC = -I../blowfish-0.9.5a
+-BFLIB = ../blowfish-0.9.5a/libblowfish.a
++BFINC = -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl
++BFLIB = $(OPENSSLLIB)/libcrypto.a
+
+ # Location of zlib include and library
+
+-ZINC = -I../zlib-1.2.3
+-ZLIB = ../zlib-1.2.3/libz.a
++ZINC =
++ZLIB = -lz
+
+ # Location of bzlib include and library
+ # Set these empty if you don't want bzib2 support
+
+-BZINC = -I../bzip2-1.0.3
+-BZLIB = ../bzip2-1.0.3/libbz2.a
++BZINC = -I$(LOCALBASE)/include
++BZLIB = -L$(LOCALBASE)/lib -lbz2
+
+ #
+ # Tools needed for Perl "POD"-format documentation conversion.
+ #
+ PERL_$(OS) = perl
+ PERL_win32 = c:/perl/bin/perl # Avoid Cygwin port
++PERL_freebsd = perl
+ PERL = $(PERL_$(OS))
+
+ BAT_win32 = .bat
+@@ -186,7 +185,8 @@
+ #### You REALLY shouldn't have to modify anything beyond here ...
+ ####
+
+-CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
++CFLAGS ?= -03
++CFLAGS += $(PTHREAD_CFLAGS) $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
+
+ LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
+
+@@ -206,7 +206,7 @@
+ @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, linux64, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi
+
+ zebedee$(EXE) : $(OBJS)
+- $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
++ $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) $(PTHREAD_LIBS)
+
+ huge.o : huge.h
+
Deleted: trunk/security/zebedee/files/patch-aa
===================================================================
--- trunk/security/zebedee/files/patch-aa 2014-08-23 13:03:21 UTC (rev 16573)
+++ trunk/security/zebedee/files/patch-aa 2014-08-23 14:21:06 UTC (rev 16574)
@@ -1,87 +0,0 @@
---- Makefile.orig Tue Sep 6 07:59:53 2005
-+++ Makefile Thu Sep 15 07:34:55 2005
-@@ -5,7 +5,7 @@
-
- ZBD_VERSION = 2.5.3
-
--OS =
-+OS = freebsd
-
- ###
- ### Locations of tools, libraries and installation directories.
-@@ -14,13 +14,11 @@
-
- # Choose your C compiler
-
--CC_$(OS) = gcc
--
- CC_win32 = gcc -mno-cygwin
- CC_linux = gcc -pthread
- CC_linux64 = $(CC_linux) -m64
- CC_solaris = gcc
--CC_freebsd = gcc -pthread
-+CC_freebsd ?= gcc
- CC_tru64 = cc
- CC_irix = cc -n32 -woff 1110
- CC_hpux = cc -Ae +DAportable
-@@ -31,7 +29,7 @@
- # Optimise/debug compilation
-
- #OPTIM = -Wall -g
--OPTIM = -Wall -O3
-+OPTIM = -Wall
-
- # Location of gmp include and library
- #
-@@ -46,25 +44,26 @@
- # BFINC = /usr/include/openssl
- # BFLIB = -lcrypto
-
--BFINC = -I../blowfish-0.9.5a
--BFLIB = ../blowfish-0.9.5a/libblowfish.a
-+BFINC = -I$(OPENSSLINC) -I$(OPENSSLINC)/openssl
-+BFLIB = $(OPENSSLLIB)/libcrypto.a
-
- # Location of zlib include and library
-
--ZINC = -I../zlib-1.2.3
--ZLIB = ../zlib-1.2.3/libz.a
-+ZINC =
-+ZLIB = -lz
-
- # Location of bzlib include and library
- # Set these empty if you don't want bzib2 support
-
--BZINC = -I../bzip2-1.0.3
--BZLIB = ../bzip2-1.0.3/libbz2.a
-+BZINC = -I$(LOCALBASE)/include
-+BZLIB = -L$(LOCALBASE)/lib -lbz2
-
- #
- # Tools needed for Perl "POD"-format documentation conversion.
- #
- PERL_$(OS) = perl
- PERL_win32 = c:/perl/bin/perl # Avoid Cygwin port
-+PERL_freebsd = perl
- PERL = $(PERL_$(OS))
-
- BAT_win32 = .bat
-@@ -186,7 +185,8 @@
- #### You REALLY shouldn't have to modify anything beyond here ...
- ####
-
--CFLAGS = $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
-+CFLAGS ?= -03
-+CFLAGS += $(PTHREAD_CFLAGS) $(OPTIM) $(DEFINES) -I. $(GMPINC) $(BFINC) $(ZINC) $(BZINC)
-
- LIBS = $(GMPLIB) $(BFLIB) $(ZLIB) $(BZLIB) $(OSLIBS)
-
-@@ -206,7 +206,7 @@
- @ if test -z "$(OS)"; then echo "Use '$(MAKE) OS=xxx' where xxx is win32, linux, linux64, solaris, freebsd, tru64, irix, hpux, macosx or bsdi"; exit 1; fi
-
- zebedee$(EXE) : $(OBJS)
-- $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS)
-+ $(CC) $(CFLAGS) -o zebedee$(EXE) $(OBJS) $(LIBS) $(PTHREAD_LIBS)
-
- huge.o : huge.h
-
Modified: trunk/security/zebedee/pkg-plist
===================================================================
--- trunk/security/zebedee/pkg-plist 2014-08-23 13:03:21 UTC (rev 16573)
+++ trunk/security/zebedee/pkg-plist 2014-08-23 14:21:06 UTC (rev 16574)
@@ -3,17 +3,17 @@
etc/server.zbd.sample
man/man1/ftpgw.tcl.1.gz
man/man1/zebedee.1.gz
-%%EXAMPLESDIR%%/client1.key
-%%EXAMPLESDIR%%/client2.key
-%%EXAMPLESDIR%%/clients.id
-%%EXAMPLESDIR%%/server.id
-%%EXAMPLESDIR%%/server.key
-%%EXAMPLESDIR%%/vncserver.zbd
-%%EXAMPLESDIR%%/vncviewer.zbd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client1.key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/client2.key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/clients.id
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.id
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/server.key
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncserver.zbd
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/vncviewer.zbd
%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
%%PORTDOCS%%%%DOCSDIR%%/LICENCE.txt
%%PORTDOCS%%%%DOCSDIR%%/README.txt
%%PORTDOCS%%%%DOCSDIR%%/ftpgw.tcl.html
%%PORTDOCS%%%%DOCSDIR%%/zebedee.html
- at dirrm %%EXAMPLESDIR%%
+%%PORTEXAMPLES%%@dirrm %%EXAMPLESDIR%%
%%PORTDOCS%%@dirrm %%DOCSDIR%%
More information about the Midnightbsd-cvs
mailing list