aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
authordinoex <dinoex@FreeBSD.org>2004-07-19 12:36:14 +0800
committerdinoex <dinoex@FreeBSD.org>2004-07-19 12:36:14 +0800
commit09ffd6639d76903b48ec9776fd80308ff0d6af37 (patch)
tree908f87455ba4654b3662086f94fc337ab7470dbb /security
parent9432869d28784dd665dd8e9263a9dfceb7ac2dc6 (diff)
downloadfreebsd-ports-gnome-09ffd6639d76903b48ec9776fd80308ff0d6af37.tar.gz
freebsd-ports-gnome-09ffd6639d76903b48ec9776fd80308ff0d6af37.tar.zst
freebsd-ports-gnome-09ffd6639d76903b48ec9776fd80308ff0d6af37.zip
- installs pkgconfig data in $(prefix)/libdata
PR: 69150 Submitted by: Konstantin Oznobihin
Diffstat (limited to 'security')
-rw-r--r--security/openssl/Makefile1
-rw-r--r--security/openssl/files/patch-Makefile.org30
-rw-r--r--security/openssl/pkg-plist4
3 files changed, 28 insertions, 7 deletions
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 2eaefd2d5b8c..d12d6ef3bb86 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -11,6 +11,7 @@ PORTVERSION= 0.9.7
PORTREVISION!= date -v-1d +%Y%m%d
.else
PORTVERSION= 0.9.7d
+PORTREVISION= 1
.endif
CATEGORIES= security devel
MASTER_SITES= http://www.openssl.org/%SUBDIR%/ \
diff --git a/security/openssl/files/patch-Makefile.org b/security/openssl/files/patch-Makefile.org
index 5dd4f462d2cc..4cddcac98e37 100644
--- a/security/openssl/files/patch-Makefile.org
+++ b/security/openssl/files/patch-Makefile.org
@@ -1,5 +1,5 @@
---- Makefile.org.orig Tue Apr 8 13:54:32 2003
-+++ Makefile.org Fri Apr 11 20:01:14 2003
+--- Makefile.org.orig Fri Mar 12 22:33:04 2004
++++ Makefile.org Mon Jul 19 06:16:00 2004
@@ -191,7 +191,7 @@
MAKEFILE= Makefile.ssl
MAKE= make -f Makefile.ssl
@@ -8,8 +8,8 @@
+MANDIR=$(MANPREFIX)/man
MAN1=1
MAN3=3
- SHELL=/bin/sh
-@@ -274,6 +274,21 @@
+ MANSUFFIX=
+@@ -275,6 +275,21 @@
build-shared: clean-shared do_$(SHLIB_TARGET) link-shared
@@ -31,7 +31,7 @@
do_bsd-gcc-shared: do_gnu-shared
do_linux-shared: do_gnu-shared
do_gnu-shared:
-@@ -593,7 +608,7 @@
+@@ -596,7 +611,7 @@
@false
libclean:
@@ -40,3 +40,23 @@
clean: libclean
rm -f shlib/*.o *.o core a.out fluff rehash.time testlog make.log cctest cctest.c
+@@ -773,7 +788,7 @@
+ install: all install_docs
+ @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
+- $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
++ $(INSTALL_PREFIX)$(INSTALLTOP)/libdata/pkgconfig \
+ $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
+ $(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
+@@ -833,8 +848,8 @@
+ sed -e '1,/^$$/d' doc/openssl-shared.txt; \
+ fi; \
+ fi
+- cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig
+- chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig/openssl.pc
++ cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/libdata/pkgconfig
++ chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/libdata/pkgconfig/openssl.pc
+
+ install_docs:
+ @$(PERL) $(TOP)/util/mkdir-p.pl \
diff --git a/security/openssl/pkg-plist b/security/openssl/pkg-plist
index 506d08f0650c..05e4b6daaee0 100644
--- a/security/openssl/pkg-plist
+++ b/security/openssl/pkg-plist
@@ -71,7 +71,7 @@ lib/libcrypto.a
lib/libssl.a
%%SHARED%%lib/libssl.so
%%SHARED%%lib/libssl.so.%%SHLIBVER%%
-lib/pkgconfig/openssl.pc
+libdata/pkgconfig/openssl.pc
%%NOBASE%%openssl/misc/CA.pl
%%NOBASE%%openssl/misc/CA.sh
%%NOBASE%%openssl/misc/c_hash
@@ -82,7 +82,7 @@ lib/pkgconfig/openssl.pc
%%NOBASE%%openssl/openssl.cnf.sample
%%PORTDOCS%%%%DOCSDIR%%/openssl.txt
@dirrm include/openssl
-@dirrm lib/pkgconfig
+@dirrm libdata/pkgconfig
%%NOBASE%%@dirrm openssl/certs
%%NOBASE%%@dirrm openssl/lib
%%MANDIR%%@dirrm openssl/man/man1