From 6fd0ab5d0754fba905c246178fbf388ef76b9294 Mon Sep 17 00:00:00 2001 From: pav Date: Thu, 13 Jan 2005 20:54:12 +0000 Subject: - Update to 1.0 PR: ports/76185 Submitted by: Wesley Shields Approved by: Jonatan B (maintained) --- .../libtomcrypt/files/patch-demos-test-makefile | 11 +++++ security/libtomcrypt/files/patch-makefile | 51 +++++++++------------- 2 files changed, 31 insertions(+), 31 deletions(-) create mode 100644 security/libtomcrypt/files/patch-demos-test-makefile (limited to 'security/libtomcrypt/files') diff --git a/security/libtomcrypt/files/patch-demos-test-makefile b/security/libtomcrypt/files/patch-demos-test-makefile new file mode 100644 index 000000000000..a2585b74d9c3 --- /dev/null +++ b/security/libtomcrypt/files/patch-demos-test-makefile @@ -0,0 +1,11 @@ +--- demos/test/makefile.orig Mon Jan 10 16:35:45 2005 ++++ demos/test/makefile Mon Jan 10 16:35:58 2005 +@@ -19,7 +19,7 @@ + #CCMALLOC = -lccmalloc -ldl + + test: $(OBJECTS) +- $(CC) $(CFLAGS) $(OBJECTS) /usr/lib/libtomcrypt.a $(CCMALLOC) -o test ++ $(CC) $(CFLAGS) $(OBJECTS) $(PREFIX)/lib/libtomcrypt.a $(CCMALLOC) -o test + + clean: + rm -rf test *.o *.obj *.exe *~ .libs diff --git a/security/libtomcrypt/files/patch-makefile b/security/libtomcrypt/files/patch-makefile index 4ebf7349518c..a582545b8fb2 100644 --- a/security/libtomcrypt/files/patch-makefile +++ b/security/libtomcrypt/files/patch-makefile @@ -1,40 +1,29 @@ ---- makefile.orig Mon Aug 9 11:52:40 2004 -+++ makefile Mon Aug 9 12:03:56 2004 -@@ -43,10 +43,10 @@ - #LIBPATH-The directory for libtomcrypt to be installed to. +--- makefile.orig Thu Dec 30 19:55:17 2004 ++++ makefile Tue Jan 11 12:10:05 2005 +@@ -50,13 +50,13 @@ #INCPATH-The directory to install the header files for libtomcrypt. #DATAPATH-The directory to install the pdf docs. --DESTDIR= + DESTDIR= -LIBPATH=/usr/lib -INCPATH=/usr/include -DATAPATH=/usr/share/doc/libtomcrypt/pdf -+DESTDIR=$(PREFIX) -+LIBPATH=/lib -+INCPATH=/include -+DATAPATH=/share/doc/libtomcrypt/pdf ++LIBPATH=$(PREFIX)/lib ++INCPATH=$(PREFIX)/include ++DATAPATH=$(PREFIX)/share/doc/libtomcrypt/pdf + + #Who do we install as? + USER=root +-GROUP=root ++GROUP=wheel #List of objects to compile. -@@ -179,13 +179,15 @@ - #This rule installs the library and the header files. This must be run - #as root in order to have a high enough permission to write to the correct - #directories and to set the owner and group to root. --install: library docs -- install -d -g root -o root $(DESTDIR)$(LIBPATH) -- install -d -g root -o root $(DESTDIR)$(INCPATH) -- install -d -g root -o root $(DESTDIR)$(DATAPATH) -- install -g root -o root $(LIBNAME) $(DESTDIR)$(LIBPATH) -- install -g root -o root $(HEADERS) $(DESTDIR)$(INCPATH) -- install -g root -o root doc/crypt.pdf $(DESTDIR)$(DATAPATH) -+install: docs install-nodocs -+ install -d -g wheel -o root $(DESTDIR)$(DATAPATH) -+ install -g wheel -o root doc/crypt.pdf $(DESTDIR)$(DATAPATH) -+ -+install-nodocs: library -+ install -d -g wheel -o root $(DESTDIR)$(LIBPATH) -+ install -d -g wheel -o root $(DESTDIR)$(INCPATH) -+ install -g wheel -o root $(LIBNAME) $(DESTDIR)$(LIBPATH) -+ install -g wheel -o root $(HEADERS) $(DESTDIR)$(INCPATH) +@@ -251,7 +251,7 @@ + latex crypt > /dev/null + makeindex crypt.idx > /dev/null + latex crypt > /dev/null +- dvipdf crypt ++ dvipdft crypt + mv -ivf crypt.pdf doc/crypt.pdf + rm -f $(LEFTOVERS) - #This rule cleans the source tree of all compiled code, not including the pdf - #documentation. -- cgit