Date: Thu, 12 Oct 2006 07:27:13 -0600 From: "Frank J. Laszlo" <laszlof@vonostingroup.com> To: FreeBSD-gnats-submit@FreeBSD.org Cc: perky@FreeBSD.org Subject: ports/104343: [PATCH]: archivers/dpkg: Fix install error Message-ID: <E1GY0af-0005O7-Gl@main.vonostingroup.com> Resent-Message-ID: <200610121330.k9CDULhm096229@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 104343
>Category: ports
>Synopsis: [PATCH]: archivers/dpkg: Fix install error
>Confidential: no
>Severity: non-critical
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Thu Oct 12 13:30:21 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator: Frank J. Laszlo
>Release: FreeBSD 5.4-RELEASE-p18 i386
>Organization:
>Environment:
System: FreeBSD main.vonostingroup.com 5.4-RELEASE-p18 FreeBSD 5.4-RELEASE-p18 #1: Sat Sep 16 18:56:42 UTC 2006 laszlof@main.vonostingroup.com:/usr/obj/usr/src/sys/MAIN i386
>Description:
Adds a simple patch to fix the perl errors during installation. Also remove NLS files from pkg-plist. This port
doesnt seem to install them anymore? Maintainer has been CC'd.
>How-To-Repeat:
>Fix:
--- dpkg-1.10.28.diff begins here ---
diff -NrU3 dpkg.orig/Makefile dpkg/Makefile
--- dpkg.orig/Makefile Thu Oct 12 07:09:55 2006
+++ dpkg/Makefile Thu Oct 12 07:23:37 2006
@@ -15,10 +15,6 @@
MAINTAINER= perky@FreeBSD.org
COMMENT= Package maintenance system for Debian
-BROKEN= fails to install
-DEPRECATED= ${BROKEN}
-EXPIRATION_DATE=2006-12-01
-
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_ICONV= yes
@@ -39,14 +35,6 @@
MAN8= cleanup-info.8 dpkg-divert.8 dpkg-query.8 dpkg-split.8 \
dpkg-statoverride.8 dpkg.8 dselect.8 install-info.8 \
start-stop-daemon.8 update-alternatives.8
-
-.if !defined(WITHOUT_NLS)
-USE_GETTEXT= yes
-PLIST_SUB+= NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+= NLS="@comment "
-.endif
post-patch:
${REINPLACE_CMD} -e 's,^\(ALL_LINGUAS.*\)tl \(.*\)$$,\1\2,g' \
diff -NrU3 dpkg.orig/files/patch-main_Makefile.in dpkg/files/patch-main_Makefile.in
--- dpkg.orig/files/patch-main_Makefile.in Wed Dec 31 17:00:00 1969
+++ dpkg/files/patch-main_Makefile.in Thu Oct 12 07:17:16 2006
@@ -0,0 +1,10 @@
+--- main/Makefile.in.orig Thu Oct 12 07:16:21 2006
++++ main/Makefile.in Thu Oct 12 07:16:38 2006
+@@ -72,6 +72,4 @@
+
+ archtable.h: $(top_srcdir)/archtable
+ expand $< | \
+- perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" \
+- if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' \
+- >$@
++ perl -ne 'print " { \"$$1\",$$2\"$$3\",$$4\"$$5\" },\n" if m/^(?!\s*#)\s*(\S+)(\s+)(\S+)(\s+)(\S+)\s*$$/' >$@
diff -NrU3 dpkg.orig/pkg-plist dpkg/pkg-plist
--- dpkg.orig/pkg-plist Thu Oct 12 07:09:55 2006
+++ dpkg/pkg-plist Thu Oct 12 07:22:33 2006
@@ -47,33 +47,6 @@
%%DOCSDIR%%/TODO
%%DOCSDIR%%/copyright
%%DATADIR%%/archtable
-%%NLS%%share/locale/bs/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/ca/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/cs/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/da/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/de/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/el/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/es/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/eu/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/fr/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/gl/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/he/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/id/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/it/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/ja/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/ko/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/nb/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/nl/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/nn/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/pl/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/pt/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/pt_BR/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/ro/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/ru/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/sk/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/sv/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/zh_CN/LC_MESSAGES/dpkg.mo
-%%NLS%%share/locale/zh_TW/LC_MESSAGES/dpkg.mo
@dirrm var/dpkg/updates
@dirrm var/dpkg/parts
@dirrm var/dpkg/methods/mnt
--- dpkg-1.10.28.diff ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?E1GY0af-0005O7-Gl>