# HG changeset patch # User Yiteng Zhang # Date 1452029729 28800 # Node ID b457e3bd2acc5037e8a0d4f394e95db92793273c # Parent 97906d9e2ac2784abcbcb199b8410108ad9d91ae 22386518 Move pkgbuild from Desktop consolidation to Userland diff -r 97906d9e2ac2 -r b457e3bd2acc components/pkgbuild/Makefile --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pkgbuild/Makefile Tue Jan 05 13:35:29 2016 -0800 @@ -0,0 +1,64 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +# + +BITS=64 +include ../../make-rules/shared-macros.mk + +COMPONENT_NAME= pkgbuild +COMPONENT_VERSION= 1.3.105 +COMPONENT_SRC= $(COMPONENT_NAME)-$(COMPONENT_VERSION) +COMPONENT_ARCHIVE= $(COMPONENT_SRC).tar.bz2 +COMPONENT_ARCHIVE_HASH= \ + sha256:ed32d913af249d4221c2b94450eb4e996747024260c210620e94ac8130bc0fd6 +COMPONENT_ARCHIVE_URL= http://prdownloads.sourceforge.net/pkgbuild/$(COMPONENT_ARCHIVE) +COMPONENT_PROJECT_URL= http://pkgbuild.sourceforge.net/ +COMPONENT_BUGDB= utility/pkgbuild + +TPNO= 13159 + +include $(WS_MAKE_RULES)/prep.mk +include $(WS_MAKE_RULES)/configure.mk +include $(WS_MAKE_RULES)/ips.mk + +# Required due to patches to configure and/or automake files. +COMPONENT_PREP_ACTION += (cd $(@D); autoreconf -fi;) + +ASLR_MODE = $(ASLR_ENABLE) + +CONFIGURE_ENV += CFLAGS="$(CFLAGS)" + +# common targets +configure: $(CONFIGURE_64) + +build: $(BUILD_64) + +install: $(INSTALL_64) + +test: $(NO_TESTS) + +system-test: $(NO_TESTS) + +REQUIRED_PACKAGES += system/library +REQUIRED_PACKAGES += runtime/perl-512 diff -r 97906d9e2ac2 -r b457e3bd2acc components/pkgbuild/patches/Makefile.am.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pkgbuild/patches/Makefile.am.patch Tue Jan 05 13:35:29 2016 -0800 @@ -0,0 +1,12 @@ +# This patch was taken from the upstream project mailing list and is +# expected to be integrated in a future release. +# http://sourceforge.net/p/pkgbuild/mailman/message/34656716/ + +--- pkgbuild-1.3.105-dist/Makefile.am 2010-10-18 09:33:42.000000000 -0500 ++++ pkgbuild-1.3.105/Makefile.am 2015-11-29 14:31:25.133449611 -0600 +@@ -1,4 +1,5 @@ + AUTOMAKE_OPTIONS = dist-bzip2 ++ACLOCAL_AMFLAGS = -I m4 + + topdir = @TOPDIR@ + diff -r 97906d9e2ac2 -r b457e3bd2acc components/pkgbuild/patches/configure.in.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pkgbuild/patches/configure.in.patch Tue Jan 05 13:35:29 2016 -0800 @@ -0,0 +1,24 @@ +# This patch was taken from the upstream project mailing list and is +# expected to be integrated in a future release. +# http://sourceforge.net/p/pkgbuild/mailman/message/34656716/ + +--- pkgbuild-1.3.105-dist/configure.in 2013-04-03 23:43:19.000000000 -0500 ++++ pkgbuild-1.3.105/configure.in 2015-11-29 14:35:05.914960090 -0600 +@@ -23,7 +23,7 @@ + PATCH_IS_GNU=no + $PATCH --version 2>/dev/null | grep 'Free Software Foundation' > /dev/null \ + && PATCH_IS_GNU=yes +-$PATCH --version 2>/dev/null | head -1 | grep '^patch ' > /dev/null \ ++$PATCH --version 2>/dev/null | head -1 | grep '^.*patch ' > /dev/null \ + || PATCH_IS_GNU=no + AC_MSG_RESULT([$PATCH_IS_GNU]) + if test $PATCH_IS_GNU = no; then +@@ -36,7 +36,7 @@ + SED_IS_GNU=no + $GNU_SED --version 2>/dev/null | grep 'Free Software Foundation' > /dev/null \ + && SED_IS_GNU=yes +-$GNU_SED --version 2>/dev/null | head -1 | grep 'GNU sed ' > /dev/null \ ++$GNU_SED --version 2>/dev/null | head -1 | grep 'GNU sed' > /dev/null \ + || SED_IS_GNU=no + AC_MSG_RESULT([$SED_IS_GNU]) + if test $SED_IS_GNU = no; then diff -r 97906d9e2ac2 -r b457e3bd2acc components/pkgbuild/pkgbuild.p5m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/components/pkgbuild/pkgbuild.p5m Tue Jan 05 13:35:29 2016 -0800 @@ -0,0 +1,72 @@ +# +# CDDL HEADER START +# +# The contents of this file are subject to the terms of the +# Common Development and Distribution License (the "License"). +# You may not use this file except in compliance with the License. +# +# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE +# or http://www.opensolaris.org/os/licensing. +# See the License for the specific language governing permissions +# and limitations under the License. +# +# When distributing Covered Code, include this CDDL HEADER in each +# file and include the License file at usr/src/OPENSOLARIS.LICENSE. +# If applicable, add the following below this CDDL HEADER, with the +# fields enclosed by brackets "[]" replaced with your own identifying +# information: Portions Copyright [yyyy] [name of copyright owner] +# +# CDDL HEADER END +# + +# +# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved. +# + + default mangler.man.stability uncommitted> +set name=pkg.fmri \ + value=pkg:/package/pkgbuild@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION) +set name=pkg.summary \ + value="pkgbuild - rpmbuild-like tool for building Solaris packages" +set name=pkg.description \ + value="pkgbuild(1) is a tool for building Solaris SVr4 or IPS packages from RPM-like spec files. It is intended to be a plug-in replacement of the rpmbuild command. Most spec file elements are implemented plus a few more. The differences from real rpm spec files are summarized in the Manual. It's implemented as a set of perl scripts and modules." +set name=com.oracle.info.description \ + value="A tool for building Solaris SVr4 or IPS packages from RPM-like spec files" +set name=com.oracle.info.tpno value=$(TPNO) +set name=info.classification \ + value=org.opensolaris.category.2008:Development/System +set name=info.source-url value=$(COMPONENT_ARCHIVE_URL) +set name=info.upstream-url value=$(COMPONENT_PROJECT_URL) +set name=org.opensolaris.arc-caseid value=PSARC/2010/138 +set name=org.opensolaris.consolidation value=$(CONSOLIDATION) +file path=usr/bin/pkgbuild +file path=usr/bin/pkgtool +file path=usr/bin/spectool +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/config.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/get_rpm_topdir +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/ips-dependency-generator \ + mode=0555 +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/ips_package.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/ips_utils.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/macros +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/packagebase.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/pkgbuild-postprocess mode=0555 +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/pkgbuild.pl mode=0555 +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/pkgdb.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/pkgdbgrep mode=0555 +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/pkgnames +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/pkgtool.pl mode=0555 +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/rpm_file.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/rpm_package.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/rpm_spec.pm +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/spectool.pl mode=0555 +file path=usr/lib/pkgbuild-$(COMPONENT_VERSION)/version-file +file path=usr/share/man/man1/pkgbuild.1 +file path=usr/share/man/man1/pkgtool.1 +file path=usr/share/man/man1/spectool.1 +file path=usr/share/pkgbuild/spec-files.txt +license COPYING license=GPLv2 + +# force a dependency on the gnu-patch package +depend type=require \ + fmri=text/gnu-patch@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)