typo

packages/php7.rb

@@ -2,37 +2,15 @@ require 'package'
 
 class Php7 < Package
   version '7.1.0'
-<<<<<<< HEAD
-  source_url 'http://php.net/distributions/php-7.1.0.tar.xz' # software source tarball url
-  source_sha1 'c74c920256b9c6873bae696fbb0ec14a02dc8495'     # source tarball sha1 sum
-=======
   source_url 'http://php.net/distributions/php-7.1.0.tar.xz'   # software source tarball url
   source_sha1 'c74c920256b9c6873bae696fbb0ec14a02dc8495'       # source tarball sha1 sum
->>>>>>> upstream/master
 
-  depends_on 'curl'
+  depends_on 'pkgconfig'
+  depends_on 'zlibpkg'
   depends_on 'libpng'
   depends_on 'libxml2'
   depends_on 'openssl'
-<<<<<<< HEAD
-  depends_on 'libpng'
-
-  def self.build                                             # self.build contains commands needed to build the software from source
-    system "./configure \
-      --with-curl \
-      --with-gd \
-      --enable-mbstring \
-      --with-ssl=/usr/local/bin/openssl \
-      --with-zlib \
-      --with-pcre-regex \
-      --prefix=/usr/local"
-
-    system 'make'                                            # ordered chronologically
-  end
-
-  def self.install                                           # self.install contains commands needed to install the software on the target system
-    system "make", "DESTDIR=#{CREW_DEST_DIR}", "install"     # remember to include DESTDIR set to CREW_DEST_DIR - needed to keep track of changes made to system
-=======
+  depends_on 'curl'
   depends_on 'pcre'
 
   def self.build                                               # self.build contains commands needed to build the software from source
@@ -54,6 +32,5 @@ class Php7 < Package
     system "mv", "#{CREW_DEST_DIR}/.depdb", "#{CREW_DEST_DIR}/usr/local/lib/php"
     system "mv", "#{CREW_DEST_DIR}/.depdblock", "#{CREW_DEST_DIR}/usr/local/lib/php"
     system "rm", "-rf", "#{CREW_DEST_DIR}/.channels", "#{CREW_DEST_DIR}/.filemap", "#{CREW_DEST_DIR}/.lock", "#{CREW_DEST_DIR}/.registry"
->>>>>>> upstream/master
   end
 end