diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | INSTALL | 2 | ||||
| -rw-r--r-- | Makefile.am | 19 | ||||
| -rw-r--r-- | configure.ac | 16 | ||||
| -rw-r--r-- | packaging/Makefile.am | 2 | ||||
| -rw-r--r-- | packaging/svr4/Makefile.am | 8 | ||||
| -rwxr-xr-x | packaging/svr4/checkinstall.in | 43 | ||||
| -rwxr-xr-x | packaging/svr4/mkpkg | 90 | ||||
| -rw-r--r-- | packaging/svr4/pkginfo.in | 13 |
9 files changed, 2 insertions, 193 deletions
diff --git a/.gitignore b/.gitignore index 7e9b1b75f8..2d2b6e4d29 100644 --- a/.gitignore +++ b/.gitignore @@ -265,6 +265,4 @@ packaging/nsis/qt-dll-manifest.nsh packaging/portableapps/Files/ packaging/portableapps/appinfo.ini packaging/rpm/SPECS/wireshark.spec -packaging/svr4/checkinstall -packaging/svr4/pkginfo vgcore.* @@ -219,8 +219,6 @@ README.windows for those instructions. run one of make rpm-package # Builds a binary package using rpm - make svr4-package # Builds a binary package using pkgmk - make solaris-package # Same as "make svr4-package" make osx-package # Builds a binary package for OSX to make an installable package for your system. diff --git a/Makefile.am b/Makefile.am index 6463b2d8f9..c8cf6c5d54 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1061,7 +1061,7 @@ update-databases-and-caches-install: update-databases-and-caches-common update-databases-and-caches-uninstall: update-databases-and-caches-common -# Used by svr4-package and osx-package +# Used by osx-package # We load top_stagedir with an absolute path so that libtool doesn't freak. top_stagedir=$(abs_top_builddir)/packaging/staging stagedir=$(top_stagedir)/$(PACKAGE).inst @@ -1069,23 +1069,6 @@ stagedir=$(top_stagedir)/$(PACKAGE).inst host_cpu=@host_cpu@ host_os=@host_os@ -solaris-package: svr4-package - -svr4-package: $(PROGRAMS) $(SCRIPTS) $(MANS) $(DATA) - @if test x$(HAVE_SVR4_PACKAGING) = xyes ; then \ - rm -rf $(stagedir) ; \ - $(MAKE) DESTDIR=$(stagedir) install; \ - $(srcdir)/packaging/svr4/mkpkg \ - $(PACKAGE) \ - $(PACKAGE)-$(VERSION)-$(host_os)-$(host_cpu)-local \ - $(prefix) \ - $(top_stagedir) ; \ - else \ - echo "Error: SVR4 packaging tools not found." ; \ - echo "Package build abandoned." ; \ - fi - - rpm_topdir=`cd $(top_builddir) && pwd`/packaging/rpm if HAVE_RPM rpm-package: dist diff --git a/configure.ac b/configure.ac index bbddf81388..f71c7c7ed6 100644 --- a/configure.ac +++ b/configure.ac @@ -464,19 +464,6 @@ AC_SUBST(A2X_LYNX) # AC_PATH_PROG(DESKTOP_FILE_INSTALL, desktop-file-install) -# SVR4/Solaris -AC_CHECK_PROG(HAVE_PKGPROTO, pkgproto, "yes", "no") -AC_CHECK_PROG(HAVE_PKGMK, pkgmk, "yes", "no") -AC_CHECK_PROG(HAVE_PKGTRANS, pkgtrans, "yes", "no") - -if test x$HAVE_PKGPROTO = xyes -a x$HAVE_PKGMK = xyes \ - -a x$HAVE_PKGTRANS = xyes ; then - HAVE_SVR4_PACKAGING=yes -else - HAVE_SVR4_PACKAGING=no -fi -AC_SUBST(HAVE_SVR4_PACKAGING) - # RPM # # Looks for the rpmbuild program, and checks to see if we can redefine "_topdir". @@ -3021,9 +3008,6 @@ AC_CONFIG_FILES( packaging/rpm/Makefile packaging/rpm/SPECS/Makefile packaging/rpm/SPECS/wireshark.spec - packaging/svr4/Makefile - packaging/svr4/checkinstall - packaging/svr4/pkginfo packaging/wix/Makefile plugins/Makefile plugins/docsis/Makefile diff --git a/packaging/Makefile.am b/packaging/Makefile.am index 7a888a7e85..4b6367eec8 100644 --- a/packaging/Makefile.am +++ b/packaging/Makefile.am @@ -1,5 +1,5 @@ # -SUBDIRS = macosx rpm svr4 nsis wix +SUBDIRS = macosx rpm nsis wix MAINTAINERCLEANFILES = \ Makefile.in diff --git a/packaging/svr4/Makefile.am b/packaging/svr4/Makefile.am deleted file mode 100644 index 83538f1dce..0000000000 --- a/packaging/svr4/Makefile.am +++ /dev/null @@ -1,8 +0,0 @@ -# -DISTCLEANFILES = \ - Prototype - -MAINTAINERCLEANFILES = \ - Makefile.in - -EXTRA_DIST = checkinstall.in mkpkg pkginfo.in diff --git a/packaging/svr4/checkinstall.in b/packaging/svr4/checkinstall.in deleted file mode 100755 index 8cd0de78ba..0000000000 --- a/packaging/svr4/checkinstall.in +++ /dev/null @@ -1,43 +0,0 @@ -#!/bin/sh -# @configure_input@ -# -# Checkinstall - perform preinstallation install checks. -# -# This is a modified version of a script written by mark@metalab.unc.edu . -# The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html . -# - -PKG_CONFIG=@PKG_CONFIG@ - -gtk_version_needed="2.0" -expected_platform="@host_cpu@" - -platform=`uname -p` - -if [ ${platform} != ${expected_platform} ] -then - echo "\n\n\n\tThis package must be installed on a ${expected_platform} architecture\n" - echo "\tAborting installation.\n\n\n" - exit 1 -fi - -if [ ! -x "$PKG_CONFIG" ] -then - # We couldn't find GTK in the location that was used to build - # Wireshark. - # Punt! - # If gtk-config is in the $PATH then wireshark should install fine. - # Some modifications to $LD_LIBRARY_PATH (or non Solaris equivalent) - # may be required by the user. Should there be a warning here? - PKG_CONFIG=pkg-config -fi - -$PKG_CONFIG gtk+-2.0 --atleast-version=$gtk_version_needed -if [ $? != 0 ] -then - echo "\n\n\n\tThis package requires gtk+-2 version >= $gtk_version_needed installed in `dirname @PKG_CONFIG@`." - echo "\tAborting installation.\n\n\n" - exit 1 -fi - -exit 0 diff --git a/packaging/svr4/mkpkg b/packaging/svr4/mkpkg deleted file mode 100755 index ceb762a6d7..0000000000 --- a/packaging/svr4/mkpkg +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -# mkpkg - Builds a pkgadd-installable package from a listing of the contents in -# a staging directory. -# -# This is a modified version of a script written by mark@metalab.unc.edu . -# The original is at http://metalab.unc.edu/pub/packages/solaris/sparc/html/creating.solaris.packages.html . -# -if [ "$1" != "" ] ; then - pkg=$1 -else - echo "Usage: " `basename $0` " <package name> [output file]" - exit 1 -fi - -if [ "$2" != "" ] ; then - pkgfile=$2 -else - pkgfile=$pkg -fi - -if [ "$3" != "" ] ; then - prefix=$3 -else - prefix=/usr/local -fi - -if [ "$4" != "" ] ; then - srcdir=$4 -else - srcdir=`basename $0`/../.. -fi - -# Initialize our variables -prepdir=`dirname $0` -prototype="$prepdir/Prototype" -stagedir=$srcdir/${pkg}.inst - -# Create the Prototype file -cat > $prototype <<Fin -i pkginfo -i checkinstall -Fin -if [ ! -d $stagedir ] ; then - echo "Whoops! Staging directory $stagedir doesn't exist. Bailing." - exit 1 -fi - -find $stagedir/$prefix/* -print | \ - pkgproto $stagedir/$prefix=$prefix | \ - # Mimic file permissions under /usr - awk ' \ - /bin/ { print $1, $2, $3, $4, "root bin"; next }; \ - /lib/ { print $1, $2, $3, $4, "root bin"; next }; \ - /man/ { print $1, $2, $3, $4, "root bin"; next }; \ - { print $1, $2, $3, $4, "root sys" } \ - ' \ - >> $prototype - -# Make the package installation directory -pkgmk -o -r / -d /$srcdir -f $prototype -echo "Setting file permissions in $stagedir tree to 644." -find $stagedir -type f -print | xargs chmod a+r -find $stagedir -type f -print | xargs chmod u+w -echo "Setting directory permissions in $stagedir tree to 755." -find $stagedir -type d -print | xargs chmod 755 -if [ -f $stagedir/install/preinstall ]; then - chmod 755 $stagedir/install/preinstall -fi -if [ -f $stagedir/install/postinstall ]; then - chmod 755 $stagedir/install/postinstall -fi -if [ -f $stagedir/install/preremove ]; then - chmod 755 $stagedir/install/preremove -fi -if [ -f $stagedir/install/postremove ]; then - chmod 755 $stagedir/install/postremove -fi -if [ -f $stagedir/install/request ]; then - chmod 755 $stagedir/install/request -fi -if [ -f $stagedir/install/checkinstall ]; then - chmod 755 $stagedir/install/checkinstall -fi - -# Spool the install directory into its own self-contained file. -pkgtrans -s $srcdir $pkgfile $pkg - -# echo "Compressing package file" -# gzip -9 $srcdir/$pkgfile diff --git a/packaging/svr4/pkginfo.in b/packaging/svr4/pkginfo.in deleted file mode 100644 index 0c3edf2eee..0000000000 --- a/packaging/svr4/pkginfo.in +++ /dev/null @@ -1,13 +0,0 @@ -# @configure_input@ -PKG="@PACKAGE@" -NAME="@PACKAGE@ @VERSION@" -VERSION="@VERSION@" -ARCH="@host_cpu@" -CLASSES="none" -CATEGORY="application,network" -DESC="A GUI network protocol analyzer" -VENDOR="Wireshark Development Team" -EMAIL="gerald@wireshark.org" -ISTATES="S s 1 2 3" -RSTATES="S s 1 2 3" -BASEDIR="" |