cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

do not override SYSCONFDIR; brad@

Browse Source
This commit is contained in:
jakob 2003-01-14 15:06:25 +00:00
parent 4ff98d6e6b
commit 8ee34c2a5d
4 changed files with 55 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
net/ethereal/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.67 2002/12/10 00:13:09 jakob Exp $
# $OpenBSD: Makefile,v 1.68 2003/01/14 15:06:25 jakob Exp $
COMMENT= network protocol analyzer
@ -17,17 +17,17 @@ HOMEPAGE= http://www.ethereal.com/
MAINTAINER= Jakob Schlyter <jakob@openbsd.org>
# GPL
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
SYSCONFDIR= ${PREFIX}/share/ethereal
CONFIGURE_STYLE= gnu
USE_GMAKE= Yes
USE_LIBTOOL= Yes
SUBST_VARS+= VERSION
SEPARATE_BUILD= yes
SEPARATE_BUILD= concurrent
FLAVORS= no_x11 snmp
FLAVOR?=

28
net/ethereal/patches/patch-Makefile_in Normal file
View File

@ -0,0 +1,28 @@
$OpenBSD: patch-Makefile_in,v 1.1 2003/01/14 15:06:25 jakob Exp $
--- Makefile.in.orig Sat Dec 7 22:38:28 2002
+++ Makefile.in Sat Jan 11 19:09:26 2003
@@ -224,7 +224,7 @@ sysconf_DATA = manuf
# Install the Diameter DTD and XML files in the "diameter" subdirectory
# of that directory.
#
-diameterdir = $(sysconfdir)/diameter
+diameterdir = $(prefix)/share/ethereal/diameter
diameter_DATA = dictionary.dtd dictionary.xml mobileipv4.xml \
nasreq.xml sunping.xml
@@ -2348,12 +2348,12 @@ uninstall-diameterDATA:
sysconfDATA_INSTALL = $(INSTALL_DATA)
install-sysconfDATA: $(sysconf_DATA)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(sysconfdir)
+ $(mkinstalldirs) $(DESTDIR)$(prefix)/share/ethereal
@list='$(sysconf_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f="`echo $$p | sed -e 's|^.*/||'`"; \
- echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f"; \
- $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(sysconfdir)/$$f; \
+ echo " $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(prefix)/share/ethereal/$$f"; \
+ $(sysconfDATA_INSTALL) $$d$$p $(DESTDIR)$(prefix)/share/ethereal/$$f; \
done
uninstall-sysconfDATA:

12
net/ethereal/patches/patch-configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-configure,v 1.1 2003/01/14 15:06:25 jakob Exp $
--- configure.orig Sat Jan 11 17:25:07 2003
+++ configure Sat Jan 11 17:25:27 2003
@@ -8242,7 +8242,7 @@ echo "${ECHO_T}no" >&6
fi
# Create DATAFILE_DIR #define for config.h
-DATAFILE_DIR=$sysconfdir
+DATAFILE_DIR=$prefix/share/ethereal
DATAFILE_DIR=`(
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=${prefix}

12
net/ethereal/patches/patch-epan_configure Normal file
View File

@ -0,0 +1,12 @@
$OpenBSD: patch-epan_configure,v 1.1 2003/01/14 15:06:25 jakob Exp $
--- epan/configure.orig Sat Jan 11 18:04:17 2003
+++ epan/configure Sat Jan 11 18:04:28 2003
@@ -7887,7 +7887,7 @@ echo "${ECHO_T}none needed" >&6
fi
# Create DATAFILE_DIR #define for config.h
-DATAFILE_DIR=$sysconfdir
+DATAFILE_DIR=$prefix/share/ethereal
DATAFILE_DIR=`(
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=${prefix}