Bug 147199 - [patch] port net-mgmt/pnp fix php5.3 issues
Summary: [patch] port net-mgmt/pnp fix php5.3 issues
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: Greg Larkin
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-05-29 23:40 UTC by Olli Hauer
Modified: 2010-07-23 22:00 UTC (History)
1 user (show)

See Also:


Attachments
patch_pnp.txt (18.23 KB, text/plain)
2010-05-29 23:40 UTC, Olli Hauer
no flags Details

Note You need to log in before you can comment on or make changes to this bug.
Description Olli Hauer 2010-05-29 23:40:01 UTC
replace ereg with preg_match

fix php5.3 error
 - PHP Deprecated:  Assigning the return value of new by reference is deprecated

patch files generated with command 'make makepatch' see
 http://wiki.freebsd.org/PortsLongtermTargets
 section 'Not using :: in patchfile name'

add 'LICENSE= GPLv2' to Makefile
(not sure about the right place, portlint does not know this option)

add USE_DOS2UNIX to Makefile

add .include <bsd.port.options.mk> to Makefile since the extra patch
was always applied.
Comment 1 Edwin Groothuis freebsd_committer freebsd_triage 2010-05-29 23:40:10 UTC
Maintainer of net-mgmt/pnp,

Please note that PR ports/147199 has just been submitted.

If it contains a patch for an upgrade, an enhancement or a bug fix
you agree on, reply to this email stating that you approve the patch
and a committer will take care of it.

The full text of the PR can be found at:
    http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/147199

-- 
Edwin Groothuis via the GNATS Auto Assign Tool
edwin@FreeBSD.org
Comment 2 Edwin Groothuis freebsd_committer freebsd_triage 2010-05-29 23:40:12 UTC
State Changed
From-To: open->feedback

Awaiting maintainers feedback (via the GNATS Auto Assign Tool)
Comment 3 Olli Hauer 2010-05-29 23:58:50 UTC
Sorry, I forgot one part.
Please apply this patch after the first one


--- patch_pnp__Makefile.txt begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 2)
+++ Makefile	(working copy)
@@ -71,7 +71,12 @@
 # All files in share/pnp/include/ are installed, so if we patched something
 # in that directory, we must clean the '.orig' files -- they shouldn't be
 # installed.
-PNP_CLEAN_PATCHED=	share/pnp/include/function.inc.php.orig
+PNP_CLEAN_PATCHED=	share/pnp/include/font/makefont/makefont.php.orig \
+	share/pnp/include/fpdi.php.orig \
+	share/pnp/include/fpdi_pdf_parser.php.orig \
+	share/pnp/include/function.inc.php.orig \
+	share/pnp/include/pdf_parser.php.orig \
+	share/pnp/include/site.php.orig
 
 .if defined(WITH_PDF)
 PNP_USE_FPDF=	1
--- patch_pnp__Makefile.txt ends here ---
Comment 4 Greg Larkin freebsd_committer freebsd_triage 2010-07-22 17:55:31 UTC
Responsible Changed
From-To: freebsd-ports-bugs->glarkin-ports-bugs

I'll take it.
Comment 5 Greg Larkin freebsd_committer freebsd_triage 2010-07-22 18:04:47 UTC
Responsible Changed
From-To: glarkin-ports-bugs->glarkin

Fixed responsible name
Comment 6 Greg Larkin freebsd_committer freebsd_triage 2010-07-23 21:59:14 UTC
State Changed
From-To: feedback->closed

Committed, thank you!
Comment 7 dfilter service freebsd_committer freebsd_triage 2010-07-23 21:59:18 UTC
glarkin     2010-07-23 20:59:08 UTC

  FreeBSD ports repository

  Modified files:
    net-mgmt/pnp         Makefile 
  Added files:
    net-mgmt/pnp/files   
                         extra-patch-share__pnp__include__function.inc.php 
                         patch-man__Makefile.in 
                         patch-sample-config__Makefile.in 
                         patch-scripts__Makefile.in 
                         patch-share__pnp__include__font__makefont__makefont.php 
                         patch-share__pnp__include__fpdi.php 
                         patch-share__pnp__include__fpdi_pdf_parser.php 
                         patch-share__pnp__include__function.inc.php 
                         patch-share__pnp__include__pdf_parser.php 
                         patch-share__pnp__include__site.php 
                         patch-src__Makefile.in 
  Removed files:
    net-mgmt/pnp/files   
                         extra-patch-share::pnp::include::function.inc.php 
                         patch-man::Makefile.in 
                         patch-sample-config::Makefile.in 
                         patch-scripts::Makefile.in 
                         patch-src::Makefile.in 
  Log:
  - Patch code emitting warnings after PHP 5.3.x upgrade
  - Regenerated patch files with "make makepatch"
  - Added GPLv2 license
  - Bumped PORTREVISION
  
  PR:             ports/147199
  Submitted by:   olli hauer <ohauer at gmx dot de>
  Approved by:    rea-fbsd@codelabs.ru (maintainer - timeout; 55 days)
  
  Revision  Changes    Path
  1.8       +13 -4     ports/net-mgmt/pnp/Makefile
  1.4       +0 -18     ports/net-mgmt/pnp/files/extra-patch-share::pnp::include::function.inc.php (dead)
  1.1       +18 -0     ports/net-mgmt/pnp/files/extra-patch-share__pnp__include__function.inc.php (new)
  1.2       +0 -10     ports/net-mgmt/pnp/files/patch-man::Makefile.in (dead)
  1.1       +10 -0     ports/net-mgmt/pnp/files/patch-man__Makefile.in (new)
  1.4       +0 -29     ports/net-mgmt/pnp/files/patch-sample-config::Makefile.in (dead)
  1.1       +29 -0     ports/net-mgmt/pnp/files/patch-sample-config__Makefile.in (new)
  1.4       +0 -23     ports/net-mgmt/pnp/files/patch-scripts::Makefile.in (dead)
  1.1       +23 -0     ports/net-mgmt/pnp/files/patch-scripts__Makefile.in (new)
  1.1       +11 -0     ports/net-mgmt/pnp/files/patch-share__pnp__include__font__makefont__makefont.php (new)
  1.1       +11 -0     ports/net-mgmt/pnp/files/patch-share__pnp__include__fpdi.php (new)
  1.1       +11 -0     ports/net-mgmt/pnp/files/patch-share__pnp__include__fpdi_pdf_parser.php (new)
  1.1       +29 -0     ports/net-mgmt/pnp/files/patch-share__pnp__include__function.inc.php (new)
  1.1       +29 -0     ports/net-mgmt/pnp/files/patch-share__pnp__include__pdf_parser.php (new)
  1.1       +11 -0     ports/net-mgmt/pnp/files/patch-share__pnp__include__site.php (new)
  1.3       +0 -11     ports/net-mgmt/pnp/files/patch-src::Makefile.in (dead)
  1.1       +11 -0     ports/net-mgmt/pnp/files/patch-src__Makefile.in (new)
_______________________________________________
cvs-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/cvs-all
To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"