December 31, 2008

# This file also includes Pacific islands.
@@ -1346,7 +1346,7 @@
 # * Tonga will introduce DST in November
 #
 # I was given this link by John Letts:
-# 
+# 
 # http://news.bbc.co.uk/hi/english/world/asia-pacific/newsid_424000/424764.stm
 # 
 #
@@ -1356,7 +1356,7 @@
 # (12 + 1 hour DST).
 
 # From Arthur David Olson (1999-09-20):
-# According to 
 # http://www.tongaonline.com/news/sept1799.html
 # :
 # "Daylight Savings Time will take effect on Oct. 2 through April 15, 2000
Index: backward
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/backward,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/backward -L share/zoneinfo/backward -u -r1.4 -r1.5

--- share/zoneinfo/backward
+++ share/zoneinfo/backward
@@ -1,4 +1,4 @@
-# @(#)backward	8.4
+# @(#)backward	8.6
 
 # This file provides links between current names for time zones
 # and their old names.  Many names changed in late 1993.
@@ -24,8 +24,10 @@
 Link	Asia/Ashgabat		Asia/Ashkhabad
 Link	Asia/Chongqing		Asia/Chungking
 Link	Asia/Dhaka		Asia/Dacca
+Link	Asia/Kolkata		Asia/Calcutta
 Link	Asia/Macau		Asia/Macao
 Link	Asia/Jerusalem		Asia/Tel_Aviv
+Link	Asia/Ho_Chi_Minh	Asia/Saigon
 Link	Asia/Thimphu		Asia/Thimbu
 Link	Asia/Makassar		Asia/Ujung_Pandang
 Link	Asia/Ulaanbaatar	Asia/Ulan_Bator
Index: leapseconds
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/leapseconds,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/leapseconds -L share/zoneinfo/leapseconds -u -r1.4 -r1.5
--- share/zoneinfo/leapseconds
+++ share/zoneinfo/leapseconds
@@ -1,4 +1,4 @@
-# @(#)leapseconds	8.4
+# @(#)leapseconds	8.6
 
 # Allowance for leapseconds added to each timezone file.
 
@@ -44,8 +44,10 @@
 Leap	1997	Jun	30	23:59:60	+	S
 Leap	1998	Dec	31	23:59:60	+	S
 Leap	2005	Dec	31	23:59:60	+	S
+Leap	2008	Dec	31	23:59:60	+	S
 
 # INTERNATIONAL EARTH ROTATION AND REFERENCE SYSTEMS SERVICE (IERS)
+#
 # SERVICE INTERNATIONAL DE LA ROTATION TERRESTRE ET DES SYSTEMES DE REFERENCE
 #
 # SERVICE DE LA ROTATION TERRESTRE
@@ -53,30 +55,38 @@
 # 61, Av. de l'Observatoire 75014 PARIS (France)
 # Tel.      : 33 (0) 1 40 51 22 26
 # FAX       : 33 (0) 1 40 51 22 91
-# Internet  : services.iers at obspm.fr
+# e-mail    : services.iers at obspm.fr
+# http://hpiers.obspm.fr/eop-pc
 #
-# Paris, 28 June 2007
+# Paris, 4 July 2008
 #
-# Bulletin C 34
+# Bulletin C 36
 #
 # To authorities responsible
 # for the measurement and
 # distribution of time
 #
-# INFORMATION ON UTC - TAI
+# UTC TIME STEP
+# on the 1st of January 2009
+#
+# A positive leap second will be introduced at the end of December 2008.
+# The sequence of dates of the UTC second markers will be:		
+#
+# 2008 December 31,     23h 59m 59s
+# 2008 December 31,     23h 59m 60s
+# 2009 January   1,      0h  0m  0s
 #
-# NO positive leap second will be introduced at the end of December 2007.
-# The difference between Coordinated Universal Time UTC and the
-# International Atomic Time TAI is :		
+# The difference between UTC and the International Atomic Time TAI is:
 #
-# from 2006 January 1, 0h UTC, until further notice : UTC-TAI = -33 s
+# from 2006 January 1, 0h UTC, to 2009 January 1  0h UTC  : UTC-TAI = - 33s
+# from 2009 January 1, 0h UTC, until further notice       : UTC-TAI = - 34s
 #
 # Leap seconds can be introduced in UTC at the end of the months of December
-# or June,  depending on the evolution of UT1-TAI. Bulletin C is mailed every
-# six months, either to announce a time step in UTC, or to confirm that there
+# or June, depending on the evolution of UT1-TAI. Bulletin C is mailed every
+# six months, either to announce a time step in UTC or to confirm that there
 # will be no time step at the next possible date.
 #
 # Daniel GAMBIS
-# Director			
+# Head		
 # Earth Orientation Center of IERS
 # Observatoire de Paris, France
Index: zone.tab
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/zone.tab,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/zone.tab -L share/zoneinfo/zone.tab -u -r1.4 -r1.5
--- share/zoneinfo/zone.tab
+++ share/zoneinfo/zone.tab
@@ -1,4 +1,4 @@
-# @(#)zone.tab	8.13
+# @(#)zone.tab	8.21
 #
 # TZ zone descriptions
 #
@@ -42,13 +42,15 @@
 AQ	-6640+14001	Antarctica/DumontDUrville	Dumont-d'Urville Station, Terre Adelie
 AQ	-690022+0393524	Antarctica/Syowa	Syowa Station, E Ongul I
 AR	-3436-05827	America/Argentina/Buenos_Aires	Buenos Aires (BA, CF)
-AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, LP, MN, NQ, RN, SA, SE, SF, SL)
+AR	-3124-06411	America/Argentina/Cordoba	most locations (CB, CC, CN, ER, FM, MN, SE, SF)
+AR	-2447-06525	America/Argentina/Salta	(SA, LP, NQ, RN)
 AR	-2411-06518	America/Argentina/Jujuy	Jujuy (JY)
 AR	-2649-06513	America/Argentina/Tucuman	Tucuman (TM)
 AR	-2828-06547	America/Argentina/Catamarca	Catamarca (CT), Chubut (CH)
 AR	-2926-06651	America/Argentina/La_Rioja	La Rioja (LR)
 AR	-3132-06831	America/Argentina/San_Juan	San Juan (SJ)
 AR	-3253-06849	America/Argentina/Mendoza	Mendoza (MZ)
+AR	-3319-06621	America/Argentina/San_Luis	San Luis (SL)
 AR	-5138-06913	America/Argentina/Rio_Gallegos	Santa Cruz (SC)
 AR	-5448-06818	America/Argentina/Ushuaia	Tierra del Fuego (TF)
 AS	-1416-17042	Pacific/Pago_Pago
@@ -91,7 +93,8 @@
 BR	-2332-04637	America/Sao_Paulo	S & SE Brazil (GO, DF, MG, ES, RJ, SP, PR, SC, RS)
 BR	-2027-05437	America/Campo_Grande	Mato Grosso do Sul
 BR	-1535-05605	America/Cuiaba	Mato Grosso
-BR	-0846-06354	America/Porto_Velho	W Para, Rondonia
+BR	-0226-05452	America/Santarem	W Para
+BR	-0846-06354	America/Porto_Velho	Rondonia
 BR	+0249-06040	America/Boa_Vista	Roraima
 BR	-0308-06001	America/Manaus	E Amazonas
 BR	-0640-06952	America/Eirunepe	W Amazonas
@@ -209,7 +212,7 @@
 IE	+5320-00615	Europe/Dublin
 IL	+3146+03514	Asia/Jerusalem
 IM	+5409-00428	Europe/Isle_of_Man
-IN	+2232+08822	Asia/Calcutta
+IN	+2232+08822	Asia/Kolkata
 IO	-0720+07225	Indian/Chagos
 IQ	+3321+04425	Asia/Baghdad
 IR	+3540+05126	Asia/Tehran
@@ -291,7 +294,7 @@
 NO	+5955+01045	Europe/Oslo
 NP	+2743+08519	Asia/Katmandu
 NR	-0031+16655	Pacific/Nauru
-NU	-1901+16955	Pacific/Niue
+NU	-1901-16955	Pacific/Niue
 NZ	-3652+17446	Pacific/Auckland	most locations
 NZ	-4357-17633	Pacific/Chatham	Chatham Islands
 OM	+2336+05835	Asia/Muscat
@@ -382,13 +385,13 @@
 US	+364947-0845057	America/Kentucky/Monticello	Eastern Time - Kentucky - Wayne County
 US	+394606-0860929	America/Indiana/Indianapolis	Eastern Time - Indiana - most locations
 US	+384038-0873143	America/Indiana/Vincennes	Eastern Time - Indiana - Daviess, Dubois, Knox & Martin Counties
-US	+411745-0863730	America/Indiana/Knox	Eastern Time - Indiana - Starke County
 US	+410305-0863611	America/Indiana/Winamac	Eastern Time - Indiana - Pulaski County
 US	+382232-0862041	America/Indiana/Marengo	Eastern Time - Indiana - Crawford County
+US	+382931-0871643	America/Indiana/Petersburg	Eastern Time - Indiana - Pike County
 US	+384452-0850402	America/Indiana/Vevay	Eastern Time - Indiana - Switzerland County
 US	+415100-0873900	America/Chicago	Central Time
 US	+375711-0864541	America/Indiana/Tell_City	Central Time - Indiana - Perry County
-US	+382931-0871643	America/Indiana/Petersburg	Central Time - Indiana - Pike County
+US	+411745-0863730	America/Indiana/Knox	Central Time - Indiana - Starke County
 US	+450628-0873651	America/Menominee	Central Time - Michigan - Dickinson, Gogebic, Iron & Menominee Counties
 US	+470659-1011757	America/North_Dakota/Center	Central Time - North Dakota - Oliver County
 US	+465042-1012439	America/North_Dakota/New_Salem	Central Time - North Dakota - Morton County (except Mandan area)
@@ -411,7 +414,7 @@
 VE	+1030-06656	America/Caracas
 VG	+1827-06437	America/Tortola
 VI	+1821-06456	America/St_Thomas
-VN	+1045+10640	Asia/Saigon
+VN	+1045+10640	Asia/Ho_Chi_Minh
 VU	-1740+16825	Pacific/Efate
 WF	-1318-17610	Pacific/Wallis
 WS	-1350-17144	Pacific/Apia
Index: africa
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/africa,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/africa -L share/zoneinfo/africa -u -r1.4 -r1.5
--- share/zoneinfo/africa
+++ share/zoneinfo/africa
@@ -1,4 +1,4 @@
-# @(#)africa	8.10
+# @(#)africa	8.17
 #  
 # This data is by no means authoritative; if you think you know better,
@@ -387,9 +387,88 @@
 			 0:00	-	GMT
 
 # Mauritius
+
+# From Steffen Thorsen (2008-06-25):
+# Mauritius plans to observe DST from 2008-11-01 to 2009-03-31 on a trial
+# basis....
+# It seems that Mauritius observed daylight saving time from 1982-10-10 to 
+# 1983-03-20 as well, but that was not successful....
+# http://www.timeanddate.com/news/time/mauritius-daylight-saving-time.html
+
+# From Alex Krivenyshev (2008-06-25):
+# http://economicdevelopment.gov.mu/portal/site/Mainhomepage/menuitem.a42b24128104d9845dabddd154508a0c/?content_id=0a7cee8b5d69a110VgnVCM1000000a04a8c0RCRD
+
+# From Arthur David Olson (2008-06-30):
+# The www.timeanddate.com article cited by Steffen Thorsen notes that "A
+# final decision has yet to be made on the times that daylight saving
+# would begin and end on these dates." As a place holder, use midnight.
+
+# From Paul Eggert (2008-06-30):
+# Follow Thorsen on DST in 1982/1983, instead of Shanks & Pottenger.
+
+# From Steffen Thorsen (2008-07-10):
+# According to
+# 
+# http://www.lexpress.mu/display_article.php?news_id=111216
+# 
+# (in French), Mauritius will start and end their DST a few days earlier
+# than previously announced (2008-11-01 to 2009-03-31).  The new start
+# date is 2008-10-26 at 02:00 and the new end date is 2009-03-27 (no time
+# given, but it is probably at either 2 or 3 wall clock time).
+# 
+# A little strange though, since the article says that they moved the date 
+# to align itself with Europe and USA which also change time on that date, 
+# but that means they have not paid attention to what happened in 
+# USA/Canada last year (DST ends first Sunday in November). I also wonder 
+# why that they end on a Friday, instead of aligning with Europe which 
+# changes two days later.
+
+# From Alex Krivenyshev (2008-07-11):
+# Seems that English language article "The revival of daylight saving
+# time:  Energy conservation?"-# No. 16578 (07/11/2008) was originally
+# published on Monday, June 30, 2008...
+#
+# I guess that article in French "Le gouvernement avance l'introduction
+# de l'heure d'ete" stating that DST in Mauritius starting on October 26
+# and ending on March 27, 2009 is the most recent one.
+# ...
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_mauritius02.html
+# 
+
+# From Riad M. Hossen Ally (2008-08-03):
+# The Government of Mauritius weblink
+# 
+# http://www.gov.mu/portal/site/pmosite/menuitem.4ca0efdee47462e7440a600248a521ca/?content_id=3D4728ca68b2a5b110VgnVCM1000000a04a8c0RCRD
+# 
+# Cabinet Decision of July 18th, 2008 states as follows:
+#
+# 4. ...Cabinet has agreed to the introduction into the National Assembly
+# of the Time Bill which provides for the introduction of summer time in
+# Mauritius. The summer time period which will be of one hour ahead of
+# the standard time, will be aligned with that in Europe and the United
+# States of America. It will start at two o'clock in the morning on the
+# last Sunday of October and will end at two o'clock in the morning on
+# the last Sunday of March the following year. The summer time for the
+# year 2008 - 2009 will, therefore, be effective as from 26 October 2008
+# and end on 29 March 2009.
+
+# From Ed Maste (2008-10-07):
+# THE TIME BILL (No. XXVII of 2008) Explanatory Memorandum states the
+# beginning / ending of summer time is 2 o'clock standard time in the
+# morning of the last Sunday of October / last Sunday of March.
+# 
+# http://www.gov.mu/portal/goc/assemblysite/file/bill2708.pdf
+# 
+
+# Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+Rule Mauritius	1982	only	-	Oct	10	0:00	1:00	S
+Rule Mauritius	1983	only	-	Mar	21	0:00	0	-
+Rule Mauritius	2008	max	-	Oct	lastSun	2:00s	1:00	S
+Rule Mauritius	2009	max	-	Mar	lastSun	2:00s	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Indian/Mauritius	3:50:00 -	LMT	1907		# Port Louis
-			4:00	-	MUT	# Mauritius Time
+			4:00 Mauritius	MU%sT	# Mauritius Time
 # Agalega Is, Rodriguez
 # no information; probably like Indian/Mauritius
 
@@ -400,7 +479,93 @@
 
 # Morocco
 # See the `europe' file for Spanish Morocco (Africa/Ceuta).
+
+# From Alex Krivenyshev (2008-05-09):
+# Here is an article that Morocco plan to introduce Daylight Saving Time between
+# 1 June, 2008 and 27 September, 2008.
+#
+# "... Morocco is to save energy by adjusting its clock during summer so it will
+# be one hour ahead of GMT between 1 June and 27 September, according to
+# Communication Minister and Gov ernment Spokesman, Khalid Naciri...."
+#
+# 
+# http://www.worldtimezone.net/dst_news/dst_news_morocco01.html
+# 
+# OR
+# 
+# http://en.afrik.com/news11892.html
+# 
+
+# From Alex Krivenyshev (2008-05-09):
+# The Morocco time change can be confirmed on Morocco web site Maghreb Arabe Presse:
+# 
+# http://www.map.ma/eng/sections/box3/morocco_shifts_to_da/view
+# 
+#
+# Morocco shifts to daylight time on June 1st through September 27, Govt.
+# spokesman.
+
+# From Patrice Scattolin (2008-05-09):
+# According to this article:
+# 
+# http://www.avmaroc.com/actualite/heure-dete-comment-a127896.html
+# 
+# (and republished here:
+# 
+# http://www.actu.ma/heure-dete-comment_i127896_0.html
+# 
+# )
+# the changes occurs at midnight:
+#
+# saturday night may 31st at midnight (which in french is to be
+# intrepreted as the night between saturday and sunday)
+# sunday night the 28th  at midnight
+#
+# Seeing that the 28th is monday, I am guessing that she intends to say
+# the midnight of the 28th which is the midnight between sunday and
+# monday, which jives with other sources that say that it's inclusive
+# june1st to sept 27th.
+#
+# The decision was taken by decree *2-08-224 *but I can't find the decree
+# published on the web.
+#
+# It's also confirmed here:
+# 
+# http://www.maroc.ma/NR/exeres/FACF141F-D910-44B0-B7FA-6E03733425D1.htm
+# 
+# on a government portal as being  between june 1st and sept 27th (not yet
+# posted in english).
+#
+# The following google query will generate many relevant hits:
+# 
+# http://www.google.com/search?hl=en&q=Conseil+de+gouvernement+maroc+heure+avance&btnG=Search
+# 
+
+# From Alex Krivenyshev (2008-05-09):
+# Is Western Sahara (part which administrated by Morocco) going to follow
+# Morocco DST changes?  Any information?  What about other part of
+# Western Sahara - under administration of POLISARIO Front (also named
+# SADR Saharawi Arab Democratic Republic)?
+
+# From Arthur David Olson (2008-05-09):
+# XXX--guess that it is only Morocco for now; guess only 2008 for now.
+
+# From Steffen Thorsen (2008-08-27):
+# Morocco will change the clocks back on the midnight between August 31 
+# and September 1. They originally planned to observe DST to near the end 
+# of September:
+#
+# One article about it (in French):
+# 
+# http://www.menara.ma/fr/Actualites/Maroc/Societe/ci.retour_a_l_heure_gmt_a_partir_du_dimanche_31_aout_a_minuit_officiel_.default
+# 
+#
+# We have some further details posted here:
+# 
+# http://www.timeanddate.com/news/time/morocco-ends-dst-early-2008.html
+# 
 # RULE	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
+
 Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	S
 Rule	Morocco	1939	only	-	Nov	19	 0:00	0	-
 Rule	Morocco	1940	only	-	Feb	25	 0:00	1:00	S
@@ -416,11 +581,13 @@
 Rule	Morocco	1977	only	-	Sep	28	 0:00	0	-
 Rule	Morocco	1978	only	-	Jun	 1	 0:00	1:00	S
 Rule	Morocco	1978	only	-	Aug	 4	 0:00	0	-
+Rule	Morocco	2008	only	-	Jun	 1	 0:00	1:00	S
+Rule	Morocco	2008	only	-	Sep	 1	 0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone Africa/Casablanca	-0:30:20 -	LMT	1913 Oct 26
 			 0:00	Morocco	WE%sT	1984 Mar 16
 			 1:00	-	CET	1986
-			 0:00	-	WET
+			 0:00	Morocco	WE%sT
 # Western Sahara
 Zone Africa/El_Aaiun	-0:52:48 -	LMT	1934 Jan
 			-1:00	-	WAT	1976 Apr 14
Index: MidnightBSD-upgrade
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/MidnightBSD-upgrade,v
retrieving revision 1.3
retrieving revision 1.4
diff -L share/zoneinfo/MidnightBSD-upgrade -L share/zoneinfo/MidnightBSD-upgrade -u -r1.3 -r1.4
--- share/zoneinfo/MidnightBSD-upgrade
+++ share/zoneinfo/MidnightBSD-upgrade
@@ -18,6 +18,6 @@
 
 __
 
-Last updated with tzdata2007k
+Last updated with tzdata2008i
 
 $MidnightBSD$
Index: southamerica
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/southamerica,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/southamerica -L share/zoneinfo/southamerica -u -r1.4 -r1.5
--- share/zoneinfo/southamerica
+++ share/zoneinfo/southamerica
@@ -1,4 +1,4 @@
-# @(#)southamerica	8.15
+# @(#)southamerica	8.33
 #  
 # This data is by no means authoritative; if you think you know better,
@@ -164,9 +164,58 @@
 # From Paul Eggert (2007-12-22):
 # For dates after mid-2008, the following rules are my guesses and
 # are quite possibly wrong, but are more likely than no DST at all.
+
+# From Alexander Krivenyshev (2008-09-05):
+# As per message from Carlos Alberto Fonseca Arauz (Nicaragua),
+# Argentina will start DST on Sunday October 19, 2008.
+#
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_argentina03.html
+# 
+# OR
+# 
+# http://www.impulsobaires.com.ar/nota.php?id=57832 (in spanish)
+# 
+
+# From Rodrigo Severo (2008-10-06):
+# Here is some info available at a Gentoo bug related to TZ on Argentina's DST:
+# ...
+# ------- Comment #1 from [jmdocile]  2008-10-06 16:28 0000 -------
+# Hi, there is a problem with timezone-data-2008e and maybe with
+# timezone-data-2008f
+# Argentinian law [Number] 25.155 is no longer valid.
+# 
+# http://www.infoleg.gov.ar/infolegInternet/anexos/60000-64999/60036/norma.htm
+# 
+# The new one is law [Number] 26.350
+# 
+# http://www.infoleg.gov.ar/infolegInternet/anexos/135000-139999/136191/norma.htm
+# 
+# So there is no summer time in Argentina for now.
+
+# From Mariano Absatz (2008-10-20):
+# Decree 1693/2008 applies Law 26.350 for the summer 2008/2009 establishing DST in Argentina
+# From 2008-10-19 until 2009-03-15
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=16102008&pi=3&pf=4&s=0&sec=01
+# 
+#
+# Decree 1705/2008 excepting 12 Provinces from applying DST in the summer 2008/2009:
+# Catamarca, La Rioja, Mendoza, Salta, San Juan, San Luis, La Pampa, Neuquen, Rio Negro, Chubut, Santa Cruz
+# and Tierra del Fuego
+# 
+# http://www.boletinoficial.gov.ar/Bora.Portal/CustomControls/PdfContent.aspx?fp=17102008&pi=1&pf=1&s=0&sec=01
+# 
+#
+# Press release 235 dated Saturday October 18th, from the Government of the Province of Jujuy saying
+# it will not apply DST either (even when it was not included in Decree 1705/2008)
+# 
+# http://www.jujuy.gov.ar/index2/partes_prensa/18_10_08/235-181008.doc
+# 
+
 Rule	Arg	2007	only	-	Dec	30	0:00	1:00	S
 Rule	Arg	2008	max	-	Mar	Sun>=15	0:00	0	-
-Rule	Arg	2008	max	-	Oct	Sun>=1	0:00	1:00	S
+Rule	Arg	2008	max	-	Oct	Sun>=15	0:00	1:00	S
  
 # From Mariano Absatz (2004-05-21):
 # Today it was officially published that the Province of Mendoza is changing
@@ -228,10 +277,80 @@
 # http://www.sanjuan.gov.ar/prensa/archivo/000426.html
 # http://www.sanjuan.gov.ar/prensa/archivo/000441.html
 
+# From Alex Krivenyshev (2008-01-17):
+# Here are articles that Argentina Province San Luis is planning to end DST
+# as earlier as upcoming Monday January 21, 2008 or February 2008:
+#
+# Provincia argentina retrasa reloj y marca diferencia con resto del pais
+# (Argentine Province delayed clock and mark difference with the rest of the
+# country)
+# 
+# http://cl.invertia.com/noticias/noticia.aspx?idNoticia=200801171849_EFE_ET4373&idtel
+# 
+#
+# Es inminente que en San Luis atrasen una hora los relojes
+# (It is imminent in San Luis clocks one hour delay)
+# 
+# http://www.lagaceta.com.ar/vernotae.asp?id_nota=253414
+# 
+#
+# 
+# http://www.worldtimezone.net/dst_news/dst_news_argentina02.html
+# 
+
+# From Jesper Norgaard Welen (2008-01-18):
+# The page of the San Luis provincial government
+# 
+# http://www.sanluis.gov.ar/notas.asp?idCanal=0&id=22812
+# 
+# confirms what Alex Krivenyshev has earlier sent to the tz
+# emailing list about that San Luis plans to return to standard
+# time much earlier than the rest of the country. It also
+# confirms that upon request the provinces San Juan and Mendoza 
+# refused to follow San Luis in this change. 
+# 
+# The change is supposed to take place Monday the 21.st at 0:00
+# hours. As far as I understand it if this goes ahead, we need
+# a new timezone for San Luis (although there are also documented
+# independent changes in the southamerica file of San Luis in
+# 1990 and 1991 which has not been confirmed).
+
+# From Jesper Norgaard Welen (2008-01-25):
+# Unfortunately the below page has become defunct, about the San Luis
+# time change. Perhaps because it now is part of a group of pages "Most
+# important pages of 2008."
+#
+# You can use
+# 
+# http://www.sanluis.gov.ar/notas.asp?idCanal=8141&id=22834
+# 
+# instead it seems. Or use "Buscador" from the main page of the San Luis
+# government, and fill in "huso" and click OK, and you will get 3 pages
+# from which the first one is identical to the above.
+
+# From Mariano Absatz (2008-01-28):
+# I can confirm that the Province of San Luis (and so far only that
+# province) decided to go back to UTC-3 effective midnight Jan 20th 2008
+# (that is, Monday 21st at 0:00 is the time the clocks were delayed back
+# 1 hour), and they intend to keep UTC-3 as their timezone all year round
+# (that is, unless they change their mind any minute now).
+#
+# So we'll have to add yet another city to 'southamerica' (I think San
+# Luis city is the mos populated city in the Province, so it'd be
+# America/Argentina/San_Luis... of course I can't remember if San Luis's
+# history of particular changes goes along with Mendoza or San Juan :-(
+# (I only remember not being able to collect hard facts about San Luis
+# back in 2004, when these provinces changed to UTC-4 for a few days, I
+# mailed them personally and never got an answer).
+
+# From Paul Eggert (2008-06-30):
 # Unless otherwise specified, data are from Shanks & Pottenger through 1992,
 # from the IATA otherwise.  As noted below, Shanks & Pottenger say that
-# America/Cordoba split into 6 subregions during 1991/1992, but we
-# haven't verified this yet so for now we'll keep it a single region.
+# America/Cordoba split into 6 subregions during 1991/1992, one of which
+# was America/San_Luis, but we haven't verified this yet so for now we'll
+# keep America/Cordoba a single region rather than splitting it into the
+# other 5 subregions.
+
 #
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
@@ -244,16 +363,13 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
-# Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN), Chaco (CC),
-# Formosa (FM), Salta (SA), Santiago del Estero (SE), Cordoba (CB),
-# San Luis (SL), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+# Cordoba (CB), Santa Fe (SF), Entre Rios (ER), Corrientes (CN), Misiones (MN),
+# Chaco (CC), Formosa (FM), Santiago del Estero (SE)
 #
 # Shanks & Pottenger also make the following claims, which we haven't verified:
 # - Formosa switched to -3:00 on 1991-01-07.
 # - Misiones switched to -3:00 on 1990-12-29.
 # - Chaco switched to -3:00 on 1991-01-04.
-# - San Luis switched to -4:00 on 1990-03-14, then to -3:00 on 1990-10-15,
-#   then to -4:00 on 1991-03-01, then to -3:00 on 1991-06-01.
 # - Santiago del Estero switched to -4:00 on 1991-04-01,
 #   then to -3:00 on 1991-04-26.
 #
@@ -267,6 +383,18 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	Arg	AR%sT
 #
+# Salta (SA), La Pampa (LP), Neuquen (NQ), Rio Negro (RN)
+Zone America/Argentina/Salta -4:21:40 - LMT	1894 Oct 31
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	ART	1930 Dec
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1991 Mar  3
+			-4:00	-	WART	1991 Oct 20
+			-3:00	Arg	AR%sT	1999 Oct  3
+			-4:00	Arg	AR%sT	2000 Mar  3
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
+#
 # Tucuman (TM)
 Zone America/Argentina/Tucuman -4:20:52 - LMT	1894 Oct 31
 			-4:16:48 -	CMT	1920 May
@@ -291,7 +419,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # San Juan (SJ)
 Zone America/Argentina/San_Juan -4:34:04 - LMT	1894 Oct 31
@@ -304,7 +433,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 31
 			-4:00	-	WART	2004 Jul 25
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Jujuy (JY)
 Zone America/Argentina/Jujuy -4:21:12 -	LMT	1894 Oct 31
@@ -318,7 +448,8 @@
 			-3:00	1:00	ARST	1992
 			-3:00	Arg	AR%sT	1999 Oct  3
 			-4:00	Arg	AR%sT	2000 Mar  3
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Catamarca (CT), Chubut (CH)
 Zone America/Argentina/Catamarca -4:23:08 - LMT	1894 Oct 31
@@ -331,7 +462,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Mendoza (MZ)
 Zone America/Argentina/Mendoza -4:35:16 - LMT	1894 Oct 31
@@ -348,7 +480,25 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 23
 			-4:00	-	WART	2004 Sep 26
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
+#
+# San Luis (SL)
+Zone America/Argentina/San_Luis -4:25:24 - LMT	1894 Oct 31
+			-4:16:48 -	CMT	1920 May
+			-4:00	-	ART	1930 Dec
+			-4:00	Arg	AR%sT	1969 Oct  5
+			-3:00	Arg	AR%sT	1990
+			-3:00	1:00	ARST	1990 Mar 14
+			-4:00	-	WART	1990 Oct 15
+			-4:00	1:00	WARST	1991 Mar  1
+			-4:00	-	WART	1991 Jun  1
+			-3:00	-	ART	1999 Oct  3
+			-4:00	1:00	WARST	2000 Mar  3
+			-3:00	-	ART	2004 May 31
+			-4:00	-	WART	2004 Jul 25
+			-3:00	Arg	AR%sT	2008 Jan 21
+			-3:00	-	ART
 #
 # Santa Cruz (SC)
 Zone America/Argentina/Rio_Gallegos -4:36:52 - LMT 1894 Oct 31
@@ -359,7 +509,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 Jun  1
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 #
 # Tierra del Fuego, Antartida e Islas del Atlantico Sur (TF)
 Zone America/Argentina/Ushuaia -4:33:12 - LMT 1894 Oct 31
@@ -370,7 +521,8 @@
 			-4:00	Arg	AR%sT	2000 Mar  3
 			-3:00	-	ART	2004 May 30
 			-4:00	-	WART	2004 Jun 20
-			-3:00	Arg	AR%sT
+			-3:00	Arg	AR%sT	2008 Oct 18
+			-3:00	-	ART
 
 # Aruba
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -456,12 +608,86 @@
 # Brazil will start DST on 2007-10-14 00:00 and end on 2008-02-17 00:00:
 # http://www.mme.gov.br/site/news/detail.do;jsessionid=BBA06811AFCAAC28F0285210913513DA?newsId=13975
 
+# From Paul Schulze (2008-06-24):
+# ...by law number 11.662 of April 24, 2008 (published in the "Diario
+# Oficial da Uniao"...) in Brazil there are changes in the timezones,
+# effective today (00:00am at June 24, 2008) as follows:
+#
+# a) The timezone UTC+5 is e[x]tinguished, with all the Acre state and the
+# part of the Amazonas state that had this timezone now being put to the
+# timezone UTC+4
+# b) The whole Para state now is put at timezone UTC+3, instead of just
+# part of it, as was before.
+#
+# This change follows a proposal of senator Tiao Viana of Acre state, that
+# proposed it due to concerns about open television channels displaying
+# programs inappropriate to youths in the states that had the timezone
+# UTC+5 too early in the night. In the occasion, some more corrections
+# were proposed, trying to unify the timezones of any given state. This
+# change modifies timezone rules defined in decree 2.784 of 18 June,
+# 1913.
+
+# From Rodrigo Severo (2008-06-24):
+# Just correcting the URL:
+# 
+# https://www.in.gov.br/imprensa/visualiza/index.jsp?jornal=3Ddo&secao=3D1&pagina=3D1&data=3D25/04/2008
+# 
+#
+# As a result of the above Decree I believe the America/Rio_Branco
+# timezone shall be modified from UTC-5 to UTC-4 and a new timezone shall
+# be created to represent the the west side of the Para State. I
+# suggest this new timezone be called Santarem as the most
+# important/populated city in the affected area.
+#
+# This new timezone would be the same as the Rio_Branco timezone up to
+# the 2008/06/24 change which would be to UTC-3 instead of UTC-4.
+
+# From Alex Krivenyshev (2008-06-24):
+# This is a quick reference page for New and Old Brazil Time Zones map.
+# 
+# http://www.worldtimezone.com/brazil-time-new-old.php
+# 
+#
+# - 4 time zones replaced by 3 time zones-eliminating time zone UTC- 05
+# (state Acre and the part of the Amazonas will be UTC/GMT- 04) - western
+# part of Par state is moving to one timezone UTC- 03 (from UTC -04).
+
 # From Paul Eggert (2002-10-10):
 # The official decrees referenced below are mostly taken from
 # 
 # Decretos sobre o Horario de Verao no Brasil
 # .
 
+# From Steffen Thorsen (2008-08-29):
+# As announced by the government and many newspapers in Brazil late
+# yesterday, Brazil will start DST on 2008-10-19 (need to change rule) and
+# it will end on 2009-02-15 (current rule for Brazil is fine). Based on
+# past years experience with the elections, there was a good chance that
+# the start was postponed to November, but it did not happen this year.
+#
+# It has not yet been posted to http://pcdsh01.on.br/DecHV.html
+#
+# An official page about it:
+# 
+# http://www.mme.gov.br/site/news/detail.do?newsId=16722
+# 
+# Note that this link does not always work directly, but must be accessed
+# by going to
+# 
+# http://www.mme.gov.br/first
+# 
+#
+# One example link that works directly:
+# 
+# http://jornale.com.br/index.php?option=com_content&task=view&id=13530&Itemid=54
+# (Portuguese)
+# 
+#
+# We have a written a short article about it as well:
+# 
+# http://www.timeanddate.com/news/time/brazil-dst-2008-2009.html
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 # Decree 20,466 (1931-10-01)
 # Decree 21,896 (1932-01-10)
@@ -578,13 +804,13 @@
 Rule	Brazil	2000	2001	-	Oct	Sun>=8	 0:00	1:00	S
 Rule	Brazil	2001	2006	-	Feb	Sun>=15	 0:00	0	-
 # Decree 4,399 (2002-10-01) repeals DST in AL, CE, MA, PB, PE, PI, RN, SE.
-# 
+# 4,399
 Rule	Brazil	2002	only	-	Nov	 3	 0:00	1:00	S
 # Decree 4,844 (2003-09-24; corrected 2003-09-26) repeals DST in BA, MT, TO.
-# 
+# 4,844
 Rule	Brazil	2003	only	-	Oct	19	 0:00	1:00	S
 # Decree 5,223 (2004-10-01) reestablishes DST in MT.
-# 
+# 5,223
 Rule	Brazil	2004	only	-	Nov	 2	 0:00	1:00	S
 # Decree 5,539 (2005-09-19),
 # adopted by the same states as before.
@@ -593,16 +819,36 @@
 # adopted by the same states as before.
 Rule	Brazil	2006	only	-	Nov	 5	 0:00	1:00	S
 Rule	Brazil	2007	only	-	Feb	25	 0:00	0	-
-# (Decree number not yet known)
-# http://www.brasil.gov.br/noticias/ultimas_noticias/horario_verao070920/
-# (2007-09-20) after a heads-up from Steffen Thorsen:
-Rule	Brazil	2007	max	-	Oct	Sun>=8	 0:00	1:00	S
-Rule	Brazil	2008	max	-	Feb	Sun>=15	 0:00	0	-
+# Decree 6,212 (2007-09-26),
+# adopted by the same states as before.
+Rule	Brazil	2007	only	-	Oct	Sun>=8	 0:00	1:00	S
+# From Frederico A. C. Neves (2008-09-10):
+# Acording to this decree
+# 
+# http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm
+# 
+# [t]he DST period in Brazil now on will be from the 3rd Oct Sunday to the
+# 3rd Feb Sunday. There is an exception on the return date when this is
+# the Carnival Sunday then the return date will be the next Sunday...
+Rule	Brazil	2008	max	-	Oct	Sun>=15	0:00	1:00	S
+Rule	Brazil	2008	2011	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2012	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2013	2014	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2015	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2016	2022	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2023	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2024	2025	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2026	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2027	2033	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2034	only	-	Feb	Sun>=22	0:00	0	-
+Rule	Brazil	2035	2036	-	Feb	Sun>=15	0:00	0	-
+Rule	Brazil	2037	only	-	Feb	Sun>=22	0:00	0	-
+# From Arthur David Olson (2008-09-29):
+# The next is wrong in some years but is better than nothing.
+Rule	Brazil	2038	max	-	Feb	Sun>=15	0:00	0	-
+
 # The latest ruleset listed above says that the following states observe DST:
 # DF, ES, GO, MG, MS, MT, PR, RJ, RS, SC, SP.
-# For dates after mid-2008, the above rules with TO="max" are guesses
-# and are quite possibly wrong, but are more likely than no DST at all.
-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 #
@@ -629,6 +875,13 @@
 			-3:00	Brazil	BR%sT	1988 Sep 12
 			-3:00	-	BRT
 #
+# west Para (PA)
+# West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem.
+Zone America/Santarem	-3:38:48 -	LMT	1914
+			-4:00	Brazil	AM%sT	1988 Sep 12
+			-4:00	-	AMT	2008 Jun 24 00:00
+			-3:00	-	BRT
+#
 # Maranhao (MA), Piaui (PI), Ceara (CE), Rio Grande do Norte (RN),
 # Paraiba (PB)
 Zone America/Fortaleza	-2:34:00 -	LMT	1914
@@ -691,8 +944,7 @@
 			-4:00	-	AMT	2004 Oct  1
 			-4:00	Brazil	AM%sT
 #
-# west Para (PA), Rondonia (RO)
-# West Para includes Altamira, Oribidos, Prainha, Oriximina, and Santarem.
+# Rondonia (RO)
 Zone America/Porto_Velho -4:15:36 -	LMT	1914
 			-4:00	Brazil	AM%sT	1988 Sep 12
 			-4:00	-	AMT
@@ -719,13 +971,14 @@
 			-5:00	Brazil	AC%sT	1988 Sep 12
 			-5:00	-	ACT	1993 Sep 28
 			-5:00	Brazil	AC%sT	1994 Sep 22
-			-5:00	-	ACT
+			-5:00	-	ACT	2008 Jun 24 00:00
+			-4:00	-	AMT
 #
 # Acre (AC)
 Zone America/Rio_Branco	-4:31:12 -	LMT	1914
 			-5:00	Brazil	AC%sT	1988 Sep 12
-			-5:00	-	ACT
-
+			-5:00	-	ACT	2008 Jun 24 00:00
+			-4:00	-	AMT
 
 # Chile
 
@@ -759,6 +1012,26 @@
 # America/Santiago.  The pre-1980 Pacific/Easter data are dubious,
 # but we have no other source.
 
+# From German Poo-Caaman~o (2008-03-03):
+# Due to drought, Chile extends Daylight Time in three weeks.  This
+# is one-time change (Saturday 3/29 at 24:00 for America/Santiago
+# and Saturday 3/29 at 22:00 for Pacific/Easter)
+# The Supreme Decree is located at 
+# 
+# http://www.shoa.cl/servicios/supremo316.pdf
+# 
+# and the instructions for 2008 are located in:
+# 
+# http://www.horaoficial.cl/cambio.htm
+# .
+
+# From Jose Miguel Garrido (2008-03-05):
+# ...
+# You could see the announces of the change on 
+# 
+# http://www.shoa.cl/noticias/2008/04hora/hora.htm
+# .
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Chile	1927	1932	-	Sep	 1	0:00	1:00	S
 Rule	Chile	1928	1932	-	Apr	 1	0:00	0	-
@@ -789,7 +1062,11 @@
 Rule	Chile	1998	only	-	Sep	27	4:00u	1:00	S
 Rule	Chile	1999	only	-	Apr	 4	3:00u	0	-
 Rule	Chile	1999	max	-	Oct	Sun>=9	4:00u	1:00	S
-Rule	Chile	2000	max	-	Mar	Sun>=9	3:00u	0	-
+Rule	Chile	2000	2007	-	Mar	Sun>=9	3:00u	0	-
+# N.B.: the end of March 29 in Chile is March 30 in Universal time,
+# which is used below in specifying the transition.
+Rule	Chile	2008	only	-	Mar	30	3:00u	0	-
+Rule	Chile	2009	max	-	Mar	Sun>=9	3:00u	0	-
 # IATA SSIM anomalies: (1992-02) says 1992-03-14;
 # (1996-09) says 1998-03-08.  Ignore these.
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
Index: asia
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/asia,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/asia -L share/zoneinfo/asia -u -r1.4 -r1.5
--- share/zoneinfo/asia
+++ share/zoneinfo/asia
@@ -1,4 +1,4 @@
-# @(#)asia	8.14
+# @(#)asia	8.24
 #  
 # This data is by no means authoritative; if you think you know better,
@@ -229,6 +229,28 @@
 # (could be true), for the moment I am assuming that those two
 # counties are mistakes in the astro.com data.
 
+# From Paul Eggert (2008-02-11):
+# I just now checked Google News for western news sources that talk
+# about China's single time zone, and couldn't find anything before 1986
+# talking about China being in one time zone.  (That article was: Jim
+# Mann, "A clumsy embrace for another western custom: China on daylight
+# time--sort of", Los Angeles Times, 1986-05-05.  By the way, this
+# article confirms the tz database's data claiming that China began
+# observing daylight saving time in 1986.
+#
+# From Thomas S. Mullaney (2008-02-11):
+# I think you're combining two subjects that need to treated 
+# separately: daylight savings (which, you're correct, wasn't 
+# implemented until the 1980s) and the unified time zone centered near 
+# Beijing (which was implemented in 1949). Briefly, there was also a 
+# "Lhasa Time" in Tibet and "Urumqi Time" in Xinjiang. The first was 
+# ceased, and the second eventually recognized (again, in the 1980s).
+#
+# From Paul Eggert (2008-06-30):
+# There seems to be a good chance China switched to a single time zone in 1949
+# rather than in 1980 as Shanks & Pottenger have it, but we don't have a
+# reliable documentary source saying so yet, so for now we still go with
+# Shanks & Pottenger.
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 # Changbai Time ("Long-white Time", Long-white = Heilongjiang area)
@@ -446,13 +468,13 @@
 
 # India
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Calcutta	5:53:28 -	LMT	1880	# Kolkata
+Zone	Asia/Kolkata	5:53:28 -	LMT	1880	# Kolkata
 			5:53:20	-	HMT	1941 Oct    # Howrah Mean Time?
 			6:30	-	BURT	1942 May 15 # Burma Time
 			5:30	-	IST	1942 Sep
 			5:30	1:00	IST	1945 Oct 15
 			5:30	-	IST
-# The following are like Asia/Calcutta:
+# The following are like Asia/Kolkata:
 #	Andaman Is
 #	Lakshadweep (Laccadive, Minicoy and Amindivi Is)
 #	Nicobar Is
@@ -660,6 +682,21 @@
 #
 # So we'll ignore the Economist's claim.
 
+# From Steffen Thorsen (2008-03-10):
+# The cabinet in Iraq abolished DST last week, according to the following
+# news sources (in Arabic):
+# 
+# http://www.aljeeran.net/wesima_articles/news-20080305-98602.html
+# 
+# 
+# http://www.aswataliraq.info/look/article.tpl?id=2047&IdLanguage=17&IdPublication=4&NrArticle=71743&NrIssue=1&NrSection=10
+# 
+#
+# We have published a short article in English about the change:
+# 
+# http://www.timeanddate.com/news/time/iraq-dumps-daylight-saving.html
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Iraq	1982	only	-	May	1	0:00	1:00	D
 Rule	Iraq	1982	1984	-	Oct	1	0:00	0	S
@@ -670,8 +707,8 @@
 # IATA SSIM (1991/1996) says Apr 1 12:01am UTC; guess the `:01' is a typo.
 # Shanks & Pottenger say Iraq did not observe DST 1992/1997; ignore this.
 #
-Rule	Iraq	1991	max	-	Apr	 1	3:00s	1:00	D
-Rule	Iraq	1991	max	-	Oct	 1	3:00s	0	S
+Rule	Iraq	1991	2007	-	Apr	 1	3:00s	1:00	D
+Rule	Iraq	1991	2007	-	Oct	 1	3:00s	0	S
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Baghdad	2:57:40	-	LMT	1890
 			2:57:36	-	BMT	1918	    # Baghdad Mean Time?
@@ -1361,6 +1398,42 @@
 # They decided not to adopt daylight-saving time....
 # http://www.mongolnews.mn/index.php?module=unuudur&sec=view&id=15742
 
+# From Deborah Goldsmith (2008-03-30):
+# We received a bug report claiming that the tz database UTC offset for
+# Asia/Choibalsan (GMT+09:00) is incorrect, and that it should be GMT
+# +08:00 instead. Different sources appear to disagree with the tz
+# database on this, e.g.:
+#
+# 
+# http://www.timeanddate.com/worldclock/city.html?n=1026
+# 
+# 
+# http://www.worldtimeserver.com/current_time_in_MN.aspx
+# 
+#
+# both say GMT+08:00.
+
+# From Steffen Thorsen (2008-03-31):
+# eznis airways, which operates several domestic flights, has a flight
+# schedule here:
+# 
+# http://www.eznis.com/Container.jsp?id=112
+# 
+# (click the English flag for English)
+#
+# There it appears that flights between Choibalsan and Ulaanbatar arrive
+# about 1:35 - 1:50 hours later in local clock time, no matter the
+# direction, while Ulaanbaatar-Khvod takes 2 hours in the Eastern
+# direction and 3:35 back, which indicates that Ulaanbatar and Khvod are
+# in different time zones (like we know about), while Choibalsan and
+# Ulaanbatar are in the same time zone (correction needed).
+
+# From Arthur David Olson (2008-05-19):
+# Assume that Choibalsan is indeed offset by 8:00.
+# XXX--in the absence of better information, assume that transition
+# was at the start of 2008-03-31 (the day of Steffen Thorsen's report);
+# this is almost surely wrong.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Mongol	1983	1984	-	Apr	1	0:00	1:00	S
 Rule	Mongol	1983	only	-	Oct	1	0:00	0	-
@@ -1396,7 +1469,8 @@
 Zone	Asia/Choibalsan	7:38:00 -	LMT	1905 Aug
 			7:00	-	ULAT	1978
 			8:00	-	ULAT	1983 Apr
-			9:00	Mongol	CHO%sT	# Choibalsan Time
+			9:00	Mongol	CHO%sT	2008 Mar 31 # Choibalsan Time
+			8:00	Mongol	CHO%sT
 
 # Nepal
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
@@ -1446,10 +1520,45 @@
 # The minister told a news conference that the experiment had rather
 # shown 8 per cent higher consumption of electricity.
 
+# From Alex Krivenyshev (2008-05-15):
+# 
+# Here is an article that Pakistan plan to introduce Daylight Saving Time 
+# on June 1, 2008 for 3 months.
+# 
+# "... The federal cabinet on Wednesday announced a new conservation plan to help 
+# reduce load shedding by approving the closure of commercial centres at 9pm and 
+# moving clocks forward by one hour for the next three months. 
+# ...."
+# 
+# 
+# http://www.worldtimezone.net/dst_news/dst_news_pakistan01.html
+# 
+# OR
+# 
+# http://www.dailytimes.com.pk/default.asp?page=2008%5C05%5C15%5Cstory_15-5-2008_pg1_4
+# 
+
+# From Arthur David Olson (2008-05-19):
+# XXX--midnight transitions is a guess; 2008 only is a guess.
+
+# From Alexander Krivenyshev (2008-08-28):
+# Pakistan government has decided to keep the watches one-hour advanced
+# for another 2 months--plan to return to Standard Time on October 31
+# instead of August 31.
+#
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_pakistan02.html
+# 
+# OR
+# 
+# http://dailymailnews.com/200808/28/news/dmbrn03.html
+# 
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule Pakistan	2002	only	-	Apr	Sun>=2	0:01	1:00	S
 Rule Pakistan	2002	only	-	Oct	Sun>=2	0:01	0	-
+Rule Pakistan	2008	only	-	Jun	1	0:00	1:00	S
+Rule Pakistan	2008	only	-	Nov	1	0:00	0	-
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Karachi	4:28:12 -	LMT	1907
 			5:30	-	IST	1942 Sep
@@ -1569,6 +1678,23 @@
 # For lack of better information, predict that future changes will be
 # the 2nd Thursday of September at 02:00.
 
+# From Alexander Krivenyshev (2008-08-28):
+# Here is an article, that Mideast running on different clocks at Ramadan.
+#
+# Gaza Strip (as Egypt) ended DST at midnight Thursday (Aug 28, 2008), while
+# the West Bank will end Daylight Saving Time at midnight Sunday (Aug 31, 2008).
+#
+# 
+# http://www.guardian.co.uk/world/feedarticle/7759001
+# 
+# 
+# http://www.abcnews.go.com/International/wireStory?id=5676087
+# 
+# or
+# 
+# http://www.worldtimezone.com/dst_news/dst_news_gazastrip01.html
+# 
+
 # The rules for Egypt are stolen from the `africa' file.
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule EgyptAsia	1957	only	-	May	10	0:00	1:00	S
@@ -1584,7 +1710,8 @@
 Rule Palestine	2005	only	-	Oct	 4	2:00	0	-
 Rule Palestine	2006	max	-	Apr	 1	0:00	1:00	S
 Rule Palestine	2006	only	-	Sep	22	0:00	0	-
-Rule Palestine	2007	max	-	Sep	Thu>=8	2:00	0	-
+Rule Palestine	2007	only	-	Sep	Thu>=8	2:00	0	-
+Rule Palestine	2008	max	-	Aug	lastThu	2:00	0	-
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Gaza	2:17:52	-	LMT	1900 Oct
@@ -1687,7 +1814,7 @@
 # kept their clocks set five and a half hours ahead of Greenwich Mean
 # Time (GMT), in line with neighbor India.
 # From Paul Eggert (2006-04-18):
-# People who live in regions under Tamil control can use TZ='Asia/Calcutta',
+# People who live in regions under Tamil control can use [TZ='Asia/Kolkata'],
 # as that zone has agreed with the Tamil areas since our cutoff date of 1970.
 
 # From K Sethu (2006-04-25):
@@ -1777,9 +1904,7 @@
 # From Paul Eggert (2007-03-29):
 # Today the AP reported "Syria will switch to summertime at midnight Thursday."
 # http://www.iht.com/articles/ap/2007/03/29/africa/ME-GEN-Syria-Time-Change.php
-# For lack of better info, assume the rule changed to "last Friday in March"
-# this year.
-Rule	Syria	2007	max	-	Mar	lastFri	0:00	1:00	S
+Rule	Syria	2007	only	-	Mar	lastFri	0:00	1:00	S
 # From Jesper Norgard (2007-10-27):
 # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will
 # not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or
@@ -1801,10 +1926,52 @@
 # Council of Ministers also approved the commencement of work on 
 # identifying the winter time as of Friday, 2/11/2007 where the 60th 
 # minute delay at midnight Thursday 1/11/2007.
+Rule	Syria	2007	only	-	Nov	 Fri>=1	0:00	0	-
+
+# From Stephen Colebourne (2008-03-17):
+# For everyone's info, I saw an IATA time zone change for [Syria] for
+# this month (March 2008) in the last day or so...This is the data IATA
+# are now using:
+# Country     Time Standard   --- DST Start ---   --- DST End ---  DST
+# Name        Zone Variation   Time    Date        Time    Date
+# Variation
+# Syrian Arab
+# Republic    SY    +0200      2200  03APR08       2100  30SEP08   +0300
+#                              2200  02APR09       2100  30SEP09   +0300
+#                              2200  01APR10       2100  30SEP10   +0300
+
+# From Arthur David Olson (2008-03-17):
+# Here's a link to English-language coverage by the Syrian Arab News
+# Agency (SANA)...
+# 
+# http://www.sana.sy/eng/21/2008/03/11/165173.htm
+# ...which reads (in part) "The Cabinet approved the suggestion of the
+# Ministry of Electricity to begin daylight savings time on Friday April
+# 4th, advancing clocks one hour ahead on midnight of Thursday April 3rd."
+# Since Syria is two hours east of UTC, the 2200 and 2100 transition times
+# shown above match up with midnight in Syria.
+
+# From Arthur David Olson (2008-03-18):
+# My buest guess at a Syrian rule is "the Friday nearest April 1";
+# coding that involves either using a "Mar Fri>=29" construct that old time zone
+# compilers can't handle  or having multiple Rules (a la Israel).
+# For now, use "Apr Fri>=1", and go with IATA on a uniform Sep 30 end.
+
+# From Steffen Thorsen (2008-10-07):
+# Syria has now officially decided to end DST on 2008-11-01 this year,
+# according to the following article in the Syrian Arab News Agency (SANA).
+#
+# The article is in Arabic, and seems to tell that they will go back to
+# winter time on 2008-11-01 at 00:00 local daylight time (delaying/setting
+# clocks back 60 minutes).
 #
-# From Arthur David Olson (2007-10-30):
-# My best guess for the future is first Friday in November.
-Rule	Syria	2007	max	-	Nov	 Fri>=1	0:00	0	-
+# 
+# http://sana.sy/ara/2/2008/10/07/195459.htm
+# 
+
+Rule	Syria	2008	max	-	Apr	Fri>=1	0:00	1:00	S
+Rule	Syria	2008	max	-	Nov	1	0:00	0	-
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Asia/Damascus	2:25:12 -	LMT	1920	# Dimashq
 			2:00	Syria	EE%sT
@@ -1858,13 +2025,13 @@
 
 # Vietnam
 
-# From Paul Eggert (1993-11-18):
-# Saigon's official name is Thanh-Pho Ho Chi Minh, but it's too long.
-# We'll stick with the traditional name for now.
+# From Arthur David Olson (2008-03-18):
+# The English-language name of Vietnam's most populous city is "Ho Chi Min City";
+# we use Ho_Chi_Minh below to avoid a name of more than 14 characters.
 
 # From Shanks & Pottenger:
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
-Zone	Asia/Saigon	7:06:40 -	LMT	1906 Jun  9
+Zone	Asia/Ho_Chi_Minh	7:06:40 -	LMT	1906 Jun  9
 			7:06:20	-	SMT	1911 Mar 11 0:01 # Saigon MT?
 			7:00	-	ICT	1912 May
 			8:00	-	ICT	1931 May
Index: europe
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/europe,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/europe -L share/zoneinfo/europe -u -r1.4 -r1.5
--- share/zoneinfo/europe
+++ share/zoneinfo/europe
@@ -1,4 +1,4 @@
-# @(#)europe	8.12
+# @(#)europe	8.18
 #  
 # This data is by no means authoritative; if you think you know better,
@@ -457,7 +457,7 @@
 Rule	EU	1981	max	-	Mar	lastSun	 1:00u	1:00	S
 Rule	EU	1996	max	-	Oct	lastSun	 1:00u	0	-
 # The most recent directive covers the years starting in 2002.  See:
-# 
 # Directive 2000/84/EC of the European Parliament and of the Council
 # of 19 January 2001 on summer-time arrangements.
 # 
@@ -480,9 +480,48 @@
 Rule	C-Eur	1942	only	-	Nov	 2	 2:00s	0	-
 Rule	C-Eur	1943	only	-	Mar	29	 2:00s	1:00	S
 Rule	C-Eur	1943	only	-	Oct	 4	 2:00s	0	-
-Rule	C-Eur	1944	only	-	Apr	 3	 2:00s	1:00	S
+Rule	C-Eur	1944	1945	-	Apr	Mon>=1	 2:00s	1:00	S
 # Whitman gives 1944 Oct 7; go with Shanks & Pottenger.
 Rule	C-Eur	1944	only	-	Oct	 2	 2:00s	0	-
+# From Jesper Norgaard Welen (2008-07-13):
+#
+# I found what is probably a typo of 2:00 which should perhaps be 2:00s
+# in the C-Eur rule from tz database version 2008d (this part was
+# corrected in version 2008d). The circumstancial evidence is simply the
+# tz database itself, as seen below:
+#
+# Zone Europe/Paris 0:09:21 - LMT 1891 Mar 15  0:01
+#    0:00 France WE%sT 1945 Sep 16  3:00
+#
+# Zone Europe/Monaco 0:29:32 - LMT 1891 Mar 15
+#    0:00 France WE%sT 1945 Sep 16 3:00
+#
+# Zone Europe/Belgrade 1:22:00 - LMT 1884
+#    1:00 1:00 CEST 1945 Sep 16  2:00s
+#
+# Rule France 1945 only - Sep 16  3:00 0 -
+# Rule Belgium 1945 only - Sep 16  2:00s 0 -
+# Rule Neth 1945 only - Sep 16 2:00s 0 -
+#
+# The rule line to be changed is:
+#
+# Rule C-Eur 1945 only - Sep 16  2:00 0 -
+#
+# It seems that Paris, Monaco, Rule France, Rule Belgium all agree on
+# 2:00 standard time, e.g. 3:00 local time.  However there are no
+# countries that use C-Eur rules in September 1945, so the only items
+# affected are apparently these ficticious zones that translates acronyms
+# CET and MET:
+#
+# Zone CET  1:00 C-Eur CE%sT
+# Zone MET  1:00 C-Eur ME%sT
+#
+# It this is right then the corrected version would look like:
+#
+# Rule C-Eur 1945 only - Sep 16  2:00s 0 -
+#
+# A small step for mankind though 8-)
+Rule	C-Eur	1945	only	-	Sep	16	 2:00s	0	-
 Rule	C-Eur	1977	1980	-	Apr	Sun>=1	 2:00s	1:00	S
 Rule	C-Eur	1977	only	-	Sep	lastSun	 2:00s	0	-
 Rule	C-Eur	1978	only	-	Oct	 1	 2:00s	0	-
@@ -725,7 +764,8 @@
 Zone	Europe/Sofia	1:33:16 -	LMT	1880
 			1:56:56	-	IMT	1894 Nov 30 # Istanbul MT?
 			2:00	-	EET	1942 Nov  2  3:00
-			1:00	C-Eur	CE%sT	1945 Apr  2  3:00
+			1:00	C-Eur	CE%sT	1945
+			1:00	-	CET	1945 Apr 2 3:00
 			2:00	-	EET	1979 Mar 31 23:00
 			2:00	Bulg	EE%sT	1982 Sep 26  2:00
 			2:00	C-Eur	EE%sT	1991
@@ -1093,33 +1133,40 @@
 # [See tz-link.htm for the URL.]
 
 # From Joerg Schilling (2002-10-23):
-# In 1945, Berlin was switched to Moscow Summer time (GMT+4) by 
+# In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
+# 
 # General [Nikolai] Bersarin.
 
 # From Paul Eggert (2003-03-08):
 # 
+# http://www.parlament-berlin.de/pds-fraktion.nsf/727459127c8b66ee8525662300459099/defc77cb784f180ac1256c2b0030274b/$FILE/bersarint.pdf
+# 
 # says that Bersarin issued an order to use Moscow time on May 20.
 # However, Moscow did not observe daylight saving in 1945, so
 # this was equivalent to CEMT (GMT+3), not GMT+4.
 
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Germany	1945	only	-	Apr	 2	2:00s	1:00	S
-Rule	Germany	1945	only	-	May	24	2:00	2:00	M # Midsummer
-Rule	Germany	1945	only	-	Sep	24	3:00	1:00	S
-Rule	Germany	1945	only	-	Nov	18	2:00s	0	-
 Rule	Germany	1946	only	-	Apr	14	2:00s	1:00	S
 Rule	Germany	1946	only	-	Oct	 7	2:00s	0	-
 Rule	Germany	1947	1949	-	Oct	Sun>=1	2:00s	0	-
-Rule	Germany	1947	only	-	Apr	 6	2:00s	1:00	S
+# http://www.ptb.de/de/org/4/44/441/salt.htm says the following transition
+# occurred at 3:00 MEZ, not the 2:00 MEZ given in Shanks & Pottenger.
+# Go with the PTB.
+Rule	Germany	1947	only	-	Apr	 6	3:00s	1:00	S
 Rule	Germany	1947	only	-	May	11	2:00s	2:00	M
 Rule	Germany	1947	only	-	Jun	29	3:00	1:00	S
 Rule	Germany	1948	only	-	Apr	18	2:00s	1:00	S
 Rule	Germany	1949	only	-	Apr	10	2:00s	1:00	S
+
+Rule SovietZone	1945	only	-	May	24	2:00	2:00	M # Midsummer
+Rule SovietZone	1945	only	-	Sep	24	3:00	1:00	S
+Rule SovietZone	1945	only	-	Nov	18	2:00s	0	-
+
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Berlin	0:53:28 -	LMT	1893 Apr
-			1:00	C-Eur	CE%sT	1945 Apr 2 2:00
+			1:00	C-Eur	CE%sT	1945 May 24 2:00
+			1:00 SovietZone	CE%sT	1946
 			1:00	Germany	CE%sT	1980
 			1:00	EU	CE%sT
 
@@ -1196,7 +1243,7 @@
 Zone	Europe/Budapest	1:16:20 -	LMT	1890 Oct
 			1:00	C-Eur	CE%sT	1918
 			1:00	Hungary	CE%sT	1941 Apr  6  2:00
-			1:00	C-Eur	CE%sT	1945 May  1 23:00
+			1:00	C-Eur	CE%sT	1945
 			1:00	Hungary	CE%sT	1980 Sep 28  2:00s
 			1:00	EU	CE%sT
 
@@ -2113,7 +2160,8 @@
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	Europe/Belgrade	1:22:00	-	LMT	1884
 			1:00	-	CET	1941 Apr 18 23:00
-			1:00	C-Eur	CE%sT	1945 May  8  2:00s
+			1:00	C-Eur	CE%sT	1945
+			1:00	-	CET	1945 May 8 2:00s
 			1:00	1:00	CEST	1945 Sep 16  2:00s
 # Metod Kozelj reports that the legal date of
 # transition to EU rules was 1982-11-27, for all of Yugoslavia at the time.
@@ -2305,6 +2353,27 @@
 # (on a non-government server though) describing dates between 2002 and 2006:
 # http://www.alomaliye.com/bkk_2002_3769.htm
 
+# From Sue Williams (2008-08-11):
+# I spotted this news article about a potential change in Turkey.
+#
+# 
+# http://www.hurriyet.com.tr/english/domestic/9626174.asp?scr=1
+# 
+
+# From Sue Williams (2008-08-20):
+# This article says that around the end of March 2011, Turkey wants to
+# adjust the clocks forward by 1/2 hour and stay that way permanently.
+# The article indicates that this is a change in timezone offset in addition
+# to stopping observance of DST.
+# This proposal has not yet been approved.
+#
+# Read more here...
+#
+# Turkey to abandon daylight saving time in 2011
+# 
+# http://www.turkishdailynews.com.tr/article.php?enewsid=112989
+# 
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Turkey	1916	only	-	May	 1	0:00	1:00	S
 Rule	Turkey	1916	only	-	Oct	 1	0:00	0	-
Index: northamerica
===================================================================
RCS file: /home/cvs/src/share/zoneinfo/northamerica,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/zoneinfo/northamerica -L share/zoneinfo/northamerica -u -r1.4 -r1.5
--- share/zoneinfo/northamerica
+++ share/zoneinfo/northamerica
@@ -1,4 +1,4 @@
-# @(#)northamerica	8.20
+# @(#)northamerica	8.24
 #  
 # also includes Central America and the Caribbean
@@ -2076,8 +2076,8 @@
 # http://www.jonesbahamas.com/?c=45&a=10412
 
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
-Rule	Bahamas	1964	2006	-	Oct	lastSun	2:00	0	S
-Rule	Bahamas	1964	1986	-	Apr	lastSun	2:00	1:00	D
+Rule	Bahamas	1964	1975	-	Oct	lastSun	2:00	0	S
+Rule	Bahamas	1964	1975	-	Apr	lastSun	2:00	1:00	D
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Nassau	-5:09:24 -	LMT	1912 Mar 2
 			-5:00	Bahamas	E%sT	1976
@@ -2205,6 +2205,52 @@
 # 
 # http://www.worldtimezone.com/dst_news/dst_news_cuba03.html
 
+# From Arthur David Olson (2008-03-09):
+# I'm in Maryland which is now observing United States Eastern Daylight
+# Time. At 9:44 local time I used RealPlayer to listen to
+# 
+# http://media.enet.cu/radioreloj
+# , a Cuban information station, and heard
+# the time announced as "ocho cuarenta y cuatro" ("eight forty-four"),
+# indicating that Cuba is still on standard time.
+
+# From Steffen Thorsen (2008-03-12):
+# It seems that Cuba will start DST on Sunday, 2007-03-16...
+# It was announced yesterday, according to this source (in Spanish):
+# 
+# http://www.nnc.cubaweb.cu/marzo-2008/cien-1-11-3-08.htm
+# 
+#
+# Some more background information is posted here:
+# 
+# http://www.timeanddate.com/news/time/cuba-starts-dst-march-16.html
+# 
+#
+# The article also says that Cuba has been observing DST since 1963,
+# while Shanks (and tzdata) has 1965 as the first date (except in the
+# 1940's). Many other web pages in Cuba also claim that it has been
+# observed since 1963, but with the exception of 1970 - an exception
+# which is not present in tzdata/Shanks. So there is a chance we need to
+# change some historic records as well.
+#
+# One example:
+# 
+# http://www.radiohc.cu/espanol/noticias/mar07/11mar/hor.htm
+# 
+
+# From Jesper Norgaard Welen (2008-03-13):
+# The Cuban time change has just been confirmed on the most authoritative
+# web site, the Granma.  Please check out
+# 
+# http://www.granma.cubaweb.cu/2008/03/13/nacional/artic10.html
+# 
+#
+# Basically as expected after Steffen Thorsens information, the change
+# will take place midnight between Saturday and Sunday.
+
+# From Arthur David Olson (2008-03-12):
+# Assume Sun>=15 (third Sunday) going forward.
+
 # Rule	NAME	FROM	TO	TYPE	IN	ON	AT	SAVE	LETTER/S
 Rule	Cuba	1928	only	-	Jun	10	0:00	1:00	D
 Rule	Cuba	1928	only	-	Oct	10	0:00	0	S
@@ -2236,7 +2282,8 @@
 Rule	Cuba	1998	2003	-	Oct	lastSun	0:00s	0	S
 Rule	Cuba	2000	2006	-	Apr	Sun>=1	0:00s	1:00	D
 Rule	Cuba	2006	max	-	Oct	lastSun	0:00s	0	S
-Rule	Cuba	2007	max	-	Mar	Sun>=8	0:00s	1:00	D
+Rule	Cuba	2007	only	-	Mar	Sun>=8	0:00s	1:00	D
+Rule	Cuba	2008	max	-	Mar	Sun>=15	0:00s	1:00	D
 
 # Zone	NAME		GMTOFF	RULES	FORMAT	[UNTIL]
 Zone	America/Havana	-5:29:28 -	LMT	1890

From laffer1 at midnightbsd.org  Thu Jan  1 17:52:48 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 17:52:48 -0500 (EST)
Subject: [Midnightbsd-cvs] src: UPDATING: timezones are fun
Message-ID: <200901012252.n01Mqmck050859@stargazer.midnightbsd.org>

Log Message:
-----------
timezones are fun

Modified Files:
--------------
    src:
        UPDATING (r1.46 -> r1.47)

-------------- next part --------------
Index: UPDATING
===================================================================
RCS file: /home/cvs/src/UPDATING,v
retrieving revision 1.46
retrieving revision 1.47
diff -L UPDATING -L UPDATING -u -r1.46 -r1.47
--- UPDATING
+++ UPDATING
@@ -3,6 +3,9 @@
 Items affecting the mports and packages system can be found in
 /usr/mports/UPDATING. 
 
+20080101:
+	Update time zone data to 2008i.
+
 20081231:
 	Correct a problem where bluetooth and netgraph sockets are not
 	properly initialized.

From laffer1 at midnightbsd.org  Thu Jan  1 18:28:15 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 18:28:15 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: lang/php5: work in progress..
Message-ID: <200901012328.n01NSFE9053770@stargazer.midnightbsd.org>

Log Message:
-----------
work in progress.. upgrade php to 5.2.8

Modified Files:
--------------
    mports/lang/php5:
        Makefile (r1.21 -> r1.22)
        Makefile.ext (r1.10 -> r1.11)
        distinfo (r1.9 -> r1.10)
    mports/lang/php5/files:
        patch-configure.in (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile.ext
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile.ext,v
retrieving revision 1.10
retrieving revision 1.11
diff -L lang/php5/Makefile.ext -L lang/php5/Makefile.ext -u -r1.10 -r1.11
--- lang/php5/Makefile.ext
+++ lang/php5/Makefile.ext
@@ -74,6 +74,10 @@
 CONFIGURE_ARGS+=--enable-exif
 .endif
 
+.if ${PHP_MODNAME} == "filter"
+CONFIGURE_ARGS+=--enable-filter
+.endif
+
 .if ${PHP_MODNAME} == "ftp"
 CONFIGURE_ARGS+=--enable-ftp \
 		--with-openssl-dir=${OPENSSLBASE}
@@ -118,6 +122,10 @@
 CONFIGURE_ARGS+=--with-gmp=${LOCALBASE}
 .endif
 
+.if ${PHP_MODNAME} == "hash"
+CONFIGURE_ARGS+=--enable-hash
+.endif
+
 .if ${PHP_MODNAME} == "iconv"
 CONFIGURE_ARGS+=--with-iconv=${LOCALBASE} \
 		--with-iconv-dir=${LOCALBASE}
@@ -140,10 +148,13 @@
 .if ${PHP_MODNAME} == "interbase"
 CONFIGURE_ARGS+=--with-interbase=${LOCALBASE}
 
-USE_GCC=	3.4+
 USE_FIREBIRD=	yes
 .endif
 
+.if ${PHP_MODNAME} == "json"
+CONFIGURE_ARGS+=--enable-json
+.endif
+
 .if ${PHP_MODNAME} == "ldap"
 CONFIGURE_ARGS+=--with-ldap=${LOCALBASE}
 
@@ -224,8 +235,7 @@
 .endif
 
 .if ${PHP_MODNAME} == "openssl"
-CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE} \
-		--with-openssl-dir=${OPENSSLBASE}
+CONFIGURE_ARGS+=--with-openssl=${OPENSSLBASE}
 
 LDFLAGS+=	-L${OPENSSLLIB} -lcrypto -lssl
 USE_OPENSSL=	yes
@@ -260,7 +270,6 @@
 USE_PHP=	pdo
 USE_PHP_BUILD=	yes
 
-USE_GCC=	3.4+
 USE_FIREBIRD=	yes
 .endif
 
@@ -373,7 +382,6 @@
 		--with-libxml-dir=${LOCALBASE}
 
 USE_GNOME=	libxml2
-USE_GCC=	3.4+
 
 USE_PHP=	session
 USE_PHP_BUILD=	yes
@@ -490,6 +498,11 @@
 USE_PHP_BUILD=	yes
 .endif
 
+.if ${PHP_MODNAME} == "zip"
+CONFIGURE_ARGS+=--enable-zip \
+		--with-zlib-dir=/usr
+.endif
+
 .if ${PHP_MODNAME} == "zlib"
 CONFIGURE_ARGS+=--with-zlib=/usr
 .endif
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.21
retrieving revision 1.22
diff -L lang/php5/Makefile -L lang/php5/Makefile -u -r1.21 -r1.22
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	php5
-PORTVERSION=	5.2.6
-PORTREVISION?=	4
+PORTVERSION=	5.2.8
+PORTREVISION?=	0
 CATEGORIES?=	lang devel www
 MASTER_SITES=	${MASTER_SITE_PHP:S/$/:release/}
 MASTER_SITE_SUBDIR=	distributions/:release
@@ -56,7 +56,7 @@
 .include 
 
 .if !defined(WITHOUT_SUHOSIN)
-PATCHFILES+=	suhosin-patch-${PORTVERSION}-0.9.6.2.patch.gz:suhosin
+PATCHFILES+=	suhosin-patch-5.2.7-0.9.6.3.patch.gz:suhosin
 PATCH_SITES+=	http://download.suhosin.org/:suhosin
 PATCH_DIST_STRIP=	-p1
 PLIST_SUB+=	SUHOSIN=""
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/php5/distinfo,v
retrieving revision 1.9
retrieving revision 1.10
diff -L lang/php5/distinfo -L lang/php5/distinfo -u -r1.9 -r1.10
--- lang/php5/distinfo
+++ lang/php5/distinfo
@@ -1,9 +1,9 @@
-MD5 (php-5.2.6.tar.bz2) = 7380ffecebd95c6edb317ef861229ebd
-SHA256 (php-5.2.6.tar.bz2) = 1892b2dd50b56ae2c9aec027fcd9035b76673f113555bc2bc1007bab8ae4db81
-SIZE (php-5.2.6.tar.bz2) = 9571312
-MD5 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = f2ec986341a314c271259dbe4d940858
-SHA256 (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = dfdae803778e6ed6854ea3ad2948bbfedbfffc5a32dbc75a657b99092a9cc5e4
-SIZE (suhosin-patch-5.2.6-0.9.6.2.patch.gz) = 22986
-MD5 (php-5.2.6-mail-header.patch) = eb26be2469a173a3476220342c5fcd58
-SHA256 (php-5.2.6-mail-header.patch) = 7e546c22a19386c4d93bebddfb64ace9447774f748070794c7c41419c5c474ac
-SIZE (php-5.2.6-mail-header.patch) = 3420
+MD5 (php-5.2.8.tar.bz2) = 8760a833cf10433d3e72271ab0d0eccf
+SHA256 (php-5.2.8.tar.bz2) = a70600e13410213a637f1c9825e9c0d45c64de8cefb1929f8f5aa761b20b2b67
+SIZE (php-5.2.8.tar.bz2) = 9827180
+MD5 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = d455c3dd5b652046dbac2951a58f64fa
+SHA256 (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 85e6262f53014e393977d1efed2d3a7e686767a07f96b14b2c3f126f694aee46
+SIZE (suhosin-patch-5.2.7-0.9.6.3.patch.gz) = 23125
+MD5 (php-5.2.8-mail-header.patch) = 74bf3a2a123c284f908c4f5483ebe886
+SHA256 (php-5.2.8-mail-header.patch) = 9bd306145153a371f619d89996cb329bdc36791b22a50daf4afe7cc69c46dccb
+SIZE (php-5.2.8-mail-header.patch) = 3381
Index: patch-configure.in
===================================================================
RCS file: /home/cvs/mports/lang/php5/files/patch-configure.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lang/php5/files/patch-configure.in -L lang/php5/files/patch-configure.in -u -r1.2 -r1.3
--- lang/php5/files/patch-configure.in
+++ lang/php5/files/patch-configure.in
@@ -1,6 +1,6 @@
---- configure.in.orig	Mon Jun  4 08:08:43 2007
-+++ configure.in	Mon Jun  4 08:13:47 2007
-@@ -233,7 +233,6 @@
+--- configure.in.orig	2008-12-05 07:58:47.000000000 +0100
++++ configure.in	2008-12-05 08:02:26.000000000 +0100
+@@ -270,7 +270,6 @@
  dnl .
  dnl -------------------------------------------------------------------------
  
@@ -8,7 +8,7 @@
  PHP_HELP_SEPARATOR([SAPI modules:])
  PHP_SHLIB_SUFFIX_NAMES
  PHP_SAPI=default
-@@ -258,7 +257,6 @@
+@@ -295,7 +294,6 @@
  
  if test "$enable_maintainer_zts" = "yes"; then
    PTHREADS_ASSIGN_VARS
@@ -16,7 +16,7 @@
  fi
  
  divert(3)
-@@ -1123,7 +1121,7 @@
+@@ -1136,7 +1134,7 @@
  EXPANDED_DATADIR=$datadir
  EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
  EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
@@ -25,13 +25,13 @@
  
  exec_prefix=$old_exec_prefix
  libdir=$old_libdir
-@@ -1295,22 +1293,19 @@
+@@ -1344,22 +1342,19 @@
  INLINE_CFLAGS="$INLINE_CFLAGS $standard_libtool_flag"
  CXXFLAGS="$CXXFLAGS $standard_libtool_flag"
  
--all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET)"
+-all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET)"
 -install_targets="$install_modules install-build install-headers install-programs $install_pear"
-+all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)"
++all_targets="$lcov_target \$(OVERALL_TARGET) \$(PHP_MODULES) \$(PHP_ZEND_EX) \$(PHP_CLI_TARGET) \$(PHP_CGI_TARGET)"
 +install_targets="$PHP_INSTALL_CLI_TARGET $PHP_INSTALL_CGI_TARGET $install_modules install-build install-headers install-programs $install_pear"
  
  case $PHP_SAPI in

From laffer1 at midnightbsd.org  Thu Jan  1 18:29:20 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 18:29:20 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: patch-main_safe_mode.c: remove outdated
	patch
Message-ID: <200901012329.n01NTKPF053844@stargazer.midnightbsd.org>

Log Message:
-----------
remove outdated patch

Removed Files:
-------------
    mports/lang/php5/files:
        patch-main_safe_mode.c

-------------- next part --------------
--- lang/php5/files/patch-main_safe_mode.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- main/safe_mode.c.orig	2008-09-04 15:52:19.000000000 +0200
-+++ main/safe_mode.c	2008-09-04 15:52:35.000000000 +0200
-@@ -74,14 +74,6 @@
- 		}
- 	}
- 
--	/* 
--	 * If given filepath is a URL, allow - safe mode stuff
--	 * related to URL's is checked in individual functions
--	 */
--	wrapper = php_stream_locate_url_wrapper(filename, NULL, STREAM_LOCATE_WRAPPERS_ONLY TSRMLS_CC);
--	if (wrapper != NULL)
--		return 1;
--		
- 	/* First we see if the file is owned by the same user...
- 	 * If that fails, passthrough and check directory...
- 	 */

From laffer1 at midnightbsd.org  Thu Jan  1 18:49:21 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 18:49:21 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: We don't support php 4
Message-ID: <200901012349.n01NnLst055525@stargazer.midnightbsd.org>

Log Message:
-----------
We don't support php 4

Modified Files:
--------------
    mports/lang/php5-extensions:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5-extensions/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L lang/php5-extensions/Makefile -L lang/php5-extensions/Makefile -u -r1.5 -r1.6
--- lang/php5-extensions/Makefile
+++ lang/php5-extensions/Makefile
@@ -19,7 +19,6 @@
 LICENSE=	agg
 
 DEFAULT_PHP_VER=5
-IGNORE_WITH_PHP=4
 USE_PHP_BUILD=	yes
 
 NO_BUILD=	yes

From laffer1 at midnightbsd.org  Thu Jan  1 19:26:38 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 19:26:38 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: x11/xterm: update to 237
Message-ID: <200901020026.n020QcD1058841@stargazer.midnightbsd.org>

Log Message:
-----------
update to 237

Modified Files:
--------------
    mports/x11/xterm:
        Makefile (r1.9 -> r1.10)
        distinfo (r1.8 -> r1.9)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/xterm/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L x11/xterm/Makefile -L x11/xterm/Makefile -u -r1.9 -r1.10
--- x11/xterm/Makefile
+++ x11/xterm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	xterm
-PORTVERSION=	235
+PORTVERSION=	237
 CATEGORIES=	x11
 MASTER_SITES=	ftp://invisible-island.net/xterm/ \
 		http://voodoo.bawue.com/download/
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11/xterm/distinfo,v
retrieving revision 1.8
retrieving revision 1.9
diff -L x11/xterm/distinfo -L x11/xterm/distinfo -u -r1.8 -r1.9
--- x11/xterm/distinfo
+++ x11/xterm/distinfo
@@ -1,3 +1,3 @@
-MD5 (xterm-235.tgz) = 5060cab9cef0ea09a24928f3c7fbde2b
-SHA256 (xterm-235.tgz) = c8a7ccb515b967a11dc2ac1061943cddbf0b6640de89f72590b1ff79e69a49cf
-SIZE (xterm-235.tgz) = 857714
+MD5 (xterm-237.tgz) = 6d5f9e124fd3e09487f47c66da8c7345
+SHA256 (xterm-237.tgz) = f3be160c230fcb38fba0824cf8a4334e8ff0bb93938e5e325be5e949cd2b3476
+SIZE (xterm-237.tgz) = 860424

From laffer1 at midnightbsd.org  Thu Jan  1 19:48:42 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 19:48:42 -0500 (EST)
Subject: [Midnightbsd-cvs] src: Makefile: geeze,
	fix the build/install of liblwres
Message-ID: <200901020048.n020mgAI060772@stargazer.midnightbsd.org>

Log Message:
-----------
geeze, fix the build/install of liblwres

Modified Files:
--------------
    src/lib/bind/lwres:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/bind/lwres/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L lib/bind/lwres/Makefile -L lib/bind/lwres/Makefile -u -r1.6 -r1.7
--- lib/bind/lwres/Makefile
+++ lib/bind/lwres/Makefile
@@ -10,7 +10,7 @@
 
 # Unlike other BIND libs, this should be installed unless the user says NO.
 .if ${MK_BIND_LIBS_LWRES} != "no"
-WITH_BIND_LIBS=
+MK_BIND_LIBS=	yes
 .endif
 
 .include	"${LIB_BIND_DIR}/config.mk"

From laffer1 at midnightbsd.org  Thu Jan  1 19:59:49 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 19:59:49 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: emulators/kqemu-kmod: Fix a few bugs with
	kqemu
Message-ID: <200901020059.n020xnF4061929@stargazer.midnightbsd.org>

Log Message:
-----------
Fix a few bugs with kqemu

Modified Files:
--------------
    mports/emulators/kqemu-kmod:
        Makefile (r1.3 -> r1.4)
    mports/emulators/kqemu-kmod/files:
        patch-kqemu-freebsd.c (r1.1 -> r1.2)

Added Files:
-----------
    mports/emulators/kqemu-kmod/files:
        patch-common-Makefile (r1.1)
        patch-fpucontext (r1.1)
        patch-tssworkaround (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/emulators/kqemu-kmod/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L emulators/kqemu-kmod/Makefile -L emulators/kqemu-kmod/Makefile -u -r1.3 -r1.4
--- emulators/kqemu-kmod/Makefile
+++ emulators/kqemu-kmod/Makefile
@@ -8,10 +8,10 @@
 
 PORTNAME=	kqemu
 PORTVERSION=	1.3.0.p11
+PORTREVISION=	1
 CATEGORIES=	emulators
-MASTER_SITES=	http://qemu.org/ \
-		http://fabrice.bellard.free.fr/qemu/ \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	http://bellard.org/qemu/ \
+		${MASTER_SITE_FREEBSD_LOCAL}
 MASTER_SITE_SUBDIR=	nox
 PKGNAMESUFFIX=	-kmod
 DISTNAME=	${PORTNAME}-${PORTVERSION:C/.p/pre/}
@@ -24,10 +24,8 @@
 ONLY_FOR_ARCHS=	i386 amd64
 HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_GCC=	3.4
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --cc=${CC}
 
-
 USE_RC_SUBR=	kqemu
 
 .include 
--- /dev/null
+++ emulators/kqemu-kmod/files/patch-tssworkaround
@@ -0,0 +1,112 @@
+Index: kqemu-freebsd.c
+@@ -38,6 +38,14 @@
+ #else
+ #include 
+ #endif
++#ifdef __x86_64__
++#include 
++#include 
++#include 
++#include 
++#include 
++#include 
++#endif
+ 
+ #include "kqemu-kernel.h"
+ 
+@@ -248,6 +256,57 @@
+     va_end(ap);
+ }
+ 
++#ifdef __x86_64__
++int kqemu_cpu0gdtfixed;
++int kqemu_gdts_used;
++struct user_segment_descriptor *kqemu_gdts;
++struct region_descriptor kqemu_r_newgdt;
++extern  struct pcpu __pcpu[];
++
++/* called with interrupts disabled */
++void CDECL kqemu_tss_fixup(unsigned long kerngdtbase)
++{
++    int gsel_tss = GSEL(GPROC0_SEL, SEL_KPL);
++    unsigned cpuid = PCPU_GET(cpuid);
++    struct user_segment_descriptor *newgdt = gdt;
++
++    if (mp_ncpus <= 1 || kerngdtbase != (unsigned long)gdt)
++	/* UP host or gdt already moved, nothing to do */
++	return;
++    if (cpuid) {
++	/* move gdts of all but first cpu */
++	if (!kqemu_gdts)
++	    /*
++	     * XXX gdt is allocated as
++	     *	struct user_segment_descriptor gdt[NGDT * MAXCPU];
++	     * so it has room for the moved copies; need to allocate at
++	     * kldload (and only free if kqemu_gdts_used is zero) should this
++	     * change in the future
++	     */
++	    kqemu_gdts = &gdt[NGDT];
++	++kqemu_gdts_used;
++	newgdt = &kqemu_gdts[NGDT * (cpuid - 1)];
++	bcopy(gdt, newgdt, NGDT * sizeof(gdt[0]));
++	kqemu_r_newgdt.rd_limit = NGDT * sizeof(gdt[0]) - 1;
++	kqemu_r_newgdt.rd_base = (long) newgdt;
++    } else {
++	if (kqemu_cpu0gdtfixed)
++	    return;
++	++kqemu_cpu0gdtfixed;
++    }
++    gdt_segs[GPROC0_SEL].ssd_base = (long) &common_tss[cpuid];
++    ssdtosyssd(&gdt_segs[GPROC0_SEL],
++       (struct system_segment_descriptor *)&newgdt[GPROC0_SEL]);
++    if (cpuid) {
++	lgdt(&kqemu_r_newgdt);
++	wrmsr(MSR_GSBASE, (u_int64_t)&__pcpu[cpuid]);
++	wrmsr(MSR_KGSBASE, curthread->td_pcb->pcb_gsbase);
++	wrmsr(MSR_FSBASE, curthread->td_pcb->pcb_fsbase);
++    }
++    ltr(gsel_tss);
++}
++#endif
++
+ struct kqemu_instance { 
+ #if __FreeBSD_version >= 500000
+     TAILQ_ENTRY(kqemu_instance) kqemu_ent;
+Index: common/kernel.c
+@@ -1025,6 +1025,9 @@
+ #ifdef __x86_64__
+     uint16_t saved_ds, saved_es;
+     unsigned long fs_base, gs_base;
++#ifdef __FreeBSD__
++    struct kqemu_global_state *g = s->global_state;
++#endif
+ #endif
+     
+ #ifdef PROFILE
+@@ -1096,6 +1099,14 @@
+             apic_nmi_mask = apic_save_and_disable_nmi(s);
+         }
+ 
++#ifdef __FreeBSD__
++#ifdef __x86_64__
++        spin_lock(&g->lock);
++        asm volatile ("sgdt %0" : : "m" (s->kernel_gdt));
++        kqemu_tss_fixup(s->kernel_gdt.base);
++        spin_unlock(&g->lock);
++#endif
++#endif
+         /* load breakpoint registers and avoid setting them if in the
+            monitor address space. We suppose that no breakpoints are
+            set by the host OS for this process */
+Index: kqemu-kernel.h
+@@ -48,4 +48,10 @@
+ 
+ void CDECL kqemu_log(const char *fmt, ...);
+ 
++#ifdef __FreeBSD__
++#ifdef __x86_64__
++void CDECL kqemu_tss_fixup(unsigned long kerngdtbase);
++#endif
++#endif
++
+ #endif /* KQEMU_KERNEL_H */
--- /dev/null
+++ emulators/kqemu-kmod/files/patch-common-Makefile
@@ -0,0 +1,22 @@
+Index: common/Makefile
+@@ -47,9 +47,9 @@
+ ifeq ($(ARCH), x86_64)
+ COMMON_CFLAGS+=-mno-red-zone
+ endif
+-CFLAGS=$(COMMON_CFLAGS)
++CFLAGS=$(COMMON_CFLAGS) ${DEBUG_FLAGS}
+ MON_CFLAGS=$(COMMON_CFLAGS)
+-KERNEL_CFLAGS=$(COMMON_CFLAGS)
++KERNEL_CFLAGS=$(COMMON_CFLAGS) ${DEBUG_FLAGS}
+ 
+ # Disable SSP if GCC supports it
+ MON_CFLAGS+=$(call cc-option,$(MON_CC),-fno-stack-protector,)
+@@ -119,7 +119,7 @@
+ 	$(CC) $(CFLAGS) $(DEFINES) $(INCLUDES) -c -o $@ $<
+ 
+ %.o: %.S
+-	$(CC) $(DEFINES) $(INCLUDES) -D__ASSEMBLY__ -c -o $@ $<
++	$(CC) ${DEBUG_FLAGS} $(DEFINES) $(INCLUDES) -D__ASSEMBLY__ -c -o $@ $<
+ 
+ clean:
+ 	rm -f *.o *~ monitor-image.h genoffsets genmon monitor_def.h \
--- /dev/null
+++ emulators/kqemu-kmod/files/patch-fpucontext
@@ -0,0 +1,78 @@
+Index: common/kernel.c
+@@ -1240,6 +1240,11 @@
+             case MON_REQ_EXCEPTION:
+                 exec_exception(s->arg0);
+                 break;
++#ifdef __FreeBSD__
++            case MON_REQ_LOADFPUCONTEXT:
++                kqemu_loadfpucontext(s->arg0);
++                break;
++#endif
+             default:
+                 kqemu_log("invalid mon request: %d\n", s->mon_req);
+                 break;
+Index: common/kqemu_int.h
+@@ -523,6 +523,7 @@
+     MON_REQ_LOCK_USER_PAGE,
+     MON_REQ_UNLOCK_USER_PAGE,
+     MON_REQ_EXCEPTION,
++    MON_REQ_LOADFPUCONTEXT,
+ } MonitorRequest;
+ 
+ #define INTERRUPT_ENTRY_SIZE 16
+Index: common/monitor.c
+@@ -1995,8 +1995,13 @@
+         raise_exception_err(s, EXCP07_PREX, 0);
+     } else {
+         /* the host needs to restore the FPU state for us */
++#ifndef __FreeBSD__
+         s->mon_req = MON_REQ_EXCEPTION;
+         s->arg0 = 0x07;
++#else
++        s->mon_req = MON_REQ_LOADFPUCONTEXT;
++        s->arg0 = (unsigned long)s->cpu_state.cpl;
++#endif
+         monitor2kernel1(s);
+     }
+ }
+Index: kqemu-freebsd.c
+@@ -33,6 +33,11 @@
+ 
+ #include 
+ #include 
++#ifdef __x86_64__
++#include 
++#else
++#include 
++#endif
+ 
+ #include "kqemu-kernel.h"
+ 
+@@ -172,6 +177,15 @@
+ {
+ }
+ 
++void CDECL kqemu_loadfpucontext(unsigned long cpl)
++{
++#ifdef __x86_64__
++    fpudna();
++#else
++    npxdna();
++#endif
++}
++
+ #if __FreeBSD_version < 500000
+ static int
+ curpriority_cmp(struct proc *p)
+Index: kqemu-kernel.h
+@@ -40,6 +40,10 @@
+ void * CDECL kqemu_io_map(unsigned long page_index, unsigned int size);
+ void CDECL kqemu_io_unmap(void *ptr, unsigned int size);
+ 
++#ifdef __FreeBSD__
++void CDECL kqemu_loadfpucontext(unsigned long cpl);
++#endif
++
+ int CDECL kqemu_schedule(void);
+ 
+ void CDECL kqemu_log(const char *fmt, ...);
Index: patch-kqemu-freebsd.c
===================================================================
RCS file: /home/cvs/mports/emulators/kqemu-kmod/files/patch-kqemu-freebsd.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L emulators/kqemu-kmod/files/patch-kqemu-freebsd.c -L emulators/kqemu-kmod/files/patch-kqemu-freebsd.c -u -r1.1 -r1.2
--- emulators/kqemu-kmod/files/patch-kqemu-freebsd.c
+++ emulators/kqemu-kmod/files/patch-kqemu-freebsd.c
@@ -1,12 +1,69 @@
 Index: kqemu-freebsd.c
-@@ -321,6 +321,9 @@
+@@ -222,9 +222,17 @@
+ int CDECL kqemu_schedule(void)
+ {
+     /* kqemu_log("kqemu_schedule\n"); */
++#if __FreeBSD_version < 700044
+     mtx_lock_spin(&sched_lock);
+     mi_switch(SW_VOL, NULL);
+     mtx_unlock_spin(&sched_lock);
++#else
++    /* -current no longer uses sched_lock */
++    struct thread *td = curthread;
++    thread_lock(td);
++    mi_switch(SW_VOL, NULL);
++    thread_unlock(td);
++#endif
+     return SIGPENDING(curthread);
+ }
+ #endif
+@@ -258,6 +266,10 @@
+ static struct clonedevs *kqemuclones;
+ static TAILQ_HEAD(,kqemu_instance) kqemuhead = TAILQ_HEAD_INITIALIZER(kqemuhead);
+ static eventhandler_tag clonetag;
++#ifndef D_NEEDMINOR
++/* see http://svn.freebsd.org/viewvc/base?view=revision&revision=179726 */
++#define D_NEEDMINOR 0
++#endif
+ #endif
+ 
+ static d_close_t kqemu_close;
+@@ -282,7 +294,7 @@
+ 	/* bmaj */	-1
+ #else
+ 	.d_version =	D_VERSION,
+-	.d_flags =	D_NEEDGIANT,
++	.d_flags =	D_NEEDGIANT | D_NEEDMINOR,
+ 	.d_open =	kqemu_open,
+ 	.d_ioctl =	kqemu_ioctl,
+ 	.d_close =	kqemu_close,
+@@ -334,8 +346,15 @@
  #if __FreeBSD_version >= 500000
      dev->si_drv1 = NULL;
      TAILQ_REMOVE(&kqemuhead, ks, kqemu_ent);
++#if __FreeBSD_version >= 700051
++    destroy_dev_sched(dev);
++#else
 +#if __FreeBSD_version >= 700024
 +    dev_relthread(dev); 
 +#endif
      destroy_dev(dev);
  #endif
++#endif
      free(ks, M_KQEMU);
-
+     --kqemu_ref_count;
+ }
+@@ -514,7 +533,13 @@
+ 	while ((ks = TAILQ_FIRST(&kqemuhead)) != NULL) {
+ 	    kqemu_destroy(ks);
+ 	}
++#if __FreeBSD_version >= 700051
++	drain_dev_clone_events();
++#endif
+ 	clone_cleanup(&kqemuclones);
++#if __FreeBSD_version >= 700051
++	destroy_dev_drain(&kqemu_cdevsw);
++#endif
+ #endif
+         kqemu_global_delete(kqemu_gs);
+         kqemu_gs = NULL;

From laffer1 at midnightbsd.org  Thu Jan  1 20:06:29 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:06:29 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: osversion assumption for
	__FreeBSD_version
Message-ID: <200901020106.n0216To2062810@stargazer.midnightbsd.org>

Log Message:
-----------
osversion assumption for __FreeBSD_version

Modified Files:
--------------
    mports/emulators/pearpc:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/emulators/pearpc/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L emulators/pearpc/Makefile -L emulators/pearpc/Makefile -u -r1.4 -r1.5
--- emulators/pearpc/Makefile
+++ emulators/pearpc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	pearpc
 PORTVERSION=	0.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	emulators
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -85,6 +85,11 @@
 post-extract:
 	@${REINPLACE_CMD} -e 's|-g -O2||;s|-O2||' ${WRKSRC}/configure
 
+pre-configure:
+# Assumes __FreeBSD_version value.  Change when current switches over.
+.if ${OSVERSION} > 700000
+	@${REINPLACE_CMD} -e 's|clock_settime\ ()|foobar()|' ${WRKSRC}/configure
+.endif
 
 post-configure:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/Makefile

From laffer1 at midnightbsd.org  Thu Jan  1 20:19:16 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:19:16 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: security/vlock: update to 2.2.2
Message-ID: <200901020119.n021JG4x063964@stargazer.midnightbsd.org>

Log Message:
-----------
update to 2.2.2

Modified Files:
--------------
    mports/security/vlock:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.1 -> r1.2)
        pkg-descr (r1.1 -> r1.2)

Added Files:
-----------
    mports/security/vlock/files:
        patch-configure (r1.1)

Removed Files:
-------------
    mports/security/vlock/files:
        patch-aa
        patch-ab
        patch-ac
        patch-ad
        patch-ae

-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/security/vlock/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/vlock/pkg-descr -L security/vlock/pkg-descr -u -r1.1 -r1.2
--- security/vlock/pkg-descr
+++ security/vlock/pkg-descr
@@ -1,5 +1,4 @@
 This is a utility which locks a terminal so it can only be unlocked with the
 user's password (or the root password).  It uses PAM authentication by default.
 
-- George Reid
-services at nevernet.net
+WWW: http://freshmeat.net/projects/vlock
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/vlock/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L security/vlock/Makefile -L security/vlock/Makefile -u -r1.2 -r1.3
--- security/vlock/Makefile
+++ security/vlock/Makefile
@@ -2,22 +2,86 @@
 # Date created:		08 Oct 2000
 # Whom:			George Reid 
 #
-# $FreeBSD: ports/security/vlock/Makefile,v 1.5 2004/02/05 20:37:48 trevor Exp $
 # $MidnightBSD$
-#
+# $FreeBSD: ports/security/vlock/Makefile,v 1.9 2008/06/19 19:35:54 pav Exp $
 
 PORTNAME=	vlock
-PORTVERSION=	1.3
-PORTREVISION=	1
+PORTVERSION=	2.2.2
 CATEGORIES=	security
-MASTER_SITES=	${MASTER_SITE_SUNSITE}
-MASTER_SITE_SUBDIR=	utils/console
+MASTER_SITES=	http://cthulhu.c3d2.de/~toidinamai/vlock/archive/
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Locks a terminal
 LICENSE=	gpl2
 
+USE_GMAKE=	yes
+HAS_CONFIGURE=	yes
+CONFIGURE_ARGS=	--enable-plugins --enable-pam \
+		--prefix=${PREFIX} \
+		--mandir=${MANPREFIX}/man \
+		--with-modules="${VLOCKMODULES}" \
+		--with-scripts="${VLOCKSCRIPTS}" \
+		VLOCK_GROUP="${VLOCKGRP}" \
+		VLOCK_MODE="0750" \
+		EXTRA_CFLAGS="-I${LOCALBASE}/include" \
+		EXTRA_LDFLAGS="-L${LOCALBASE}/lib"
+
+OPTIONS=	ROOTPWD "Enable unlock using root password" on \
+		VLOCKSCRIPTS "Install sample hook scripts" off \
+		CACASAVER "Enable libcaca screensaver" off
+
+MANLANG=	""
 MAN1=		vlock.1
-PLIST_FILES=	bin/vlock
+MAN5=		vlock-plugins.5
+MAN8=		vlock-main.8
+
+# Default scripts/modules
+VLOCKSCRIPTS=
+VLOCKMODULES=	all.so new.so
+
+# Vlock group = vlock:*:129:
+VLOCKGRP=	vlock
+VLOCKGID=	129
+
+.include 
+
+.if !defined(WITHOUT_ROOTPWD)
+CONFIGURE_ARGS+=	--enable-root-password
+.else
+CONFIGURE_ARGS+=	--disable-root-password
+.endif
+
+.if !defined(WITHOUT_VLOCKSCRIPTS)
+VLOCKSCRIPTS+=	amarok.sh example_script.sh mplayer.sh
+PLIST_SUB+=	PL_VLOCKSCRIPTS=""
+.else
+PLIST_SUB+=	PL_VLOCKSCRIPTS="@comment "
+.endif
+
+.if !defined(WITHOUT_CACASAVER)
+BUILD_DEPENDS+=	${LOCALBASE}/lib/libcaca.a:${PORTSDIR}/graphics/libcaca
+VLOCKMODULES+=	caca.so
+PLIST_SUB+=	PL_CACASAVER=""
+.else
+PLIST_SUB+=	PL_CACASAVER="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|-lncurses|-lm|' ${WRKSRC}/modules/Makefile
+
+pre-install:
+	if ! pw groupshow ${VLOCKGRP}; then pw groupadd ${VLOCKGRP} -g ${VLOCKGID}; fi
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/COPYING ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/ChangeLog ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/PLUGINS ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/README.X11 ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/SECURITY ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/TODO ${DOCSDIR}
+.endif
 
-.include 
+.include 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/security/vlock/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L security/vlock/distinfo -L security/vlock/distinfo -u -r1.1 -r1.2
--- security/vlock/distinfo
+++ security/vlock/distinfo
@@ -1,3 +1,3 @@
-MD5 (vlock-1.3.tar.gz) = d04076f9c5f12aadc4d5fbbabf8a0c12
-SHA256 (vlock-1.3.tar.gz) = 700b8f45b6b7cdaac2185a4796870ac378015db18a7414eebee5e5b6a4131daf
-SIZE (vlock-1.3.tar.gz) = 17188
+MD5 (vlock-2.2.2.tar.gz) = 51c389ee4ef814bf59063bc367437eb8
+SHA256 (vlock-2.2.2.tar.gz) = ea875250cad150872583b6ed2436470bc5e9c3a580d85554e31a2d5ae1d92fad
+SIZE (vlock-2.2.2.tar.gz) = 54732
--- security/vlock/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- terminal.c.orig	Sun Oct  8 18:03:19 2000
-+++ terminal.c		Sun Oct  8 18:03:24 2000
-@@ -15,7 +15,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
- #include "vlock.h"
- 
- 
--- /dev/null
+++ security/vlock/files/patch-configure
@@ -0,0 +1,25 @@
+--- configure.orig	2008-05-18 05:10:54 -0400
++++ configure	2009-01-01 20:16:02 -0500
+@@ -220,7 +220,8 @@
+   MODULEDIR="\$(LIBDIR)/vlock/modules"
+ 
+   CC=gcc
+-  DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
++  #DEFAULT_CFLAGS="-O2 -Wall -W -pedantic -std=gnu99"
++  DEFAULT_CFLAGS="-pedantic -std=gnu99"
+   DEBUG_CFLAGS="-O0 -g -Wall -W -pedantic -std=gnu99"
+   CFLAGS="${DEFAULT_CFLAGS}"
+   LD=ld
+@@ -266,6 +267,12 @@
+       CRYPT_LIB=''
+       MODULES="all.so new.so"
+     ;;
++    MidnightBSD)
++      PAM_LIBS='-lpam'
++      DL_LIB=''
++      CRYPT_LIB=''
++      MODULES="all.so new.so"
++    ;;
+   esac
+ }
+ 
--- security/vlock/files/patch-ab
+++ /dev/null
@@ -1,11 +0,0 @@
---- signals.c.orig	Sun Oct  8 18:03:19 2000
-+++ signals.c		Sun Oct  8 18:03:24 2000
-@@ -16,7 +16,7 @@
- #include 
- #include 
- #include 
--#include 
-+#include 
- #include "vlock.h"
- 
- 
--- security/vlock/files/patch-ae
+++ /dev/null
@@ -1,39 +0,0 @@
---- input.c.orig	Thu Jan 14 03:19:14 1999
-+++ input.c	Fri Feb 28 13:48:38 2003
-@@ -60,11 +60,27 @@
- #error "Shadow and PAM don't mix!"
- #endif
- 
-+#if (__FreeBSD__ == 0)            /* 1.0 did not define __FreeBSD__ */
-+#define __FreeBSD_version 199401
-+#elsif __FreeBSD__ == 1          /* 1.1 defined it to be 1 */
-+#define __FreeBSD_version 199405
-+#else                           /* 2.0 and higher define it to be 2 */
-+#include           /* and this works */
-+#endif
-+
- #include 
-+#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030)
-+#include 
-+#else
- #include 
-+#endif
- 
- static struct pam_conv PAM_conversation = {
-+#if defined (__FreeBSD_version) && (__FreeBSD_version > 500030)
-+    openpam_ttyconv,
-+#else
-     &misc_conv,
-+#endif
-     NULL
- };
- 
-@@ -291,7 +307,7 @@
-   setuid(getuid());
-   setgid(getgid());
- 
--  sprintf(prompt, "%s's password: ", username);
-+  snprintf(prompt, 99, "%s's password: ", username);
- #endif /* !USE_PAM */
- }
- 
--- security/vlock/files/patch-ad
+++ /dev/null
@@ -1,46 +0,0 @@
---- vlock.c.orig	Sun Oct  8 18:03:19 2000
-+++ vlock.c		Sun Oct  8 18:03:24 2000
-@@ -14,12 +14,10 @@
- #include 
- #include 
- #include 
--#include 
- #include 
- #include 
--#include 
--#include 
- #include 
-+#include 
- #include "vlock.h"
- #include "version.h"
- 
-@@ -37,20 +35,12 @@
- 
- int main(int argc, char **argv) {
- 
--  static struct option long_options[] = { /* For parsing long arguments */
--    {"current", 0, &o_lock_all, 0},
--    {"all", 0, &o_lock_all, 1},
--    {"version", no_argument, 0, O_VERSION},
--    {"help", no_argument, 0, O_HELP},
--    {0, 0, 0, 0},
--  };
-   int option_index; /* Unused */
-   int c;
-   struct vt_mode vtm;
- 
-   /* First we parse all the command line arguments */
--  while ((c = getopt_long(argc, argv, "acvh",
--			  long_options, &option_index)) != -1) {
-+  while ((c = getopt(argc, argv, "acvh")) != -1) {
-     switch(c) {
-     case 'c':
-       o_lock_all = 0;
-@@ -107,6 +97,7 @@
-     vtm.mode = VT_PROCESS;
-     vtm.relsig = SIGUSR1; /* handled by release_vt() */
-     vtm.acqsig = SIGUSR2; /* handled by acquire_vt() */
-+    vtm.frsig = SIGUSR1;  /* needed by FreeBSD */
-     ioctl(vfd, VT_SETMODE, &vtm);
-   }
- 
--- security/vlock/files/patch-aa
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.orig	Thu Jan 14 01:19:14 1999
-+++ Makefile	Wed Jun 16 17:23:34 2004
-@@ -1,24 +1,19 @@
- # vlock makefile
- 
--CC = gcc
--# remove the -DUSE_PAM, -ldl, and -lpam if you aren't using PAM
--RPM_OPT_FLAGS=-O2
--CFLAGS = $(RPM_OPT_FLAGS) -DUSE_PAM
--LDFLAGS = -ldl -lpam -lpam_misc
-+CFLAGS += -DUSE_PAM
-+LDFLAGS = -lpam
- 
- OBJS = vlock.o signals.o help.o terminal.o input.o
- 
--vlock: $(OBJS)
-+all:	vlock
- 
--vlock.man: vlock.1
--	groff -man -Tascii vlock.1 > vlock.man
-+vlock:	$(OBJS)
-+	cc $(OBJS) $(LDFLAGS) -o vlock
- 
--vlock.o: vlock.h version.h
--signals.o: vlock.h
--help.o: vlock.h
--terminal.o: vlock.h
--input.o: vlock.h
-+install:
-+	/usr/bin/install -c -s -o root -g wheel -m 4555 vlock ${PREFIX}/bin
-+	/usr/bin/install -c -o root -g wheel -m 444 vlock.1 ${MANPREFIX}/man/man1
- 
- clean:
--	rm -f $(OBJS) vlock core core.vlock
-+	rm -f $(OBJS) vlock vlock.core
- 

From laffer1 at midnightbsd.org  Thu Jan  1 20:19:31 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:19:31 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: pkg-plist: update to 2.2.2
Message-ID: <200901020119.n021JV9m064023@stargazer.midnightbsd.org>

Log Message:
-----------
update to 2.2.2

Added Files:
-----------
    mports/security/vlock:
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ security/vlock/pkg-plist
@@ -0,0 +1,20 @@
+bin/vlock
+sbin/vlock-main
+lib/vlock/modules/all.so
+lib/vlock/modules/new.so
+%%PL_CACASAVER%%lib/vlock/modules/caca.so
+ at dirrm lib/vlock/modules
+%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/amarok
+%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/example_script
+%%PL_VLOCKSCRIPTS%%lib/vlock/scripts/mplayer
+%%PL_VLOCKSCRIPTS%%@dirrm lib/vlock/scripts
+ at dirrm lib/vlock
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
+%%PORTDOCS%%%%DOCSDIR%%/PLUGINS
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.X11
+%%PORTDOCS%%%%DOCSDIR%%/SECURITY
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+ at exec if ! pw groupshow vlock 2>/dev/null; then pw groupadd vlock -g 129; fi

From ctriv at midnightbsd.org  Thu Jan  1 20:33:18 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:33:18 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: bsd.mport.mk: Change OSVERSION to refer
	to the MidnightBSD
Message-ID: <200901020133.n021XI8r065447@stargazer.midnightbsd.org>

Log Message:
-----------
Change OSVERSION to refer to the MidnightBSD version, not the FreeBSD version.
Don't check for param.h in src, it could be version that isn't at all related to 
the actual system.  Check param.h in /usr/include, and if that fails, use sysctl.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.131 -> r1.132)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.131
retrieving revision 1.132
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.131 -r1.132
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -118,12 +118,10 @@
 OSREL!=	${UNAME} -r | ${SED} -e 's/[-(].*//'
 .endif
 
-# Get __FreeBSD_version
+# Get __MidnightBSD_version
 .if !defined(OSVERSION)
 .if exists(${DESTDIR}/usr/include/sys/param.h)
-OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h
-.elif exists(${DESTDIR}/usr/src/sys/sys/param.h)
-OSVERSION!=	${AWK} '/^\#define[[:blank:]]__FreeBSD_version/ {print $$3}' < ${DESTDIR}/usr/src/sys/sys/param.h
+OSVERSION!=	${AWK} '/^\#define[[:blank:]]__MidnightBSD_version/ {print $$3}' < ${DESTDIR}/usr/include/sys/param.h
 .else
 OSVERSION!=	${SYSCTL} -n kern.osreldate
 .endif

From ctriv at midnightbsd.org  Thu Jan  1 20:34:04 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:34:04 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020134.n021Y4hp065513@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/astro/boinc-milkyway:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/astro/boinc-milkyway/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L astro/boinc-milkyway/Makefile -L astro/boinc-milkyway/Makefile -u -r1.2 -r1.3
--- astro/boinc-milkyway/Makefile
+++ astro/boinc-milkyway/Makefile
@@ -22,7 +22,7 @@
 
 ONLY_FOR_ARCHS=	i386 amd64
 
-.if ${OSVERSION} >= 700000
+.if ${OSVERSION} >= 3000
 LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
 .endif
 

From ctriv at midnightbsd.org  Thu Jan  1 20:35:46 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:35:46 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: gcc.mk: Fix OSVERSION.
Message-ID: <200901020135.n021Zkna065882@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/Mk/extensions:
        gcc.mk (r1.1 -> r1.2)

-------------- next part --------------
Index: gcc.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/gcc.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Mk/extensions/gcc.mk -L Mk/extensions/gcc.mk -u -r1.1 -r1.2
--- Mk/extensions/gcc.mk
+++ Mk/extensions/gcc.mk
@@ -40,7 +40,7 @@
 # the base system.
 # The third field is the version as USE_GCC would use.
 #
-GCCVERSION_030402=	502126 999999 3.4
+GCCVERSION_030402=	2000 999999 3.4
 GCCVERSION_040100=	999999 999999 4.1
 GCCVERSION_040200=	999999 999999 4.2
 GCCVERSION_040300=	999999 999999 4.3

From ctriv at midnightbsd.org  Thu Jan  1 20:36:29 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:36:29 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: bsd.mport.mk.pod: Clean up version
	variable documentation.
Message-ID: <200901020136.n021aT1g065949@stargazer.midnightbsd.org>

Log Message:
-----------
Clean up version variable documentation.

Modified Files:
--------------
    mports/Mk/docs:
        bsd.mport.mk.pod (r1.7 -> r1.8)

-------------- next part --------------
Index: bsd.mport.mk.pod
===================================================================
RCS file: /home/cvs/mports/Mk/docs/bsd.mport.mk.pod,v
retrieving revision 1.7
retrieving revision 1.8
diff -L Mk/docs/bsd.mport.mk.pod -L Mk/docs/bsd.mport.mk.pod -u -r1.7 -r1.8
--- Mk/docs/bsd.mport.mk.pod
+++ Mk/docs/bsd.mport.mk.pod
@@ -244,10 +244,6 @@
 
 The value of __MidnightBSD_version.
 
-=item FREEBSDVERSION 
-
-The version of FreeBSD closest to your version of MidnightBSD.
-
 =item PORTOBJFORMAT
 
 The object format ("aout" or "elf").

From ctriv at midnightbsd.org  Thu Jan  1 20:37:30 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:37:30 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020137.n021bUcj066045@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/devel/ZendOptimizer:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/ZendOptimizer/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L devel/ZendOptimizer/Makefile -L devel/ZendOptimizer/Makefile -u -r1.2 -r1.3
--- devel/ZendOptimizer/Makefile
+++ devel/ZendOptimizer/Makefile
@@ -26,7 +26,7 @@
 .include 
 
 VER=		6.0
-.if ${OSVERSION} >= 700043
+.if ${OSVERSION} >= 3000
 LIB_DEPENDS+=	m.4:${PORTSDIR}/misc/compat6x
 .endif
 

From ctriv at midnightbsd.org  Thu Jan  1 20:42:02 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:42:02 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: devel/gvfs: We've always had libarchive,
	don't check OSVERSION
Message-ID: <200901020142.n021g22G066541@stargazer.midnightbsd.org>

Log Message:
-----------
We've always had libarchive, don't check OSVERSION to decide to use it.

Modified Files:
--------------
    mports/devel/gvfs:
        Makefile (r1.6 -> r1.7)
        pkg-plist (r1.1 -> r1.2)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/devel/gvfs/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L devel/gvfs/pkg-plist -L devel/gvfs/pkg-plist -u -r1.1 -r1.2
--- devel/gvfs/pkg-plist
+++ devel/gvfs/pkg-plist
@@ -28,7 +28,7 @@
 lib/libgvfscommon.so.0
 %%FUSE%%libexec/gvfs-fuse-daemon
 libexec/gvfsd
-%%ARCHIVE%%libexec/gvfsd-archive
+libexec/gvfsd-archive
 libexec/gvfsd-burn
 %%CDDA%%libexec/gvfsd-cdda
 libexec/gvfsd-computer
@@ -44,7 +44,7 @@
 %%SMB%%libexec/gvfsd-smb-browse
 libexec/gvfsd-trash
 share/dbus-1/services/gvfs-daemon.service
-%%ARCHIVE%%share/gvfs/mounts/archive.mount
+share/gvfs/mounts/archive.mount
 share/gvfs/mounts/burn.mount
 %%CDDA%%share/gvfs/mounts/cdda.mount
 share/gvfs/mounts/computer.mount
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/gvfs/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L devel/gvfs/Makefile -L devel/gvfs/Makefile -u -r1.6 -r1.7
--- devel/gvfs/Makefile
+++ devel/gvfs/Makefile
@@ -73,11 +73,4 @@
 PLIST_SUB+=	GPHOTO2="@comment "
 .endif
 
-.if ${OSVERSION} < 602112
-CONFIGURE_ARGS+=	--disable-archive
-PLIST_SUB+=	ARCHIVE="@comment "
-.else
-PLIST_SUB+=	ARCHIVE=""
-.endif
-
 .include 

From laffer1 at midnightbsd.org  Thu Jan  1 20:44:11 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:44:11 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: freebsd local not ours,
	add license
Message-ID: <200901020144.n021iB2m066666@stargazer.midnightbsd.org>

Log Message:
-----------
freebsd local not ours, add license

Modified Files:
--------------
    mports/graphics/wmicons:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/wmicons/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L graphics/wmicons/Makefile -L graphics/wmicons/Makefile -u -r1.2 -r1.3
--- graphics/wmicons/Makefile
+++ graphics/wmicons/Makefile
@@ -10,7 +10,7 @@
 PORTVERSION=	1.0
 PORTREVISION=   1
 CATEGORIES=	graphics windowmaker
-MASTER_SITES=	${MASTER_SITE_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
+MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL:S|%SUBDIR%|kiri/wmicons|} \
 		${MASTER_SITE_WINDOWMAKER} \
 		${MASTER_SITE_PORTS_JP} \
 		http://www.itlb.te.noda.tus.ac.jp/~manome/wmaker/archive/
@@ -24,6 +24,7 @@
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Icons mainly for use in Window Maker
+LICENSE=	unknown
 
 GNU_CONFIGURE=	yes
 

From ctriv at midnightbsd.org  Thu Jan  1 20:45:33 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:45:33 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020145.n021jXXR067035@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/devel/qt4-corelib:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/qt4-corelib/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L devel/qt4-corelib/Makefile -L devel/qt4-corelib/Makefile -u -r1.4 -r1.5
--- devel/qt4-corelib/Makefile
+++ devel/qt4-corelib/Makefile
@@ -69,9 +69,10 @@
 	${HEAD} -n 27 ${WRKSRC}/global/qconfig.h > ${WRKDIR}/qconfig.tmp
 	${CHMOD} 644 ${WRKSRC}/global/qconfig.h
 	${CAT} ${WRKDIR}/qconfig.tmp ${FILESDIR}/qconfig.h.in > ${WRKSRC}/global/qconfig.h
-.if ${OSVERSION} >= 700042
-	${ECHO_CMD} "#define QT_VISIBILITY_AVAILABLE" >> ${WRKSRC}/global/qconfig.h
-.endif
+# this looks to be a newer GCC thing.
+#.if ${OSVERSION} >= 3000
+#	${ECHO_CMD} "#define QT_VISIBILITY_AVAILABLE" >> ${WRKSRC}/global/qconfig.h
+#.endif
 
 
 post-install:

From ctriv at midnightbsd.org  Thu Jan  1 20:46:08 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 20:46:08 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020146.n021k8gn067095@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/editors/zile:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/editors/zile/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L editors/zile/Makefile -L editors/zile/Makefile -u -r1.2 -r1.3
--- editors/zile/Makefile
+++ editors/zile/Makefile
@@ -25,11 +25,7 @@
 
 .include 
 
-.if ${OSVERSION} > 502010
 GNU_REGEX_H=	gnu/regex.h
-.else
-GNU_REGEX_H=	gnuregex.h
-.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e \

From ctriv at midnightbsd.org  Thu Jan  1 21:31:29 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 21:31:29 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: patch-aa: Fix OSVERSION.
Message-ID: <200901020231.n022VTLB071392@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/graphics/png/files:
        patch-aa (r1.4 -> r1.5)

-------------- next part --------------
Index: patch-aa
===================================================================
RCS file: /home/cvs/mports/graphics/png/files/patch-aa,v
retrieving revision 1.4
retrieving revision 1.5
diff -L graphics/png/files/patch-aa -L graphics/png/files/patch-aa -u -r1.4 -r1.5
--- graphics/png/files/patch-aa
+++ graphics/png/files/patch-aa
@@ -1,17 +1,13 @@
---- scripts/makefile.freebsd.orig	2007-06-21 02:10:26.000000000 +0400
-+++ scripts/makefile.freebsd	2007-10-13 17:24:24.000000000 +0400
-@@ -8,26 +8,27 @@
+--- ./scripts/makefile.freebsd.orig	2007-06-20 18:10:26 -0400
++++ ./scripts/makefile.freebsd	2009-01-01 21:27:38 -0500
+@@ -8,26 +8,22 @@
  LIB=		png
  SHLIB_MAJOR=	${SHLIB_VER}
  SHLIB_MINOR=	0
 -NOPROFILE=	YES
-+.if (${OSVERSION} > 600007)
+-NOOBJ=          YES
 +NO_PROFILE=     YES
 +NO_OBJ=         YES
-+.else
-+NOPROFILE=      YES
- NOOBJ=          YES
-+.endif
  
  # where make install puts libpng.a and png.h
 -DESTDIR=	${PREFIX}
@@ -36,7 +32,7 @@
  
  SRCS=	png.c pngset.c pngget.c pngrutil.c pngtrans.c pngwutil.c \
  	pngread.c pngrio.c pngwio.c pngwrite.c pngrtran.c \
-@@ -45,4 +46,22 @@
+@@ -45,4 +41,22 @@
  writelock:
  	chmod a-w *.[ch35] $(DOCS) scripts/*
  

From ctriv at midnightbsd.org  Thu Jan  1 21:33:30 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 21:33:30 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020233.n022XUih071570@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/java/diablo-jre16:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jre16/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L java/diablo-jre16/Makefile -L java/diablo-jre16/Makefile -u -r1.2 -r1.3
--- java/diablo-jre16/Makefile
+++ java/diablo-jre16/Makefile
@@ -51,15 +51,15 @@
 
 .include 
 
-.if ${OSVERSION} >= 700000
+.if ${OSVERSION} >= 3000
 JRE_OSREL=	freebsd7
 PLIST_SUB+=	RELEASENOTE="@comment "
-.elif ${OSVERSION} >= 600000
+.elif ${OSVERSION} >= 1000
 BROKEN=		required gethostbyname_r
 JRE_OSREL=	freebsd6
 PLIST_SUB+=	RELEASENOTE=""
 .else
-IGNORE=		only available for FreeBSD 6.x/i386 and FreeBSD 6.x/amd64 and later
+IGNORE=		Somehow, you have a copy of MidnightBSD 0.0.0.  Well done!
 .endif
 
 .if ${ARCH} == "i386"

From ctriv at midnightbsd.org  Thu Jan  1 21:37:45 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 21:37:45 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020237.n022bjif072095@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/lang/mono:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/mono/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L lang/mono/Makefile -L lang/mono/Makefile -u -r1.6 -r1.7
--- lang/mono/Makefile
+++ lang/mono/Makefile
@@ -77,12 +77,8 @@
 		${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj \
 		${WRKSRC}/mcs/class/Managed.Windows.Forms/build-csproj2k5
 
-.if ${OSVERSION} >= 700000
-	@${REINPLACE_CMD} -e 's|freebsd6|freebsd7|g' \
-		${WRKSRC}/configure ${WRKSRC}/libgc/configure
-.endif
 
-tests: build
+test: build
 	@${ECHO_MSG} "===> Running mono regression tests"
 	@(cd ${WRKSRC}/mono/tests && ${SETENV} ${MAKE_ENV} ${GMAKE} \
 		${MAKE_FLAGS} Makefile ${MAKE_ARGS} test)

From ctriv at midnightbsd.org  Thu Jan  1 21:42:14 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 21:42:14 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: makefile.lib: Fix OSVERSION.
Message-ID: <200901020242.n022gE40072622@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/math/blas/files:
        makefile.lib (r1.3 -> r1.4)

-------------- next part --------------
Index: makefile.lib
===================================================================
RCS file: /home/cvs/mports/math/blas/files/makefile.lib,v
retrieving revision 1.3
retrieving revision 1.4
diff -L math/blas/files/makefile.lib -L math/blas/files/makefile.lib -u -r1.3 -r1.4
--- math/blas/files/makefile.lib
+++ math/blas/files/makefile.lib
@@ -2,11 +2,7 @@
 FFLAGS=	@FFLAGS@
 
 LIBDIR= ${PREFIX}/lib
-.if (${OSVERSION} > 600007)
 NO_PROFILE= no
-.else
-NOPROFILE= no
-.endif
 
 SHLIB_MAJOR= 2
 

From ctriv at midnightbsd.org  Thu Jan  1 22:01:29 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:01:29 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020301.n0231TAb074649@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/multimedia/ffmpeg:
        Makefile (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/multimedia/ffmpeg/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L multimedia/ffmpeg/Makefile -L multimedia/ffmpeg/Makefile -u -r1.1 -r1.2
--- multimedia/ffmpeg/Makefile
+++ multimedia/ffmpeg/Makefile
@@ -244,12 +244,9 @@
 	@${REINPLACE_CMD} -e 's|faacD|NeAACD|' ${WRKSRC}/libavcodec/libfaad.c
 # {C,LD}FLAGS safeness
 # fix x264 math, use correct log base 2 from math(3)
-.if ${OSVERSION} <= 601000
 	@${REINPLACE_CMD} -E \
 		-e 's| log2| log|' \
 		${WRKSRC}/libavcodec/libx264.c
-.endif
-
 	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${FAKE_DESTDIR}${PREFIX}/libdata/pkgconfig|' \
 		${WRKSRC}/common.mak ${WRKSRC}/subdir.mak
 	@${REINPLACE_CMD} -e 's|/etc/ffserver.conf|${PREFIX}/etc/ffserver.conf|' \

From ctriv at midnightbsd.org  Thu Jan  1 22:03:28 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:03:28 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020303.n0233S8d074791@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/net/iwi-firmware:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/iwi-firmware/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L net/iwi-firmware/Makefile -L net/iwi-firmware/Makefile -u -r1.2 -r1.3
--- net/iwi-firmware/Makefile
+++ net/iwi-firmware/Makefile
@@ -30,6 +30,6 @@
 		ipw-${PORTVERSION}-sniffer.fw:${DRIVERNAME}-sniffer.fw \
 		ipw-${PORTVERSION}-sniffer_ucode.fw:${DRIVERNAME}-ucode-sniffer.fw
 
-MIN7OSVERSION=	700006
+MIN7OSVERSION=	3000
 
 .include "${MASTERDIR}/Makefile"

From ctriv at midnightbsd.org  Thu Jan  1 22:05:51 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:05:51 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020305.n0235pQL075186@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/sysutils/hal:
        Makefile (r1.8 -> r1.9)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/sysutils/hal/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L sysutils/hal/Makefile -L sysutils/hal/Makefile -u -r1.8 -r1.9
--- sysutils/hal/Makefile
+++ sysutils/hal/Makefile
@@ -72,15 +72,11 @@
 
 .include 
 
-.if ${OSVERSION} < 505000
-IGNORE=	not supported on FreeBSD prior to 5.5-RELEASE
-.endif
-
 .if (${ARCH}=="i386" || ${ARCH}=="amd64" || ${ARCH}=="ia64")
 RUN_DEPENDS+=	dmidecode:${PORTSDIR}/sysutils/dmidecode
 .endif
 
-.if ${OSVERSION} <= 601100
+.if ${OSVERSION} <= 3000
 NEEDS_MEDIA=	yes
 PLIST_SUB+=	MEDIA=""
 .else

From ctriv at midnightbsd.org  Thu Jan  1 22:06:56 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:06:56 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020306.n0236uAC075296@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/textproc/enchant:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/textproc/enchant/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L textproc/enchant/Makefile -L textproc/enchant/Makefile -u -r1.2 -r1.3
--- textproc/enchant/Makefile
+++ textproc/enchant/Makefile
@@ -71,11 +71,9 @@
 post-patch:
 	@${REINPLACE_CMD} -e 's|MKDIRPROG-mkdir|MKDIRPROG-mkdir -p|g' \
 		${WRKSRC}/install-sh
-.if ${OSVERSION} < 700042
 	@${REINPLACE_CMD} -E -e "s|-Wunsafe-loop-optimizations ||g" \
 		-e "s|-Wno-missing-field-initializers ||g" \
 		-e "s|-Wno-attributes ||g" \
 			${WRKSRC}/configure
-.endif
 
 .include 

From ctriv at midnightbsd.org  Thu Jan  1 22:08:17 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:08:17 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020308.n0238Hqs075391@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/www/squid:
        Makefile (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/squid/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L www/squid/Makefile -L www/squid/Makefile -u -r1.5 -r1.6
--- www/squid/Makefile
+++ www/squid/Makefile
@@ -254,10 +254,9 @@
 storage_schemes=	ufs diskd null
 .if defined(WITH_SQUID_AUFS)
 storage_schemes+=	aufs
-.if ${OSVERSION}>=501000
-# Only document libmap.conf where it is available:
+
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-src-cf.data.pre.aufs
-.endif
+
 # Nil aufs threads is default, set any other value via SQUID_CONFIGURE_ARGS
 CONFIGURE_ARGS+=	--with-pthreads
 CFLAGS+=	${PTHREAD_CFLAGS}
@@ -337,9 +336,6 @@
 .endif
 .if defined(WITH_SQUID_PF)
 CONFIGURE_ARGS+=	--enable-pf-transparent
-.if ${OSVERSION} < 502106
-IGNORE=		pf available only in FreeBSD 5.3 and newer
-.endif
 .endif
 
 .if defined(WITH_SQUID_IPFILTER)

From ctriv at midnightbsd.org  Thu Jan  1 22:10:03 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:10:03 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020310.n023A3np075614@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/x11/gnome-panel:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/gnome-panel/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11/gnome-panel/Makefile -L x11/gnome-panel/Makefile -u -r1.4 -r1.5
--- x11/gnome-panel/Makefile
+++ x11/gnome-panel/Makefile
@@ -70,12 +70,6 @@
 	@${FIND} ${WRKSRC} -type f | \
 		${XARGS} -n 10 ${REINPLACE_CMD} -e \
 		's|"applications.menu"|"gnome-applications.menu"|'
-.if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
-	( ${OSVERSION} < 503101 )
-.for po in da.po it.po zh_CN.po zh_TW.po
-	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
-.endfor
-.endif
 
 post-install:
 	${MKDIR} ${PREFIX}/share/gnome-panel

From ctriv at midnightbsd.org  Thu Jan  1 22:11:55 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:11:55 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Fix OSVERSION.
Message-ID: <200901020311.n023Bt6e075907@stargazer.midnightbsd.org>

Log Message:
-----------
Fix OSVERSION.

Modified Files:
--------------
    mports/x11/nvidia-driver:
        Makefile (r1.6 -> r1.7)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11/nvidia-driver/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L x11/nvidia-driver/Makefile -L x11/nvidia-driver/Makefile -u -r1.6 -r1.7
--- x11/nvidia-driver/Makefile
+++ x11/nvidia-driver/Makefile
@@ -79,13 +79,8 @@
 post-patch: .SILENT
 # We should support -CURRENT: kill the check
 	${REINPLACE_CMD} '24,26d' ${WRKSRC}/src/nv-freebsd.h
-# Fix `agpvar.h' location on recent -CURRENT
-.if ${OSVERSION} >= 800004
-	${REINPLACE_CMD} -e 's,pci/agpvar\.h,dev/agp/agpvar.h,' \
-		${WRKSRC}/src/nv-freebsd.h
-.endif
 # Building with -Werror requires prototype for suser() which was moved
-.if ${OSVERSION} >= 700048
+.if ${OSVERSION} >= 3000
 	${REINPLACE_CMD} -e '15s,^,#include ,' \
 		${WRKSRC}/src/nvidia_os.c
 .endif

From ctriv at midnightbsd.org  Thu Jan  1 22:17:31 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Thu, 1 Jan 2009 22:17:31 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Cleanup linking with sqlite.
Message-ID: <200901020317.n023HV33076423@stargazer.midnightbsd.org>

Log Message:
-----------
Cleanup linking with sqlite.  Use the system sqlite unless it's an old version
of mbsd.

Modified Files:
--------------
    mports/databases/qt4-sqlite3-plugin:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/databases/qt4-sqlite3-plugin/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L databases/qt4-sqlite3-plugin/Makefile -L databases/qt4-sqlite3-plugin/Makefile -u -r1.3 -r1.4
--- databases/qt4-sqlite3-plugin/Makefile
+++ databases/qt4-sqlite3-plugin/Makefile
@@ -21,8 +21,6 @@
 
 FAKE_OPTS=	trueprefix
 
-LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
-
 USE_QT_VER=	4
 QT_COMPONENTS=	moc_build sql
 QT_NONSTANDARD=	yes
@@ -34,13 +32,25 @@
 		${DISTNAME}/include/QtSql \
 		${DISTNAME}/src/sql/kernel
 MAKEFILE=	${FILESDIR}/Makefile.bsd
+
+PLIST_SUB=	DB=${DB}
+
+
+.include 
+
+
+# old mbsd versions didn't come with sqlite in core.
+.if ${OSVERSION} < 2000
+LIB_DEPENDS+=	sqlite3:${PORTSDIR}/databases/sqlite3
+.endif
+
 MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" MOC="${MOC}" \
 		PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-PLIST_SUB=	DB=${DB}
 
-pre-fake:
-	@${MKDIR} ${FAKE_DESTDIR}${PREFIX}/lib/qt4/plugins/sqldrivers
+pre-install:
+	@${MKDIR} ${PREFIX}/lib/qt4/plugins/sqldrivers
+
 
-.include 
+.include 
\ No newline at end of file

From ctriv at midnightbsd.org  Fri Jan  2 21:13:12 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:13:12 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: graphics/poppler-qt4: add poppler-qt4
Message-ID: <200901030213.n032DCOx010668@stargazer.midnightbsd.org>

Log Message:
-----------
add poppler-qt4

Added Files:
-----------
    mports/graphics/poppler-qt4:
        Makefile (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ graphics/poppler-qt4/pkg-plist
@@ -0,0 +1,12 @@
+ at comment $MidnightBSD: mports/graphics/poppler-qt4/pkg-plist,v 1.1 2009/01/03 02:13:12 ctriv Exp $
+include/poppler/qt4/poppler-qt4.h
+include/poppler/qt4/poppler-link.h
+include/poppler/qt4/poppler-annotation.h
+include/poppler/qt4/poppler-form.h
+include/poppler/qt4/poppler-page-transition.h
+lib/libpoppler-qt4.so.2
+lib/libpoppler-qt4.so
+lib/libpoppler-qt4.la
+lib/libpoppler-qt4.a
+libdata/pkgconfig/poppler-qt4.pc
+ at dirrm include/poppler/qt4
--- /dev/null
+++ graphics/poppler-qt4/Makefile
@@ -0,0 +1,19 @@
+# New ports collection makefile for:	poppler-qt4
+# Date created:		June 26, 2007
+# Whom:			Michael Johnson 
+#
+# $FreeBSD: ports/graphics/poppler-qt4/Makefile,v 1.9 2008/08/04 02:28:00 mezz Exp $
+#   $MCom: ports-stable/graphics/poppler-qt4/Makefile,v 1.3 2008/06/20 17:48:14 mezz Exp $
+#
+
+PORTREVISION=	0
+PKGNAMESUFFIX=	-qt4
+
+MAINTAINER=	gnome at FreeBSD.org
+COMMENT=	Qt4 bindings to poppler
+
+MASTERDIR=	${.CURDIR}/../../graphics/poppler
+SLAVEPORT=	qt4
+PLIST=		${.CURDIR}/pkg-plist
+
+.include "${MASTERDIR}/Makefile"

From ctriv at midnightbsd.org  Fri Jan  2 21:15:15 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:15:15 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add poppler-qt4
Message-ID: <200901030215.n032FFF8011065@stargazer.midnightbsd.org>

Log Message:
-----------
add poppler-qt4

Modified Files:
--------------
    mports/graphics:
        Makefile (r1.83 -> r1.84)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/Makefile,v
retrieving revision 1.83
retrieving revision 1.84
diff -L graphics/Makefile -L graphics/Makefile -u -r1.83 -r1.84
--- graphics/Makefile
+++ graphics/Makefile
@@ -93,6 +93,7 @@
     SUBDIR += poppler-data
     SUBDIR += poppler-gtk
     SUBDIR += poppler-qt
+    SUBDIR += poppler-qt4
     SUBDIR += poppler-utils
     SUBDIR += popplerkit
     SUBDIR += py-cairo

From ctriv at midnightbsd.org  Fri Jan  2 21:23:14 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:23:14 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: misc/chmlib: Added chmlib-0.39
Message-ID: <200901030223.n032NE8R011764@stargazer.midnightbsd.org>

Log Message:
-----------
Added chmlib-0.39

Added Files:
-----------
    mports/misc/chmlib:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/misc/chmlib/files:
        patch-chm_lib.c (r1.1)
        patch-chm_lib.h (r1.1)
        patch-ltmain.sh (r1.1)

-------------- next part --------------
--- /dev/null
+++ misc/chmlib/pkg-descr
@@ -0,0 +1,7 @@
+CHMLIB is a library for dealing with Microsoft ITSS/CHM format files. Right
+now, it is a very simple library, but sufficient for dealing with all of the
+.chm files I've come across. Due to the fairly well-designed indexing built
+into this particular file format, even a small library is able to gain
+reasonably good performance indexing into ITSS archives.
+
+WWW: http://morte.jedrea.com/~jedwin/projects/chmlib/
--- /dev/null
+++ misc/chmlib/pkg-plist
@@ -0,0 +1,9 @@
+bin/chm_http
+bin/enum_chmLib
+bin/enumdir_chmLib
+bin/extract_chmLib
+bin/test_chmLib
+include/chm_lib.h
+include/lzx.h
+lib/libchm.so
+lib/libchm.so.0
--- /dev/null
+++ misc/chmlib/Makefile
@@ -0,0 +1,24 @@
+# ex:ts=8
+#
+# $MidnightBSD: mports/misc/chmlib/Makefile,v 1.1 2009/01/03 02:23:12 ctriv Exp $
+#
+
+PORTNAME=	chmlib
+PORTVERSION=	0.39
+CATEGORIES=	misc
+MASTER_SITES=	http://www.jedrea.com/chmlib/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	A library for dealing with Microsoft ITSS/CHM format files
+LICENSE=	lgpl
+
+USE_BZIP2=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--disable-io64 --disable-pread --exec-prefix=${PREFIX} --disable-static --enable-examples
+USE_GMAKE=	yes
+USE_LDCONFIG=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS}," ${WRKSRC}/configure
+
+.include 
--- /dev/null
+++ misc/chmlib/distinfo
@@ -0,0 +1,3 @@
+MD5 (chmlib-0.39.tar.bz2) = debed1a0bdded7a12d3d967e497cea9c
+SHA256 (chmlib-0.39.tar.bz2) = d2305d449eb5a2922ed3e61714074b09aae2491aa0cdbb783ab33a1744e0ff41
+SIZE (chmlib-0.39.tar.bz2) = 263013
--- /dev/null
+++ misc/chmlib/files/patch-ltmain.sh
@@ -0,0 +1,15 @@
+--- ltmain.sh.orig	Mon Jun 19 09:26:24 2006
++++ ltmain.sh	Mon Jun 19 09:26:40 2006
+@@ -6003,10 +6003,12 @@
+ 	fi
+ 
+ 	# Install the pseudo-library for information purposes.
++	if /usr/bin/false ; then
+ 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+ 	instname="$dir/$name"i
+ 	$show "$install_prog $instname $destdir/$name"
+ 	$run eval "$install_prog $instname $destdir/$name" || exit $?
++	fi
+ 
+ 	# Maybe install the static library, too.
+ 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
--- /dev/null
+++ misc/chmlib/files/patch-chm_lib.h
@@ -0,0 +1,25 @@
+--- src/chm_lib.h.orig	Fri Feb 25 21:26:09 2005
++++ src/chm_lib.h	Fri Feb 25 21:26:57 2005
+@@ -78,6 +78,12 @@
+     char               path[CHM_MAX_PATHLEN+1];
+ };
+ 
++typedef struct chmUnitInfo chmUnitInfo;
++typedef struct chm_dir {
++  int nentries;
++  char **info;
++} chm_dir;
++
+ /* open an ITS archive */
+ #ifdef PPC_BSTR
+ /* RWE 6/12/2003 */
+@@ -133,6 +139,7 @@
+                       CHM_ENUMERATOR e,
+                       void *context);
+ 
++chm_dir get_names(struct chmFile *h);
+ #ifdef __cplusplus
+ }
+ #endif
+
+
--- /dev/null
+++ misc/chmlib/files/patch-chm_lib.c
@@ -0,0 +1,20 @@
+--- src/chm_lib.c.orig	Tue Apr  8 10:33:30 2003
++++ src/chm_lib.c	Tue Apr  8 10:40:56 2003
+@@ -156,6 +156,17 @@
+ typedef __int64                 Int64;
+ typedef unsigned __int64        UInt64;
+ 
++/* FreeBSD */
++#elif __FreeBSD__
++#include 
++typedef unsigned char           UChar;
++typedef int16_t                 Int16;
++typedef uint16_t                UInt16;
++typedef int32_t                 Int32;
++typedef uint32_t                UInt32;
++typedef int64_t                 Int64;
++typedef uint64_t                UInt64;
++
+ /* I386, 32-bit, non-Windows */
+ /* Sparc        */
+ /* MIPS         */

From ctriv at midnightbsd.org  Fri Jan  2 21:23:28 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:23:28 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: chmlib,
	koffice-i18n-sr@Latn, wmweather+.
Message-ID: <200901030223.n032NSbS011814@stargazer.midnightbsd.org>

Log Message:
-----------
added: chmlib, koffice-i18n-sr at Latn, wmweather+.

Modified Files:
--------------
    mports/misc:
        Makefile (r1.52 -> r1.53)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/misc/Makefile,v
retrieving revision 1.52
retrieving revision 1.53
diff -L misc/Makefile -L misc/Makefile -u -r1.52 -r1.53
--- misc/Makefile
+++ misc/Makefile
@@ -4,6 +4,7 @@
     COMMENT = Miscellaneous utilities
 
     SUBDIR += brs
+    SUBDIR += chmlib
     SUBDIR += compat4x
     SUBDIR += compat5x
     SUBDIR += cpuid

From smultron at midnightbsd.org  Fri Jan  2 21:23:35 2009
From: smultron at midnightbsd.org (smultron at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:23:35 -0500 (EST)
Subject: [Midnightbsd-cvs] www: /www: add xfce to featured
Message-ID: <200901030223.n032NZhl011884@stargazer.midnightbsd.org>

Log Message:
-----------
add xfce to featured

Modified Files:
--------------
    www:
        index.html (r1.62 -> r1.63)
    www/images/ports:
        001.png (r1.1 -> r1.2)
    www/featured:
        index.html (r1.6 -> r1.7)

-------------- next part --------------
Index: index.html
===================================================================
RCS file: /home/cvs/www/index.html,v
retrieving revision 1.62
retrieving revision 1.63
diff -L index.html -L index.html -u -r1.62 -r1.63
--- index.html
+++ index.html
@@ -49,6 +49,7 @@
 				
 					Featured Ports »
 					
+						XFCE
 						KDE
 						GNUstep
 						SeaMonkey
@@ -57,7 +58,6 @@
 						Etoile
 						Gimp
 						AbiWord
-						Xine
 					
 				
 				
Index: index.html
===================================================================
RCS file: /home/cvs/www/featured/index.html,v
retrieving revision 1.6
retrieving revision 1.7
diff -L featured/index.html -L featured/index.html -u -r1.6 -r1.7
--- featured/index.html
+++ featured/index.html
@@ -29,6 +29,13 @@
 			
 			
 				 Featured Ports
+				
+						
+						Xfce 4.4.2
+						09/26/2008
+						To install: $ sudo pkg_add -r xfce4
+						is a free software desktop environment for Unix and other Unix-like platforms, such as Linux, Solaris and BSD. It aims to be fast and lightweight, while still being visually appealing and easy to use. It is based on the GTK+ 2 toolkit (as is GNOME). It uses the Xfwm window manager, described below. Its configuration is entirely mouse-driven, and the configuration files are hidden from the casual user.
+				
 				
 						
 						KDE 3.5.8
@@ -85,13 +92,6 @@
 						To install: $ sudo pkg_add -r abiword
 						AbiWord is a free software word processor licensed under the GNU General Public License. The name "AbiWord" (pronounced "Abby Word") is derived from the root of the Spanish word abierto, meaning "open". It is supported on Linux, Mac OS X (PowerPC), Microsoft Windows, ReactOS, BeOS, AmigaOS 4.0 (through its Cygnix X11 engine), and other operating systems.
 				
-				
-						
-						xine 1.1.15
-						12/11/2008
-						To install: $ sudo pkg_add -r libxine
-						xine (officially pronounced like the name "Maxine" without "Ma") is a multimedia playback engine for Unix-like operating systems released under the GNU General Public License. xine is built around a shared library (xine-lib) that supports different frontend player applications. Another important feature of xine is the ability to manually correct the synchronization of audio and video streams. xine uses libraries from other projects such as liba52, libmpeg2, FFmpeg, libmad, FAAD2, and Ogle. xine can also use binary Windows codecs through a wrapper, bundled as the w32codecs, for playback of some media formats that are not handled natively.
-				
 				Software descriptions taken from their respective Wikipedia articles
 			
 			

From ctriv at midnightbsd.org  Fri Jan  2 21:40:53 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:40:53 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: graphics/djvulibre-nox11: Added
	djvulibre-nox11-3.5.21
Message-ID: <200901030240.n032erHg013723@stargazer.midnightbsd.org>

Log Message:
-----------
Added djvulibre-nox11-3.5.21

Added Files:
-----------
    mports/graphics/djvulibre-nox11:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/graphics/djvulibre-nox11/files:
        patch-config_ltmain.sh (r1.1)
        patch-configure (r1.1)
        patch-desktopfiles_Makefile.in (r1.1)
        patch-tools_any2djvu (r1.1)

-------------- next part --------------
--- /dev/null
+++ graphics/djvulibre-nox11/pkg-descr
@@ -0,0 +1,14 @@
+DjVu is a web-centric format and software platform for distributing
+documents and images. DjVu was originally developped at AT&T
+Labs-Research. In March 2000, AT&T sold DjVu to LizardTech Inc. who
+now distributes Windows/Mac plug-ins, and commercial encoders (mostly
+on Windows)
+
+The LizardTech released the reference implementation of DjVu under
+the GNU GPL in October 2000. DjVuLibre (which means free DjVu), is
+an enhanced version of that code maintained by the original inventors
+of DjVu. It is compatible with version 3.5 of the LizardTech DjVu
+software suite.
+
+Author:	Leon Bottou 
+WWW:	http://djvu.sourceforge.net/
--- /dev/null
+++ graphics/djvulibre-nox11/pkg-plist
@@ -0,0 +1,62 @@
+%%ANY2DJVU%%bin/any2djvu
+bin/bzz
+bin/c44
+bin/cjb2
+bin/cpaldjvu
+bin/csepdjvu
+bin/ddjvu
+bin/djvm
+bin/djvmcvt
+bin/djvudigital
+bin/djvudump
+bin/djvuextract
+bin/djvumake
+bin/djvups
+bin/djvused
+bin/djvuserve
+bin/djvutoxml
+bin/djvutxt
+bin/djvuxmlparser
+include/libdjvu/ddjvuapi.h
+include/libdjvu/miniexp.h
+lib/libdjvulibre.so
+lib/libdjvulibre.so.21
+libdata/pkgconfig/ddjvuapi.pc
+share/djvu/osi/cs/messages.xml
+share/djvu/osi/de/libdjvu++.xml
+share/djvu/osi/de/messages.xml
+share/djvu/osi/desktop/djvulibre-mime.xml
+share/djvu/osi/desktop/hi22-djvu.png
+share/djvu/osi/desktop/hi32-djvu.png
+share/djvu/osi/desktop/hi48-djvu.png
+share/djvu/osi/desktop/register-djvu-mime
+share/djvu/osi/en/djvutools-reference.xml
+share/djvu/osi/en/libdjvu++.xml
+share/djvu/osi/en/messages.xml
+share/djvu/osi/en/unixgui-shared.xml
+share/djvu/osi/en/unixgui-viewer.xml
+share/djvu/osi/fr/libdjvu++.xml
+share/djvu/osi/fr/messages.xml
+share/djvu/osi/ja/libdjvu++.xml
+share/djvu/osi/ja/messages.xml
+share/djvu/osi/languages.xml
+share/djvu/osi/zh/libdjvu++.xml
+share/djvu/osi/zh/messages.xml
+share/djvu/pubtext/DjVuMessages.dtd
+share/djvu/pubtext/DjVuOCR.dtd
+share/djvu/pubtext/DjVuXML-s.dtd
+ at dirrm share/djvu/pubtext
+ at dirrm share/djvu/osi/zh
+ at dirrm share/djvu/osi/ja
+ at dirrm share/djvu/osi/fr
+ at dirrm share/djvu/osi/en
+ at dirrm share/djvu/osi/desktop
+ at dirrm share/djvu/osi/de
+ at dirrm share/djvu/osi/cs
+ at dirrm share/djvu/osi
+ at dirrmtry share/djvu
+ at dirrmtry man/fr/man1
+ at dirrmtry man/fr
+ at dirrmtry man/de/man1
+ at dirrmtry man/de
+ at dirrm include/libdjvu
--- /dev/null
+++ graphics/djvulibre-nox11/Makefile
@@ -0,0 +1,82 @@
+# Date Created:		20 July 1999
+#
+# $MidnightBSD: mports/graphics/djvulibre-nox11/Makefile,v 1.1 2009/01/03 02:40:50 ctriv Exp $
+#
+
+PORTNAME=	djvulibre
+PORTVERSION=	3.5.21
+PORTREVISION=	0
+CATEGORIES=	graphics www
+MASTER_SITES=	SF/djvu
+PKGNAMESUFFIX=	-nox11
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	DjVu base libraries and utilities
+LICENSE=	gpl2
+
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
+		tiff.4:${PORTSDIR}/graphics/tiff
+
+USE_ICONV=	yes
+USE_GNOME=	gnomehack gnometarget
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	JPEG_CFLAGS="-I${LOCALBASE}/include" \
+		JPEG_LIBS="-L${LOCALBASE}/lib -ljpeg" \
+		TIFF_CFLAGS="-I${LOCALBASE}/include" \
+		TIFF_LIBS="-L${LOCALBASE}/lib -ltiff" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}" \
+		LOCALBASE="${LOCALBASE}" \
+		CXX="${CXX}"
+CONFIGURE_ARGS=	--enable-threads=pthread --enable-shared
+USE_LDCONFIG=	yes
+
+OPTIONS=	ANY2DJVU "Install any2djvu script (requires curl)" off
+
+MANLANG=	"" ja
+MAN1=		bzz.1 c44.1 cjb2.1 cpaldjvu.1 csepdjvu.1 ddjvu.1 djvm.1 \
+		djvmcvt.1 djvu.1 djvudump.1 djvuextract.1 djvumake.1 djvups.1 \
+		djvused.1 djvuserve.1 djvutxt.1
+MAN1_EN=	djvutoxml.1 djvuxml.1 djvuxmlparser.1 djvudigital.1
+
+PORTDOCS=	djvu2spec.djvu lizard2002.djvu
+
+CONFIGURE_ARGS+=	--disable-djview --without-x
+
+.include 
+
+.if defined(WITH_ANY2DJVU)
+MAN1_EN+=		any2djvu.1
+RUN_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
+PLIST_SUB+=	ANY2DJVU=""
+.else
+PLIST_SUB+=	ANY2DJVU="@comment "
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|$${libdir}/pkgconfig|${PREFIX}/libdata/pkgconfig|' \
+		${WRKSRC}/libdjvu/Makefile.in
+	@${REINPLACE_CMD} -e '/-O\*/d ; \
+		 s|$$OPTS -O3|$$OPTS|g ; \
+		 s|$$OPTS -O2|$$OPTS|g ; \
+		 s|$$OPTS $$opt|$$OPTS|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|= @CPPFLAGS|= $${FLAGS} @CPPFLAGS|g ; \
+		 s|@ $${FLAGS}|@|g ; \
+		 s|} $${FLAGS}|}|g ; \
+		 s|/netscape/|/djvulibre/|g ; \
+		 s|eucjp|eucJP|g ; \
+		 s|_PROGRAM} -m|} -m|g'
+.if !defined(WITH_ANY2DJVU)
+	@${REINPLACE_CMD} -e 's,any2djvu,,' ${WRKSRC}/tools/Makefile.in
+.endif
+
+
+post-install:
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/doc/,} ${DOCSDIR}/
+.endif
+
+.include 
--- /dev/null
+++ graphics/djvulibre-nox11/distinfo
@@ -0,0 +1,3 @@
+MD5 (djvulibre-3.5.21.tar.gz) = 4c6f3eb03ffbd067b6d2fe2344b0d9ad
+SHA256 (djvulibre-3.5.21.tar.gz) = 39f80c1810be22c5ea7f6a44bbb449c3e29902895dcff9da6a8440891a67b8b4
+SIZE (djvulibre-3.5.21.tar.gz) = 2993718
--- /dev/null
+++ graphics/djvulibre-nox11/files/patch-tools_any2djvu
@@ -0,0 +1,95 @@
+--- tools/any2djvu.orig	2008-02-17 20:18:08.000000000 +0300
++++ tools/any2djvu	2008-02-17 20:20:31.000000000 +0300
+@@ -1,11 +1,11 @@
+-#! /bin/bash -f
++#!/bin/sh
+ # CVS version control block - do not edit manually
+ #  $RCSfile: any2djvu,v $
+ #  $Revision: 1.3 $
+ #  $Date: 2007/08/10 08:08:55 $
+ #  $Source: /cvsroot/djvu/djvulibre-3.5/tools/any2djvu,v $
+ 
+-function copyright()
++copyright()
+ {
+     echo "Copyright (C) 2002 David Kreil "
+     echo "Modified by Barak A. Pearlmutter "
+@@ -14,7 +14,7 @@
+     echo "Released under the GNU GPL v2, 21-Oct-2002."
+ }
+ 
+-function warranty()
++warranty()
+ {
+     echo "This program is distributed in the hope that it will be useful,"
+     echo "but WITHOUT ANY WARRANTY; without even the implied warranty of"
+@@ -22,7 +22,7 @@
+     echo "GNU General Public License for more details."
+ }
+ 
+-function disclaimer()
++disclaimer()
+ {
+     echo "By using this tool you accept the following disclaimer:"
+     echo "  Because the any2djvu service is free of charge, there is no"
+@@ -40,7 +40,7 @@
+ ocr=1
+ docformat=2
+ 
+-function warn()
++warn()
+ {
+     echo "Notes:"
+     echo " - Internet connection is required."
+@@ -53,7 +53,7 @@
+     echo " - This software comes with NO WARRANTY."
+ }
+ 
+-function format_help()
++format_help()
+ {
+     echo "Codes for the formats of the input documents to use with -f"
+     echo "  1 - DjVu Document (for verification or OCR)"
+@@ -67,7 +67,7 @@
+     echo "  9 - Scanned Document - Color/Mixed - >400 dpi"
+ }
+ 
+-function usage()
++usage()
+ {
+     echo "Convert files from .ps/.ps.gz/.pdf to .djvu"
+     echo "Usage:	$0 [options] [url] {filename(s)}"
+@@ -123,13 +123,13 @@
+ fi
+ 
+ # check OCR option
+-if [ ! "x$ocr" == x0 ] && [ ! "x$ocr" == x1 ]; then
++if [ ! "x$ocr" = x0 ] && [ ! "x$ocr" = x1 ]; then
+     echo 'error: -o OCR must be 0 or 1'
+     exit 2
+ fi
+ 
+ # if help is requested or docformat is not specified right - show help
+-if [ "x$docformat" == x'help' ]; then
++if [ "x$docformat" = x'help' ]; then
+     format_help
+     exit 0
+ fi
+@@ -215,7 +215,7 @@
+             -F ocr=$ocr -F legal=1 "$rurl/$rcgi"                          \
+             | eval tee "'$log'" $shellopts
+     else
+-        wget $wgetopts -O - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
++         /usr/bin/fetch$wgetopts -o - "$rurl/$rcgi?urlupload=$lurl/$in$cgiopts"   \
+             | eval tee "'$log'" $shellopts
+     fi
+     l=`egrep 'href=djvu/.*\.djvu' "$log"`
+@@ -225,7 +225,7 @@
+         echo "error: something got wrong. check log file"
+         exit 1
+     fi
+-    wget $wgetopts -O "$b.djvu" "$rurl/$l"
++    /usr/bin/fetch $wgetopts -o $b.djvu "$rurl/$l"
+ 
+     [ -z "$doclean" ] || rm "$log"
+     [ -z $silent ]  && ls -l "$b.djvu"
--- /dev/null
+++ graphics/djvulibre-nox11/files/patch-desktopfiles_Makefile.in
@@ -0,0 +1,28 @@
+--- desktopfiles/Makefile.in.orig	2007-09-10 20:23:30.000000000 +0400
++++ desktopfiles/Makefile.in	2007-09-10 20:55:26.000000000 +0400
+@@ -29,6 +29,7 @@
+ 
+ INSTALL = @INSTALL@
+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
+ INSTALL_DATA = @INSTALL_DATA@
+ XDG_MIME = @XDG_MIME@
+ XDG_ICON_RESOURCE = @XDG_ICON_RESOURCE@
+@@ -71,7 +72,7 @@
+ 
+ install-djvu-files: FORCE
+ 	${INSTALL} -d ${DESTDIR}${datadir_djvu}
+-	${INSTALL_PROGRAM} register-djvu-mime ${DESTDIR}${datadir_djvu}
++	${INSTALL_SCRIPT} register-djvu-mime ${DESTDIR}${datadir_djvu}
+ 	${INSTALL_DATA} ${srcdir}/*djvu.png ${DESTDIR}${datadir_djvu}
+ 	${INSTALL_DATA} ${srcdir}/*mime.xml ${DESTDIR}${datadir_djvu}
+ 	- at echo "Run ${datadir_djvu}/register-djvu-mime install"
+@@ -79,7 +80,7 @@
+ 
+ install-djview-files: FORCE
+ 	${INSTALL} -d ${DESTDIR}${datadir_djview}
+-	${INSTALL_PROGRAM} register-djview-menu ${DESTDIR}${datadir_djview}
++	${INSTALL_SCRIPT} register-djview-menu ${DESTDIR}${datadir_djview}
+ 	${INSTALL_DATA} ${srcdir}/*djview3.png ${DESTDIR}${datadir_djview}
+ 	${INSTALL_DATA} ${srcdir}/*djview3.desktop ${DESTDIR}${datadir_djview}
+ 	- at echo "Run ${datadir_djview}/register-djview-menu install"
--- /dev/null
+++ graphics/djvulibre-nox11/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	2008-08-26 14:48:20.000000000 +0400
++++ configure	2008-08-26 14:48:36.000000000 +0400
+@@ -21689,6 +21689,7 @@
+ __sync_lock_test_and_set(&l,1);
+   __sync_lock_release(&l);
+   __sync_add_and_fetch(&l,1);
++  __sync_bool_compare_and_swap(&l,&l,1);
+   return 0;
+   ;
+   return 0;
--- /dev/null
+++ graphics/djvulibre-nox11/files/patch-config_ltmain.sh
@@ -0,0 +1,17 @@
+--- config/ltmain.sh.orig	2008-08-26 16:13:33.000000000 +0400
++++ config/ltmain.sh	2008-08-26 16:14:40.000000000 +0400
+@@ -6002,14 +6002,6 @@
+ 	  IFS="$save_ifs"
+ 	fi
+ 
+-	# Install the pseudo-library for information purposes.
+-	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
+-	instname="$dir/$name"i
+-	$show "$install_prog $instname $destdir/$name"
+-	$run eval "$install_prog $instname $destdir/$name" || exit $?
+-
+-	# Maybe install the static library, too.
+-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+ 	;;
+ 
+       *.lo)

From ctriv at midnightbsd.org  Fri Jan  2 21:42:35 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:42:35 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add djvulibre-nox11
Message-ID: <200901030242.n032gZZp013837@stargazer.midnightbsd.org>

Log Message:
-----------
add djvulibre-nox11

Modified Files:
--------------
    mports/graphics:
        Makefile (r1.84 -> r1.85)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/Makefile,v
retrieving revision 1.84
retrieving revision 1.85
diff -L graphics/Makefile -L graphics/Makefile -u -r1.84 -r1.85
--- graphics/Makefile
+++ graphics/Makefile
@@ -11,6 +11,7 @@
     SUBDIR += cairo
     SUBDIR += cairomm
     SUBDIR += dia
+    SUBDIR += djvulibre-nox11
     SUBDIR += dri
     SUBDIR += eog
     SUBDIR += etoile-distributedview

From ctriv at midnightbsd.org  Fri Jan  2 21:47:18 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:47:18 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: bsd.mport.mk: Display the various stage
	messages in bold.
Message-ID: <200901030247.n032lIf8014295@stargazer.midnightbsd.org>

Log Message:
-----------
Display the various stage messages in bold.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.132 -> r1.133)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.132
retrieving revision 1.133
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.132 -r1.133
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -2919,25 +2919,25 @@
 .ORDER: ${_INSTALL_DEP} ${_INSTALL_SEQ}
 
 extract-message:
-	@${ECHO_MSG} "===>  Extracting for ${PKGNAME}"
+	@${ECHO_MSG} -e "\033[1m===>  Extracting for ${PKGNAME}\033[0m"
 patch-message:
-	@${ECHO_MSG} "===>  Patching for ${PKGNAME}"
+	@${ECHO_MSG} -e "\033[1m===>  Patching for ${PKGNAME}\033[0m"
 configure-message:
-	@${ECHO_MSG} "===>  Configuring for ${PKGNAME}"
+	@${ECHO_MSG} -e "\033[1m===>  Configuring for ${PKGNAME}\033[0m"
 build-message:
-	@${ECHO_MSG} "===>  Building for ${PKGNAME}"
+	@${ECHO_MSG} -e "\033[1m===>  Building for ${PKGNAME}\033[0m"
 fake-message:
-	@${ECHO_MSG} "===>  Faking install for ${PKGNAME}"
+	@${ECHO_MSG} -e "\033[1m===>  Faking install for ${PKGNAME}\033[0m"
 install-message:
 .if !defined(DESTDIR)
-	@${ECHO_MSG} "===>  Installing ${PKGFILE}"
+	@${ECHO_MSG} -e "\033[1m===>  Installing ${PKGFILE}\033[0m"
 .else
-	@${ECHO_MSG} "===>  Installing ${PKGFILE} into ${DESTDIR}"
+	@${ECHO_MSG} -e "\033[1m===>  Installing ${PKGFILE} into ${DESTDIR}\033[0m"
 .endif
 package-message:
-	@${ECHO_MSG} "===>  Building package for ${PKGNAME}"
+	@${ECHO_MSG} -e "\033[1m===>  Building package for ${PKGNAME}\033[0m"
 done-message:
-	@${ECHO_MSG} "===>  Done."
+	@${ECHO_MSG} -e "\033[1m===>  Done.\033[0m"
 
 
 # Empty pre-* and post-* targets

From smultron at midnightbsd.org  Fri Jan  2 21:56:10 2009
From: smultron at midnightbsd.org (smultron at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:56:10 -0500 (EST)
Subject: [Midnightbsd-cvs] www: index.html: corrected description
Message-ID: <200901030256.n032uAYs015278@stargazer.midnightbsd.org>

Log Message:
-----------
corrected description

Modified Files:
--------------
    www/featured:
        index.html (r1.7 -> r1.8)

-------------- next part --------------
Index: index.html
===================================================================
RCS file: /home/cvs/www/featured/index.html,v
retrieving revision 1.7
retrieving revision 1.8
diff -L featured/index.html -L featured/index.html -u -r1.7 -r1.8
--- featured/index.html
+++ featured/index.html
@@ -34,7 +34,7 @@
 						Xfce 4.4.2
 						09/26/2008
 						To install: $ sudo pkg_add -r xfce4
-						is a free software desktop environment for Unix and other Unix-like platforms, such as Linux, Solaris and BSD. It aims to be fast and lightweight, while still being visually appealing and easy to use. It is based on the GTK+ 2 toolkit (as is GNOME). It uses the Xfwm window manager, described below. Its configuration is entirely mouse-driven, and the configuration files are hidden from the casual user.
+						Xfce is a free software desktop environment for Unix and other Unix-like platforms, such as Linux, Solaris and BSD. It aims to be fast and lightweight, while still being visually appealing and easy to use. It is based on the GTK+ 2 toolkit (as is GNOME). It uses the Xfwm window manager, described below. Its configuration is entirely mouse-driven, and the configuration files are hidden from the casual user.
 				
 				
 						

From smultron at midnightbsd.org  Fri Jan  2 21:58:45 2009
From: smultron at midnightbsd.org (smultron at midnightbsd.org)
Date: Fri, 2 Jan 2009 21:58:45 -0500 (EST)
Subject: [Midnightbsd-cvs] www: index.html: gnu-step version number
Message-ID: <200901030258.n032wjFI015477@stargazer.midnightbsd.org>

Log Message:
-----------
gnu-step version number

Modified Files:
--------------
    www/featured:
        index.html (r1.8 -> r1.9)

-------------- next part --------------
Index: index.html
===================================================================
RCS file: /home/cvs/www/featured/index.html,v
retrieving revision 1.8
retrieving revision 1.9
diff -L featured/index.html -L featured/index.html -u -r1.8 -r1.9
--- featured/index.html
+++ featured/index.html
@@ -45,7 +45,7 @@
 				
 				
 						
-						GNUstep 2.0.1
+						GNUstep 1.16.3
 						10/20/2007
 						To install: $ sudo pkg_add -r gnustep
 						GNUstep is a free software implementation of NeXT's OpenStep Objective-C libraries (called frameworks), widget toolkit, and application development tools not only for Unix-like operating systems, but also for Microsoft Windows. It is part of the GNU project.

From laffer1 at midnightbsd.org  Fri Jan  2 22:00:50 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Fri, 2 Jan 2009 22:00:50 -0500 (EST)
Subject: [Midnightbsd-cvs] www: index.html: abiword version fix
Message-ID: <200901030300.n0330oB6015920@stargazer.midnightbsd.org>

Log Message:
-----------
abiword version fix

Modified Files:
--------------
    www/featured:
        index.html (r1.9 -> r1.10)

-------------- next part --------------
Index: index.html
===================================================================
RCS file: /home/cvs/www/featured/index.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -L featured/index.html -L featured/index.html -u -r1.9 -r1.10
--- featured/index.html
+++ featured/index.html
@@ -87,7 +87,7 @@
 				
 				
 						
-						AbiWord 2.4.6
+						AbiWord 2.6.4
 						9/17/2008
 						To install: $ sudo pkg_add -r abiword
 						AbiWord is a free software word processor licensed under the GNU General Public License. The name "AbiWord" (pronounced "Abby Word") is derived from the root of the Spanish word abierto, meaning "open". It is supported on Linux, Mac OS X (PowerPC), Microsoft Windows, ReactOS, BeOS, AmigaOS 4.0 (through its Cygnix X11 engine), and other operating systems.
@@ -133,4 +133,4 @@
 		
 		
 	
-
\ No newline at end of file
+

From smultron at midnightbsd.org  Fri Jan  2 22:13:01 2009
From: smultron at midnightbsd.org (smultron at midnightbsd.org)
Date: Fri, 2 Jan 2009 22:13:01 -0500 (EST)
Subject: [Midnightbsd-cvs] www: index.html: xfce description fix (again)
Message-ID: <200901030313.n033D1Ss016995@stargazer.midnightbsd.org>

Log Message:
-----------
xfce description fix (again)

Modified Files:
--------------
    www/featured:
        index.html (r1.10 -> r1.11)

-------------- next part --------------
Index: index.html
===================================================================
RCS file: /home/cvs/www/featured/index.html,v
retrieving revision 1.10
retrieving revision 1.11
diff -L featured/index.html -L featured/index.html -u -r1.10 -r1.11
--- featured/index.html
+++ featured/index.html
@@ -34,7 +34,7 @@
 						Xfce 4.4.2
 						09/26/2008
 						To install: $ sudo pkg_add -r xfce4
-						Xfce is a free software desktop environment for Unix and other Unix-like platforms, such as Linux, Solaris and BSD. It aims to be fast and lightweight, while still being visually appealing and easy to use. It is based on the GTK+ 2 toolkit (as is GNOME). It uses the Xfwm window manager, described below. Its configuration is entirely mouse-driven, and the configuration files are hidden from the casual user.
+						Xfce is a free software desktop environment for Unix and other Unix-like platforms, such as Linux, Solaris and BSD. It aims to be fast and lightweight, while still being visually appealing and easy to use. It is based on the GTK+ 2 toolkit (as is GNOME). Its configuration is entirely mouse-driven, and the configuration files are hidden from the casual user.
 				
 				
 						

From ctriv at midnightbsd.org  Sat Jan  3 15:49:07 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 15:49:07 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: print/ghostscript-gpl: ALways build a
	shared library.
Message-ID: <200901032049.n03Kn7Bi035216@stargazer.midnightbsd.org>

Log Message:
-----------
ALways build a shared library.  This is needed for kde4.

Modified Files:
--------------
    mports/print/ghostscript-gpl:
        Makefile (r1.7 -> r1.8)
        Makefile.inc (r1.4 -> r1.5)

Added Files:
-----------
    mports/print/ghostscript-gpl/files:
        patch-src__unix-dll.mak (r1.1)

-------------- next part --------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/Makefile.inc,v
retrieving revision 1.4
retrieving revision 1.5
diff -L print/ghostscript-gpl/Makefile.inc -L print/ghostscript-gpl/Makefile.inc -u -r1.4 -r1.5
--- print/ghostscript-gpl/Makefile.inc
+++ print/ghostscript-gpl/Makefile.inc
@@ -1,5 +1,5 @@
 # $MidnightBSD$
 
 GS_VERSION=	8.56
-GS_REVISION=	1
+GS_REVISION=	2
 GS_EPOCH=	0
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L print/ghostscript-gpl/Makefile -L print/ghostscript-gpl/Makefile -u -r1.7 -r1.8
--- print/ghostscript-gpl/Makefile
+++ print/ghostscript-gpl/Makefile
@@ -111,7 +111,10 @@
 MAKE_ENV+=	FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a"
 .endif
 
-.if defined(WITH_SHLIB)
+.if defined(WITHOUT_SHLIB)
+ALL_TARGET=	all pcl3opts
+PLIST_SUB+=	SHLIB="@comment "
+.else
 .undef WITHOUT_X11
 USE_GNOME+=	gtk20
 ALL_TARGET=	so pcl3opts
@@ -119,9 +122,6 @@
 USE_LDCONFIG=	yes
 PLIST_SUB+=	SHLIB="" SHLIB_VER="${GS_VERSION:R}"
 INCLUDEDIR=	${PREFIX}/include/ghostscript
-.else
-ALL_TARGET=	all pcl3opts
-PLIST_SUB+=	SHLIB="@comment "
 .endif
 
 GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
@@ -514,9 +514,10 @@
 	${ECHO_MSG} ">>> in post-install ..."
 	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
 	${ECHO_MSG} ">>>   stripping gs ..."
-.if defined(WITH_SHLIB)
+.if !defined(WITHOUT_SHLIB)
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
 	${LN} -sf gsc ${PREFIX}/bin/gs
+	${MKDIR} ${INCLUDEDIR}
 .for i in iapi.h ierrors.h
 	${INSTALL_DATA} ${WRKSRC}/src/${i} ${INCLUDEDIR}
 .endfor
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src__unix-dll.mak
@@ -0,0 +1,35 @@
+--- ./src/unix-dll.mak.orig	2009-01-03 14:55:23 -0500
++++ ./src/unix-dll.mak	2009-01-03 14:57:45 -0500
+@@ -108,19 +108,19 @@
+ 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
+ 
+ install-so: so
+-	-mkdir -p $(prefix)
+-	-mkdir -p $(datadir)
+-	-mkdir -p $(gsdir)
+-	-mkdir -p $(gsdatadir)
+-	-mkdir -p $(bindir)
+-	-mkdir -p $(libdir)
+-	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
+-	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
+-	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
+-	$(RM_) $(libdir)/$(GS_SONAME)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
+-	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
+-	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
++	-mkdir -p $(DESTDIR)$(prefix)
++	-mkdir -p $(DESTDIR)$(datadir)
++	-mkdir -p $(DESTDIR)$(gsdir)
++	-mkdir -p $(DESTDIR)$(gsdatadir)
++	-mkdir -p $(DESTDIR)$(bindir)
++	-mkdir -p $(DESTDIR)$(libdir)
++	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
++	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
++	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
++	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
++	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
++	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
++	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
+ 
+ soinstall: install-so install-scripts install-data
+ 

From laffer1 at midnightbsd.org  Sat Jan  3 17:03:37 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 17:03:37 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: www/opera: update to opera 9.63.
Message-ID: <200901032203.n03M3bEK041640@stargazer.midnightbsd.org>

Log Message:
-----------
update to opera 9.63.  Mark broken on current for now

Modified Files:
--------------
    mports/www/opera:
        Makefile (r1.24 -> r1.25)
        distinfo (r1.16 -> r1.17)
        pkg-plist (r1.9 -> r1.10)

Added Files:
-----------
    mports/www/opera/files:
        operapluginwrapper (r1.1)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/opera/pkg-plist,v
retrieving revision 1.9
retrieving revision 1.10
diff -L www/opera/pkg-plist -L www/opera/pkg-plist -u -r1.9 -r1.10
--- www/opera/pkg-plist
+++ www/opera/pkg-plist
@@ -8,6 +8,7 @@
 share/opera/bin/works
 share/opera/bin/operaplugincleaner
 share/opera/bin/operapluginwrapper
+share/opera/bin/operapluginwrapper.midnightbsd
 share/opera/locale/ka/georgian.lng
 share/opera/locale/ka/license.txt
 share/opera/locale/ka/search.ini
@@ -146,6 +147,7 @@
 share/opera/locale/english.lng
 share/opera/ini/dialog.ini
 share/opera/ini/fastforward.ini
+share/opera/ini/speeddial_default.ini
 share/opera/ini/mailproviders.xml
 share/opera/ini/standard_keyboard.ini
 share/opera/ini/standard_keyboard_compat.ini
@@ -205,6 +207,7 @@
 share/opera/styles/plugins.css
 share/opera/styles/search.css
 share/opera/styles/warning.css
+share/opera/webfeeds.html
 share/opera/styles/wml.css
 share/opera/skin/standard_skin.zip
 share/opera/skin/windows_skin.zip
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/opera/Makefile,v
retrieving revision 1.24
retrieving revision 1.25
diff -L www/opera/Makefile -L www/opera/Makefile -u -r1.24 -r1.25
--- www/opera/Makefile
+++ www/opera/Makefile
@@ -10,32 +10,32 @@
 PORTVERSION=	${OPERA_VER}
 PORTREVISION=	0
 CATEGORIES=	www ipv6
-MASTER_SITES=	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://ftp.ucr.ac.cr/WWW/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://www.microrpm.ca/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://opera.eurenet.net/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://opera.ftp.fu-berlin.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://ftp.ntua.gr/pub/www/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://ftp.wayne.edu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://mirrors.dedipower.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		http://opera.nedmirror.nl/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/${OPERA_REL}/en/${OPERA_ARCH}/${OPERA_LIB}/&,} \
+MASTER_SITES=	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		http://gd.tuwien.ac.at/infosys/browsers/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		http://ftp.ucr.ac.cr/WWW/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		http://www.microrpm.ca/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		http://opera.eurenet.net/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		ftp://opera.ftp.fu-berlin.de/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		http://ftp.ntua.gr/pub/www/Opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		ftp://ftp.wayne.edu/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		http://mirrors.dedipower.com/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		ftp://ftp.mirror.ac.uk/sites/ftp.opera.com/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		http://opera.nedmirror.nl/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		ftp://ftp.tiscali.nl/pub/mirrors/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
+		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/&,} \
 		http://T32.TecNik93.com/FreeBSD/others_ports/${PORTNAME}${PKGNAMESUFFIX}/sources/
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.freebsd6-shared-qt3.${ARCH}
+DISTNAME=	${PORTNAME}-${OPERA_VER}-freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
 LICENSE=	opera
 
-OPERA_VER=	9.52
+OPERA_VER=	9.63
 OPERA_MINVER=	
 OPERA_REL=	final
-OPERA_DATE=	20080814
-OPERA_BUILD=	2091
+OPERA_DATE=	20081215
+OPERA_BUILD=	2474
 
 DATADIR=	${PREFIX}/share/${PORTNAME}
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME}
@@ -44,8 +44,7 @@
 WANT_GNOME=	yes
 USE_XLIB=	yes
 ONLY_FOR_ARCHS=	i386 amd64
-#WRKSRC=		${WRKDIR}/${DISTNAME}
-WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.freebsd6-shared-qt3.${ARCH}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${OPERA_VER}-${OPERA_BUILD}.freebsd${OPERA_TYPE}-shared-qt3.${ARCH}
 
 MAN1=		opera.1
 NO_BUILD=	yes
@@ -66,7 +65,12 @@
 OPERA_ARCH=	intel
 .endif
 
-OPERA_TYPE=	4
+.if ${OSVERSION} >= 3000
+BROKEN=		Does not run pending GCC 4 migration
+OPERA_TYPE=	7
+.else
+OPERA_TYPE=	6
+.endif
 
 .if !defined(WITHOUT_ASPELL)
 LIB_DEPENDS+=	aspell.16:${PORTSDIR}/textproc/aspell
@@ -91,7 +95,6 @@
 	@${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/opera.desktop.in >${WRKDIR}/opera.desktop
 
 post-patch:
-#	@${CP} ${WRKSRC}/search.ini ${WRKSRC}/locale/en
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
 			${WRKSRC}/usr/local/etc/opera6rc
@@ -100,6 +103,9 @@
 
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${TRUE_PREFIX} --DESTDIR=${FAKE_DESTDIR})
+	@${MKDIR} ${PREFIX}/share/bin
+	@${CP} ${WRKSRC}/usr/lib/opera/${OPERA_VER}/operapluginwrapper ${PREFIX}/share/bin/operapluginwrapper.midnightbsd
+	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${PREFIX}/share/bin
 	@${MKDIR} ${PREFIX}/share/apps/Internet
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${MKDIR} ${PREFIX}/share/applnk/Internet
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/opera/distinfo,v
retrieving revision 1.16
retrieving revision 1.17
diff -L www/opera/distinfo -L www/opera/distinfo -u -r1.16 -r1.17
--- www/opera/distinfo
+++ www/opera/distinfo
@@ -1,6 +1,15 @@
-MD5 (opera-9.52-2091.freebsd6-shared-qt3.i386.tar.bz2) = d238cfe02bbe8066fced46ff792fab4e
-SHA256 (opera-9.52-2091.freebsd6-shared-qt3.i386.tar.bz2) = beba06e2f0f9671a86fa382fdfb8655fa0dd779a81e58ff50564e9f81b87b260
-SIZE (opera-9.52-2091.freebsd6-shared-qt3.i386.tar.bz2) = 7115380
-MD5 (opera-9.52-2091.freebsd6-shared-qt3.amd64.tar.bz2) = ff22f6cd6958935119779898f94aef7f
-SHA256 (opera-9.52-2091.freebsd6-shared-qt3.amd64.tar.bz2) = d22bef226ec7b9be5984917ca612bde10963e71f7b2d260d7b8ae31154492f50
-SIZE (opera-9.52-2091.freebsd6-shared-qt3.amd64.tar.bz2) = 7617428
+MD5 (opera-9.63-freebsd6-shared-qt3.amd64.tar.bz2) = 75d473747e7166e3410ccbbe1c9b6c3f
+SHA256 (opera-9.63-freebsd6-shared-qt3.amd64.tar.bz2) = 03639fb4abd0dbe4157dad02b7a6621cac6a110597c4344c60b638578da17e5e
+SIZE (opera-9.63-freebsd6-shared-qt3.amd64.tar.bz2) = 7996409
+MD5 (opera-9.63-freebsd7-shared-qt3.amd64.tar.bz2) = b7f23283c4e81e4257301b1c0199a31e
+SHA256 (opera-9.63-freebsd7-shared-qt3.amd64.tar.bz2) = 566d9f255c889dd24d8f023abc1199a7d087d61fa1b8b637040f7fb3c9f5c423
+SIZE (opera-9.63-freebsd7-shared-qt3.amd64.tar.bz2) = 7889803
+MD5 (opera-9.63-freebsd5-shared-qt3.i386.tar.bz2) = a69a3661f1714c44f2ed88049fd29c92
+SHA256 (opera-9.63-freebsd5-shared-qt3.i386.tar.bz2) = ce93c627c81e73baebff54c00abdeb683e9509684b0ef137bf88fa4024a321a5
+SIZE (opera-9.63-freebsd5-shared-qt3.i386.tar.bz2) = 7490934
+MD5 (opera-9.63-freebsd6-shared-qt3.i386.tar.bz2) = cca4ece9b44d72986887862ae8c7b661
+SHA256 (opera-9.63-freebsd6-shared-qt3.i386.tar.bz2) = b1f037f010a28735e92c9735dae5295d562ff604a833836cae82199d73591023
+SIZE (opera-9.63-freebsd6-shared-qt3.i386.tar.bz2) = 7493282
+MD5 (opera-9.63-freebsd7-shared-qt3.i386.tar.bz2) = d1e1d426e5d33b14d73e799fcb312d66
+SHA256 (opera-9.63-freebsd7-shared-qt3.i386.tar.bz2) = e28cbf458916e6fccffa6121604e46f1ff24b2686050e41a2731a7dfda74cb6e
+SIZE (opera-9.63-freebsd7-shared-qt3.i386.tar.bz2) = 7359449
--- /dev/null
+++ www/opera/files/operapluginwrapper
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+if [ -n "$5" ]; then
+	ELFTYPE=`brandelf $5`
+elif [ -n "$4" ]; then
+	ELFTYPE=`brandelf $4`
+elif [ -n "$3" ]; then
+	ELFTYPE=`brandelf $3`
+fi
+
+WRAPPER="midnightbsd"
+
+case "${ELFTYPE}" in
+	*SVR4*|*Linux*)
+		if [ -x "$0.linux" ]; then
+			WRAPPER="linux"
+		fi
+	;;
+esac
+
+exec $0.$WRAPPER $@
+

From laffer1 at midnightbsd.org  Sat Jan  3 17:31:19 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 17:31:19 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: mports/misc: Fix master site for compat5x
	(freebsd local sites)
Message-ID: <200901032231.n03MVJ8V044017@stargazer.midnightbsd.org>

Log Message:
-----------
Fix master site for compat5x (freebsd local sites)

Add freebsd 6.x compat library for current use.

Modified Files:
--------------
    mports/misc:
        Makefile (r1.53 -> r1.54)
    mports/misc/compat5x:
        Makefile (r1.6 -> r1.7)

Added Files:
-----------
    mports/misc/compat6x:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-message (r1.1)
        pkg-plist.amd64 (r1.1)
        pkg-plist.i386 (r1.1)
        pkg-plist.sparc64 (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/misc/compat5x/Makefile,v
retrieving revision 1.6
retrieving revision 1.7
diff -L misc/compat5x/Makefile -L misc/compat5x/Makefile -u -r1.6 -r1.7
--- misc/compat5x/Makefile
+++ misc/compat5x/Makefile
@@ -14,7 +14,7 @@
 PORTVERSION=	5.4.0.8
 PORTREVISION=	7
 CATEGORIES=	misc
-MASTER_SITES=	${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL}
 MASTER_SITE_SUBDIR=lesi/compat5x
 PKGNAMESUFFIX=	-${ARCH}
 DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/misc/Makefile,v
retrieving revision 1.53
retrieving revision 1.54
diff -L misc/Makefile -L misc/Makefile -u -r1.53 -r1.54
--- misc/Makefile
+++ misc/Makefile
@@ -7,6 +7,7 @@
     SUBDIR += chmlib
     SUBDIR += compat4x
     SUBDIR += compat5x
+    SUBDIR += compat6x
     SUBDIR += cpuid
     SUBDIR += dict-de
     SUBDIR += dnetc
--- /dev/null
+++ misc/compat6x/pkg-message
@@ -0,0 +1,2 @@
+Do not forget to add COMPAT_FREEBSD6 into
+your kernel configuration (enabled by default).
--- /dev/null
+++ misc/compat6x/pkg-plist.amd64
@@ -0,0 +1,213 @@
+lib/compat/libalias.so.5
+lib/compat/libarchive.so.2
+lib/compat/libasn1.so.8
+lib/compat/libatm.so.3
+lib/compat/libbegemot.so.2
+lib/compat/libbluetooth.so.2
+lib/compat/libbsdxml.so.2
+lib/compat/libbsm.so.1
+lib/compat/libbsnmp.so.3
+lib/compat/libbz2.so.2
+lib/compat/libc.so.6
+lib/compat/libc_r.so.6
+lib/compat/libcalendar.so.3
+lib/compat/libcam.so.3
+lib/compat/libcom_err.so.3
+lib/compat/libcrypt.so.3
+lib/compat/libcrypto.so.4
+lib/compat/libdevinfo.so.3
+lib/compat/libdevstat.so.5
+lib/compat/libdialog.so.5
+lib/compat/libedit.so.5
+lib/compat/libfetch.so.4
+lib/compat/libform.so.3
+lib/compat/libformw.so.3
+lib/compat/libftpio.so.6
+lib/compat/libg2c.so.2
+lib/compat/libgeom.so.3
+lib/compat/libgnuregex.so.3
+lib/compat/libgpib.so.1
+lib/compat/libgssapi.so.8
+lib/compat/libhdb.so.8
+lib/compat/libhistory.so.6
+lib/compat/libipsec.so.2
+lib/compat/libipx.so.3
+lib/compat/libkadm5clnt.so.8
+lib/compat/libkadm5srv.so.8
+lib/compat/libkafs5.so.8
+lib/compat/libkiconv.so.2
+lib/compat/libkrb5.so.8
+lib/compat/libkvm.so.3
+lib/compat/libm.so.4
+lib/compat/libmagic.so.2
+lib/compat/libmd.so.3
+lib/compat/libmemstat.so.1
+lib/compat/libmenu.so.3
+lib/compat/libmenuw.so.3
+lib/compat/libmilter.so.3
+lib/compat/libmp.so.5
+lib/compat/libncp.so.2
+lib/compat/libncurses.so.6
+lib/compat/libncursesw.so.6
+lib/compat/libnetgraph.so.2
+lib/compat/libngatm.so.2
+lib/compat/libobjc.so.2
+lib/compat/libopie.so.4
+lib/compat/libpam.so.3
+lib/compat/libpanel.so.3
+lib/compat/libpanelw.so.3
+lib/compat/libpcap.so.4
+lib/compat/libpmc.so.3
+lib/compat/libpthread.so.2
+lib/compat/libradius.so.2
+lib/compat/libreadline.so.6
+lib/compat/libroken.so.8
+lib/compat/librpcsvc.so.3
+lib/compat/libsbuf.so.3
+lib/compat/libsdp.so.2
+lib/compat/libsmb.so.2
+lib/compat/libssh.so.3
+lib/compat/libssl.so.4
+lib/compat/libstdc++.so.5
+lib/compat/libtacplus.so.2
+lib/compat/libthr.so.2
+lib/compat/libthread_db.so.2
+lib/compat/libufs.so.3
+lib/compat/libugidfw.so.2
+lib/compat/libusbhid.so.2
+lib/compat/libutil.so.5
+lib/compat/libwrap.so.4
+lib/compat/libypclnt.so.2
+lib/compat/libz.so.3
+lib/compat/pam_chroot.so.3
+lib/compat/pam_deny.so.3
+lib/compat/pam_echo.so.3
+lib/compat/pam_exec.so.3
+lib/compat/pam_ftpusers.so.3
+lib/compat/pam_group.so.3
+lib/compat/pam_guest.so.3
+lib/compat/pam_krb5.so.3
+lib/compat/pam_ksu.so.3
+lib/compat/pam_lastlog.so.3
+lib/compat/pam_login_access.so.3
+lib/compat/pam_nologin.so.3
+lib/compat/pam_opie.so.3
+lib/compat/pam_opieaccess.so.3
+lib/compat/pam_passwdqc.so.3
+lib/compat/pam_permit.so.3
+lib/compat/pam_radius.so.3
+lib/compat/pam_rhosts.so.3
+lib/compat/pam_rootok.so.3
+lib/compat/pam_securetty.so.3
+lib/compat/pam_self.so.3
+lib/compat/pam_ssh.so.3
+lib/compat/pam_tacplus.so.3
+lib/compat/pam_unix.so.3
+lib/compat/snmp_atm.so.4
+lib/compat/snmp_bridge.so.4
+lib/compat/snmp_hostres.so.4
+lib/compat/snmp_mibII.so.4
+lib/compat/snmp_netgraph.so.4
+lib/compat/snmp_pf.so.4
+lib32/compat/libalias.so.5
+lib32/compat/libarchive.so.2
+lib32/compat/libatm.so.3
+lib32/compat/libbegemot.so.2
+lib32/compat/libbluetooth.so.2
+lib32/compat/libbsdxml.so.2
+lib32/compat/libbsm.so.1
+lib32/compat/libbsnmp.so.3
+lib32/compat/libbz2.so.2
+lib32/compat/libc.so.6
+lib32/compat/libc_r.so.6
+lib32/compat/libcalendar.so.3
+lib32/compat/libcam.so.3
+lib32/compat/libcom_err.so.3
+lib32/compat/libcrypt.so.3
+lib32/compat/libcrypto.so.4
+lib32/compat/libdevinfo.so.3
+lib32/compat/libdevstat.so.5
+lib32/compat/libdialog.so.5
+lib32/compat/libedit.so.5
+lib32/compat/libfetch.so.4
+lib32/compat/libform.so.3
+lib32/compat/libformw.so.3
+lib32/compat/libftpio.so.6
+lib32/compat/libg2c.so.2
+lib32/compat/libgeom.so.3
+lib32/compat/libgnuregex.so.3
+lib32/compat/libgpib.so.1
+lib32/compat/libhistory.so.6
+lib32/compat/libipsec.so.2
+lib32/compat/libipx.so.3
+lib32/compat/libkiconv.so.2
+lib32/compat/libkvm.so.3
+lib32/compat/libm.so.4
+lib32/compat/libmagic.so.2
+lib32/compat/libmd.so.3
+lib32/compat/libmemstat.so.1
+lib32/compat/libmenu.so.3
+lib32/compat/libmenuw.so.3
+lib32/compat/libmilter.so.3
+lib32/compat/libmp.so.5
+lib32/compat/libncp.so.2
+lib32/compat/libncurses.so.6
+lib32/compat/libncursesw.so.6
+lib32/compat/libnetgraph.so.2
+lib32/compat/libngatm.so.2
+lib32/compat/libobjc.so.2
+lib32/compat/libopie.so.4
+lib32/compat/libpam.so.3
+lib32/compat/libpanel.so.3
+lib32/compat/libpanelw.so.3
+lib32/compat/libpcap.so.4
+lib32/compat/libpmc.so.3
+lib32/compat/libpthread.so.2
+lib32/compat/libradius.so.2
+lib32/compat/libreadline.so.6
+lib32/compat/librpcsvc.so.3
+lib32/compat/libsbuf.so.3
+lib32/compat/libsdp.so.2
+lib32/compat/libsmb.so.2
+lib32/compat/libssh.so.3
+lib32/compat/libssl.so.4
+lib32/compat/libstdc++.so.5
+lib32/compat/libtacplus.so.2
+lib32/compat/libthr.so.2
+lib32/compat/libthread_db.so.2
+lib32/compat/libufs.so.3
+lib32/compat/libugidfw.so.2
+lib32/compat/libusbhid.so.2
+lib32/compat/libutil.so.5
+lib32/compat/libvgl.so.4
+lib32/compat/libwrap.so.4
+lib32/compat/libypclnt.so.2
+lib32/compat/libz.so.3
+lib32/compat/pam_chroot.so.3
+lib32/compat/pam_deny.so.3
+lib32/compat/pam_echo.so.3
+lib32/compat/pam_exec.so.3
+lib32/compat/pam_ftpusers.so.3
+lib32/compat/pam_group.so.3
+lib32/compat/pam_guest.so.3
+lib32/compat/pam_krb5.so.3
+lib32/compat/pam_ksu.so.3
+lib32/compat/pam_lastlog.so.3
+lib32/compat/pam_login_access.so.3
+lib32/compat/pam_nologin.so.3
+lib32/compat/pam_opie.so.3
+lib32/compat/pam_opieaccess.so.3
+lib32/compat/pam_passwdqc.so.3
+lib32/compat/pam_permit.so.3
+lib32/compat/pam_radius.so.3
+lib32/compat/pam_rhosts.so.3
+lib32/compat/pam_rootok.so.3
+lib32/compat/pam_securetty.so.3
+lib32/compat/pam_self.so.3
+lib32/compat/pam_ssh.so.3
+lib32/compat/pam_tacplus.so.3
+lib32/compat/pam_unix.so.3
+ at dirrmtry lib/compat
+ at dirrmtry lib32/compat
+ at dirrmtry lib32
+ at exec %%LDCONFIG_LIB32%% -m %D/lib32/compat
--- /dev/null
+++ misc/compat6x/pkg-descr
@@ -0,0 +1,13 @@
+This package allows you to install the FreeBSD 6.x compat libraries 
+on your system.  These libraries allow you to run FreeBSD 6.x
+programs.
+
+Ports usage example: (for developers)
+
+--
+.include 
+
+.if ${OSVERSION} >= 3000
+LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
+.endif
+--
--- /dev/null
+++ misc/compat6x/pkg-plist.sparc64
@@ -0,0 +1,109 @@
+lib/compat/libalias.so.5
+lib/compat/libarchive.so.2
+lib/compat/libasn1.so.8
+lib/compat/libatm.so.3
+lib/compat/libbegemot.so.2
+lib/compat/libbluetooth.so.2
+lib/compat/libbsdxml.so.2
+lib/compat/libbsm.so.1
+lib/compat/libbsnmp.so.3
+lib/compat/libbz2.so.2
+lib/compat/libc.so.6
+lib/compat/libcalendar.so.3
+lib/compat/libcam.so.3
+lib/compat/libcom_err.so.3
+lib/compat/libcrypt.so.3
+lib/compat/libcrypto.so.4
+lib/compat/libdevinfo.so.3
+lib/compat/libdevstat.so.5
+lib/compat/libdialog.so.5
+lib/compat/libedit.so.5
+lib/compat/libfetch.so.4
+lib/compat/libform.so.3
+lib/compat/libformw.so.3
+lib/compat/libftpio.so.6
+lib/compat/libg2c.so.2
+lib/compat/libgeom.so.3
+lib/compat/libgnuregex.so.3
+lib/compat/libgpib.so.1
+lib/compat/libgssapi.so.8
+lib/compat/libhdb.so.8
+lib/compat/libhistory.so.6
+lib/compat/libipsec.so.2
+lib/compat/libipx.so.3
+lib/compat/libkadm5clnt.so.8
+lib/compat/libkadm5srv.so.8
+lib/compat/libkafs5.so.8
+lib/compat/libkiconv.so.2
+lib/compat/libkrb5.so.8
+lib/compat/libkse.so.2
+lib/compat/libkvm.so.3
+lib/compat/libm.so.4
+lib/compat/libmagic.so.2
+lib/compat/libmd.so.3
+lib/compat/libmemstat.so.1
+lib/compat/libmenu.so.3
+lib/compat/libmenuw.so.3
+lib/compat/libmilter.so.3
+lib/compat/libmp.so.5
+lib/compat/libncurses.so.6
+lib/compat/libncursesw.so.6
+lib/compat/libnetgraph.so.2
+lib/compat/libngatm.so.2
+lib/compat/libobjc.so.2
+lib/compat/libopie.so.4
+lib/compat/libpam.so.3
+lib/compat/libpanel.so.3
+lib/compat/libpanelw.so.3
+lib/compat/libpcap.so.4
+lib/compat/libpmc.so.3
+lib/compat/libradius.so.2
+lib/compat/libreadline.so.6
+lib/compat/libroken.so.8
+lib/compat/librpcsvc.so.3
+lib/compat/libsbuf.so.3
+lib/compat/libsdp.so.2
+lib/compat/libssh.so.3
+lib/compat/libssl.so.4
+lib/compat/libstdc++.so.5
+lib/compat/libtacplus.so.2
+lib/compat/libthr.so.2
+lib/compat/libthread_db.so.2
+lib/compat/libufs.so.3
+lib/compat/libugidfw.so.2
+lib/compat/libusbhid.so.2
+lib/compat/libutil.so.5
+lib/compat/libwrap.so.4
+lib/compat/libypclnt.so.2
+lib/compat/libz.so.3
+lib/compat/pam_chroot.so.3
+lib/compat/pam_deny.so.3
+lib/compat/pam_echo.so.3
+lib/compat/pam_exec.so.3
+lib/compat/pam_ftpusers.so.3
+lib/compat/pam_group.so.3
+lib/compat/pam_guest.so.3
+lib/compat/pam_krb5.so.3
+lib/compat/pam_ksu.so.3
+lib/compat/pam_lastlog.so.3
+lib/compat/pam_login_access.so.3
+lib/compat/pam_nologin.so.3
+lib/compat/pam_opie.so.3
+lib/compat/pam_opieaccess.so.3
+lib/compat/pam_passwdqc.so.3
+lib/compat/pam_permit.so.3
+lib/compat/pam_radius.so.3
+lib/compat/pam_rhosts.so.3
+lib/compat/pam_rootok.so.3
+lib/compat/pam_securetty.so.3
+lib/compat/pam_self.so.3
+lib/compat/pam_ssh.so.3
+lib/compat/pam_tacplus.so.3
+lib/compat/pam_unix.so.3
+lib/compat/snmp_atm.so.4
+lib/compat/snmp_bridge.so.4
+lib/compat/snmp_hostres.so.4
+lib/compat/snmp_mibII.so.4
+lib/compat/snmp_netgraph.so.4
+lib/compat/snmp_pf.so.4
+ at dirrmtry lib/compat
--- /dev/null
+++ misc/compat6x/Makefile
@@ -0,0 +1,48 @@
+# $MidnightBSD: mports/misc/compat6x/Makefile,v 1.1 2009/01/03 22:31:16 laffer1 Exp $
+
+PORTNAME=	compat6x
+PORTVERSION=	6.4.604000.200810
+CATEGORIES=	misc
+MASTER_SITES=	${MASTER_SITE_FREEBSD_LOCAL} \
+		http://people.freebsd.org/~${MASTER_SITE_SUBDIR}/
+MASTER_SITE_SUBDIR=	mnag/compat6x
+PKGNAMESUFFIX=	-${ARCH}
+DISTNAME=	${PORTNAME}-${ARCH}-${PORTVERSION}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	A convenience package to install the FreeBSD 6.x compat libraries
+LICENSE=	agg
+
+USE_BZIP2=	yes
+NO_BUILD=	yes
+ONLY_FOR_ARCHS=	i386 amd64 sparc64
+PLIST=		${PKGDIR}/pkg-plist.${ARCH}
+USE_LDCONFIG=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/compat
+TARGET_DIR=	${PREFIX}/lib/compat
+TARGET32_DIR=	${PREFIX}/lib32/compat
+USE_LDCONFIG=	${TARGET_DIR}
+
+.include 
+
+.if ${OSVERSION} < 3000
+IGNORE=		is for MidnightBSD 0.3  and newer
+.endif
+
+.if ${ARCH} == amd64
+PLIST_SUB+=	LDCONFIG_LIB32="${LDCONFIG} -32"
+USE_LDCONFIG32=	${TARGET32_DIR}
+.endif
+
+do-install:
+	@${MKDIR} ${TARGET_DIR}
+	(cd ${WRKSRC}/lib && ${INSTALL_DATA} *.so.* ${TARGET_DIR})
+.if ${ARCH} == amd64
+	@${MKDIR} ${TARGET32_DIR}
+	(cd ${WRKSRC}/lib32 && ${INSTALL_DATA} *.so.* ${TARGET32_DIR})
+.endif
+
+# Include this file to use install-ldconfig-file
+.include "${PORTSDIR}/misc/ldconfig_compat/bsd.ldconfig.mk"
+
+.include 
--- /dev/null
+++ misc/compat6x/pkg-plist.i386
@@ -0,0 +1,113 @@
+lib/compat/libalias.so.5
+lib/compat/libarchive.so.2
+lib/compat/libasn1.so.8
+lib/compat/libatm.so.3
+lib/compat/libbegemot.so.2
+lib/compat/libbluetooth.so.2
+lib/compat/libbsdxml.so.2
+lib/compat/libbsm.so.1
+lib/compat/libbsnmp.so.3
+lib/compat/libbz2.so.2
+lib/compat/libc.so.6
+lib/compat/libc_r.so.6
+lib/compat/libcalendar.so.3
+lib/compat/libcam.so.3
+lib/compat/libcom_err.so.3
+lib/compat/libcrypt.so.3
+lib/compat/libcrypto.so.4
+lib/compat/libdevinfo.so.3
+lib/compat/libdevstat.so.5
+lib/compat/libdialog.so.5
+lib/compat/libedit.so.5
+lib/compat/libfetch.so.4
+lib/compat/libform.so.3
+lib/compat/libformw.so.3
+lib/compat/libftpio.so.6
+lib/compat/libg2c.so.2
+lib/compat/libgeom.so.3
+lib/compat/libgnuregex.so.3
+lib/compat/libgpib.so.1
+lib/compat/libgssapi.so.8
+lib/compat/libhdb.so.8
+lib/compat/libhistory.so.6
+lib/compat/libipsec.so.2
+lib/compat/libipx.so.3
+lib/compat/libkadm5clnt.so.8
+lib/compat/libkadm5srv.so.8
+lib/compat/libkafs5.so.8
+lib/compat/libkiconv.so.2
+lib/compat/libkrb5.so.8
+lib/compat/libkvm.so.3
+lib/compat/libm.so.4
+lib/compat/libmagic.so.2
+lib/compat/libmd.so.3
+lib/compat/libmemstat.so.1
+lib/compat/libmenu.so.3
+lib/compat/libmenuw.so.3
+lib/compat/libmilter.so.3
+lib/compat/libmp.so.5
+lib/compat/libncp.so.2
+lib/compat/libncurses.so.6
+lib/compat/libncursesw.so.6
+lib/compat/libnetgraph.so.2
+lib/compat/libngatm.so.2
+lib/compat/libobjc.so.2
+lib/compat/libopie.so.4
+lib/compat/libpam.so.3
+lib/compat/libpanel.so.3
+lib/compat/libpanelw.so.3
+lib/compat/libpcap.so.4
+lib/compat/libpmc.so.3
+lib/compat/libpthread.so.2
+lib/compat/libradius.so.2
+lib/compat/libreadline.so.6
+lib/compat/libroken.so.8
+lib/compat/librpcsvc.so.3
+lib/compat/libsbuf.so.3
+lib/compat/libsdp.so.2
+lib/compat/libsmb.so.2
+lib/compat/libssh.so.3
+lib/compat/libssl.so.4
+lib/compat/libstdc++.so.5
+lib/compat/libtacplus.so.2
+lib/compat/libthr.so.2
+lib/compat/libthread_db.so.2
+lib/compat/libufs.so.3
+lib/compat/libugidfw.so.2
+lib/compat/libusbhid.so.2
+lib/compat/libutil.so.5
+lib/compat/libvgl.so.4
+lib/compat/libwrap.so.4
+lib/compat/libypclnt.so.2
+lib/compat/libz.so.3
+lib/compat/pam_chroot.so.3
+lib/compat/pam_deny.so.3
+lib/compat/pam_echo.so.3
+lib/compat/pam_exec.so.3
+lib/compat/pam_ftpusers.so.3
+lib/compat/pam_group.so.3
+lib/compat/pam_guest.so.3
+lib/compat/pam_krb5.so.3
+lib/compat/pam_ksu.so.3
+lib/compat/pam_lastlog.so.3
+lib/compat/pam_login_access.so.3
+lib/compat/pam_nologin.so.3
+lib/compat/pam_opie.so.3
+lib/compat/pam_opieaccess.so.3
+lib/compat/pam_passwdqc.so.3
+lib/compat/pam_permit.so.3
+lib/compat/pam_radius.so.3
+lib/compat/pam_rhosts.so.3
+lib/compat/pam_rootok.so.3
+lib/compat/pam_securetty.so.3
+lib/compat/pam_self.so.3
+lib/compat/pam_ssh.so.3
+lib/compat/pam_tacplus.so.3
+lib/compat/pam_unix.so.3
+lib/compat/snmp_atm.so.4
+lib/compat/snmp_bridge.so.4
+lib/compat/snmp_hostres.so.4
+lib/compat/snmp_mibII.so.4
+lib/compat/snmp_netgraph.so.4
+lib/compat/snmp_pf.so.4
+ at dirrmtry lib/compat
--- /dev/null
+++ misc/compat6x/distinfo
@@ -0,0 +1,12 @@
+MD5 (compat6x-i386-6.4.604000.200810.tar.bz2) = 88632dba1d50638c44d5ad5f6cd5dfc4
+SHA256 (compat6x-i386-6.4.604000.200810.tar.bz2) = f63e66f8bb1e0ebb897cbb4ba9cce3ad536595671d7040b68aad74d09a2e4709
+SIZE (compat6x-i386-6.4.604000.200810.tar.bz2) = 3133715
+MD5 (compat6x-amd64-6.4.604000.200810.tar.bz2) = e8b4686eb033af4102e0ba3c72b7417a
+SHA256 (compat6x-amd64-6.4.604000.200810.tar.bz2) = 1fc72de76586f97fb62975f3af168b8a8b1c6c9ed86f9e37ec054a3ab5c8b842
+SIZE (compat6x-amd64-6.4.604000.200810.tar.bz2) = 6445228
+MD5 (compat6x-sparc64-6.4.604000.200810.tar.bz2) = fadb17449975f8df1d563e8bf379134b
+SHA256 (compat6x-sparc64-6.4.604000.200810.tar.bz2) = 6076471b01136202506d4c0b4c23b9968400aef7b25ea34a1765ac6bcbf7fa0e
+SIZE (compat6x-sparc64-6.4.604000.200810.tar.bz2) = 3313585
+MD5 (compat6x-alpha-6.4.604000.200810.tar.bz2) = 3db64ec71dc60c1354d1eae4abc9ddf9
+SHA256 (compat6x-alpha-6.4.604000.200810.tar.bz2) = e17218ebffaa169c6144739d05e0c2b551cf6c21e1c3770d33f5d4bdb15e2773
+SIZE (compat6x-alpha-6.4.604000.200810.tar.bz2) = 3809180

From laffer1 at midnightbsd.org  Sat Jan  3 17:32:31 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 17:32:31 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: pkg-plist: dirrmtry for hicolor directory
Message-ID: <200901032232.n03MWV44044086@stargazer.midnightbsd.org>

Log Message:
-----------
dirrmtry for hicolor directory

Modified Files:
--------------
    mports/www/opera:
        pkg-plist (r1.10 -> r1.11)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/opera/pkg-plist,v
retrieving revision 1.10
retrieving revision 1.11
diff -L www/opera/pkg-plist -L www/opera/pkg-plist -u -r1.10 -r1.11
--- www/opera/pkg-plist
+++ www/opera/pkg-plist
@@ -281,13 +281,13 @@
 @dirrm share/pixmaps
 @dirrm share/applnk/Internet
 @dirrm share/applnk
- at dirrm share/icons/hicolor/16x16/apps
- at dirrm share/icons/hicolor/16x16
- at dirrm share/icons/hicolor/22x22/apps
- at dirrm share/icons/hicolor/22x22
- at dirrm share/icons/hicolor/32x32/apps
- at dirrm share/icons/hicolor/32x32
- at dirrm share/icons/hicolor/48x48/apps
- at dirrm share/icons/hicolor/48x48
- at dirrm share/icons/hicolor
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor
 @dirrm share/icons

From laffer1 at midnightbsd.org  Sat Jan  3 17:40:52 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 17:40:52 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: www/opera: enable the compat 6x libraries
	for current so we can
Message-ID: <200901032240.n03MeqB8044840@stargazer.midnightbsd.org>

Log Message:
-----------
enable the compat 6x libraries for current so we can use the freebsd 6 version of opera

Modified Files:
--------------
    mports/www/opera:
        Makefile (r1.25 -> r1.26)
        pkg-plist (r1.11 -> r1.12)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/opera/pkg-plist,v
retrieving revision 1.11
retrieving revision 1.12
diff -L www/opera/pkg-plist -L www/opera/pkg-plist -u -r1.11 -r1.12
--- www/opera/pkg-plist
+++ www/opera/pkg-plist
@@ -207,7 +207,6 @@
 share/opera/styles/plugins.css
 share/opera/styles/search.css
 share/opera/styles/warning.css
-share/opera/webfeeds.html
 share/opera/styles/wml.css
 share/opera/skin/standard_skin.zip
 share/opera/skin/windows_skin.zip
@@ -276,11 +275,11 @@
 @dirrm share/opera/java
 @dirrm share/opera/plugins
 @dirrm share/opera
- at dirrm share/apps/Internet
- at dirrm share/apps
- at dirrm share/pixmaps
- at dirrm share/applnk/Internet
- at dirrm share/applnk
+ at dirrmtry share/apps/Internet
+ at dirrmtry share/apps
+ at dirrmtry share/pixmaps
+ at dirrmtry share/applnk/Internet
+ at dirrmtry share/applnk
 @dirrmtry share/icons/hicolor/16x16/apps
 @dirrmtry share/icons/hicolor/16x16
 @dirrmtry share/icons/hicolor/22x22/apps
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/opera/Makefile,v
retrieving revision 1.25
retrieving revision 1.26
diff -L www/opera/Makefile -L www/opera/Makefile -u -r1.25 -r1.26
--- www/opera/Makefile
+++ www/opera/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	opera
 PORTVERSION=	${OPERA_VER}
-PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	www ipv6
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
 		ftp://opera.inode.at/unix/freebsd/${OPERA_VER:S/.//}${OPERA_MINVER}/en/${OPERA_ARCH}/${OPERA_LIB}/ \
@@ -66,8 +66,9 @@
 .endif
 
 .if ${OSVERSION} >= 3000
-BROKEN=		Does not run pending GCC 4 migration
-OPERA_TYPE=	7
+#OPERA_TYPE=	7 switch after GCC 4 migration
+LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
+OPERA_TYPE=	6
 .else
 OPERA_TYPE=	6
 .endif
@@ -104,8 +105,8 @@
 do-install:
 	@(cd ${WRKSRC} && ./install.sh --prefix=${TRUE_PREFIX} --DESTDIR=${FAKE_DESTDIR})
 	@${MKDIR} ${PREFIX}/share/bin
-	@${CP} ${WRKSRC}/usr/lib/opera/${OPERA_VER}/operapluginwrapper ${PREFIX}/share/bin/operapluginwrapper.midnightbsd
-	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${PREFIX}/share/bin
+	@${CP} ${WRKSRC}/usr/lib/opera/${OPERA_VER}/operapluginwrapper ${PREFIX}/share/opera/bin/operapluginwrapper.midnightbsd
+	@${INSTALL_SCRIPT} ${PATCHDIR}/operapluginwrapper ${PREFIX}/share/opera/bin
 	@${MKDIR} ${PREFIX}/share/apps/Internet
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${MKDIR} ${PREFIX}/share/applnk/Internet

From ctriv at midnightbsd.org  Sat Jan  3 19:22:03 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:22:03 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: configure: remove configure
Message-ID: <200901040022.n040M3dU052502@stargazer.midnightbsd.org>

Log Message:
-----------
remove configure

Removed Files:
-------------
    mports/print/ghostscript-gpl/scripts:
        configure

-------------- next part --------------
--- print/ghostscript-gpl/scripts/configure
+++ /dev/null
@@ -1,390 +0,0 @@
-#! /bin/sh
-
-# $FreeBSD: ports/print/ghostscript-gpl/scripts/configure,v 1.39 2007/03/27 19:59:21 rafan Exp $
-
-# configure - gs driver preconfiguration, manual driver selection
-# by Andreas Klemm 
-
-tempfile=`mktemp -t checklist`
-
-if [ -z "${WITHOUT_X11}" ]; then
-x11devs="x11 x11alpha x11cmyk x11cmyk2 x11cmyk4 x11cmyk8 \
-	x11gray2 x11gray4 x11mono x11rg16x x11rg32x"
-fi
-
-if [ -n "${WITH_SVGALIB}" ]; then
-svgalibdevs="lvga256 vgalib"
-fi
-
-if [ ! -z "${GS_DRIVERS_LIST}" ]; then
-	set ${GS_DRIVERS_LIST}
-else
-	set \
-		$x11devs \
-		$svgalibdevs \
-		md2k md5k \
-		md50Mono md50Eco md1xMono \
-		appledmp iwhi iwlo iwlq hl7x0 bj10e \
-		bj10v bj10vh bj200 bjc600 bjc800 \
-		bjccmyk bjccolor bjcgray bjcmono \
-		lbp8 \
-		lbp1310 lbp1510 lbp1610 lbp1710 lbp1810 lbp1910 \
-		lips2p lips3 lips4 bjc880j lips4v \
-		m8510 coslw2p coslwxl uniprint \
-		lj250 declj250 ap3250 epson eps9mid eps9high lp8000 \
-		epag \
-		escpage lp2000 \
-		alc8600 alc8500 alc2000 alc4000 alc1900 alc4100 \
-		lp9800c lp9000c lp9500c lp8800c lp8300c lp8500c lp3000c \
-		lp8200c lp8000c \
-		epl6100 epl5900 epl5800 \
-		epl2050 epl2050p epl2120 epl2500 epl2750 \
-		lp9000b lp2500 lp9100 lp7900 lp7500 lp2400 lp2200 lp9400 \
-		lp8900 lp8700 lp8100 lp7700 lp8600f lp8400f lp8300f lp1900 \
-		lp9600s lp9300 lp9600 lp8600 lp1800 \
-		lq850 epsonc \
-		mjc180 mjc360 mjc720 mj500c \
-		st800 stcolor photoex lp2563 dnj650c deskjet djet500 cdeskjet \
-		djet500c cdjcolor cdjmono cdj500 cdj550 \
-		cdj670 cdj850 cdj880 cdj890 cdj1600 cdj970 \
-		laserjet ljetplus ljet2p ljet3 ljet3d ljet4 ljet4d lj4dith \
-		cljet5 cljet5c cljet5pr lj5mono lj5gray \
-		pj pjetxl pjxl paintjet \
-		pjxl300 pxlmono pxlcolor \
-		ijs ibmpro jetp3852 imagen fs600 lxm5700m \
-		lxm3200 lx5000 lex2050 lex3200 lex5700 lex7000 \
-		cp50 necp6 \
-		npdl \
-		oce9050 oki182 okiibm atx23 atx24 atx38 r4081 \
-		rpdl \
-		gdi \
-		sj48 t4693d2 t4693d4 t4693d8 tek4696 \
-		bmpmono bmpgray bmp16 bmp256 bmp16m bmp32b bmpsep1 bmpsep8 \
-		ccr \
-		cgmmono cgm8 cgm24 \
-		cif \
-		dfaxhigh dfaxlow \
-		xcf xcfcmyk \
-		faxg3 faxg32d faxg4 \
-		miff24 inferno jpeg jpeggray \
-		mgrmono mgrgray2 mgrgray4 mgrgray8 mgr4 mgr8 \
-		pcxmono pcxgray pcx16 pcx256 pcx24b pcxcmyk pdfwrite \
-		psdrgb psdcmyk \
-		bit bitrgb bitcmyk plan9bm pam pbm pbmraw \
-		pgm pgmraw pgnm pgnmraw pnm pnmraw ppm ppmraw \
-		pkm pkmraw pksm pksmraw \
-		pngmono pnggray png16 png256 png16m pngalpha \
-		psmono psgray psrgb \
-		pswrite ps2write epswrite sgirgb sunhmono \
-		tiffcrle tiffg3 tiffg32d tiffg4 \
-		tiff12nc tiff24nc tifflzw tiffpack \
-		bbox \
-		devicen perm spotcmyk
-fi
-
-for i; do
-	eval status_$i=ON
-done
-
-if [ -z "${BATCH}" ]; then
-	/usr/bin/dialog --title "GPL Ghostscript driver configuration" --clear \
-		--checklist "\n\
-This new ghostscript driver configuration dialog allows you to choose \n\
-only those gs drivers, you really need. Don't think too economical, since \n\
-other programs in the ports collection might need some of the default gs \n\
-file format drivers. The gs5 default drivers are preselected. \n\
-Have fun with this new configuration style !     -andreas \n\n\
-  Please choose options by pressing SPACE to TOGGLE an option ON/OFF ?" -1 -1 9 \
-  "x11"      "X Window System version 11, release >=4" "$status_x11" \
-  "x11alpha" "X Window System masquer. as device with alpha capability" "$status_x11alpha" \
-  "x11cmyk"  "X Window System masquer. as 1-bit-per-plane CMYK device" "$status_x11cmyk" \
-  "x11cmyk2" "X Window System as a 2-bit-per-plane CMYK device" "$status_x11cmyk2" \
-  "x11cmyk4" "X Window System as a 4-bit-per-plane CMYK device" "$status_x11cmyk4" \
-  "x11cmyk8" "X Window System as an 8-bit-per-plane CMYK device" "$status_x11cmyk8" \
-  "x11gray2" "X Window System as a 2-bit gray-scale device" "$status_x11gray2" \
-  "x11gray4" "X Window System as a 4-bit gray-scale device" "$status_x11gray4" \
-  "x11mono"  "X Window System masquer. as black-and-white device" "$status_x11mono" \
-  "x11rg16x" "X Window System with G5/B5/R6 pixel layout for testing" "$status_x11rg16x" \
-  "x11rg32x" "X Window System with G11/B10/R11 pixel layout for testing" "$status_x11rg32x" \
-  "lvga256"  "SVGAlib, 256-color VGA modes" "$status_lvga256" \
-  "vgalib"   "SVGAlib, 16-color VGA modes" "$status_vgalib" \
-  "md2k"     "ALPS MD-2000/2010/4000/1300/1500/5000 [MD2K]" "$status_md2k" \
-  "md5k"     "ALPS MD-5000 Eco Mode [MD2K]" "$status_md5k" \
-  "md50Mono" "ALPS MD-5000 Monochrome [ALPS]" "$status_md50Mono" \
-  "md50Eco"  "ALPS MD-5000 Eco Mode [ALPS]" "$status_md50Eco" \
-  "md1xMono" "ALPS MD-1x00 Monochrome [ALPS]" "$status_md1xMono" \
-  "appledmp" "Apple Dot Matrix Printer / Imagewriter" "$status_appledmp" \
-  "iwhi"     "Apple Imagewriter, high-resolution mode" "$status_iwhi" \
-  "iwlo"     "Apple Imagewriter, low-resolution mode" "$status_iwlo" \
-  "iwlq"     "Apple Imagewriter LQ in 320 x 216 dpi mode" "$status_iwlq" \
-  "hl7x0"    "Brother HL720 and HL730 (HL760=PCL), MFC6550MC Fax Machine" "$status_hl7x0" \
-  "bj10e"    "Canon BubbleJet BJ-10e" "$status_bj10e" \
-  "bj10v"    "Canon BubbleJet BJ-10v [BJ10V]" "$status_bj10v" \
-  "bj10vh"   "Canon BubbleJet BJ-10v, high-mergin [BJ10V]" "$status_bj10vh" \
-  "bj200"    "Canon BubbleJet BJ-200 and BJC-240(b&w)" "$status_bj200" \
-  "bjc600"   "Canon Color BJC-600/4xxx/70 + Apple StyleWriter 2x00" "$status_bjc600" \
-  "bjc800"   "Canon Color BubbleJet BJC-240/800" "$status_bjc800" \
-  "bjccmyk"  "Canon Color BubbleJet BJC-210/240/250/265/1000 [BJC250]" "$status_bjccmyk" \
-  "bjccolor" "Canon Color BubbleJet BJC-210 ... 1000 truecolor [BJC250]" "$status_bjccolor" \
-  "bjcgray"  "Canon Color BubbleJet BJC-210 ... 1000 grayscale [BJC250]" "$status_bjcgray" \
-  "bjcmono"  "Canon Color BubbleJet BJC-210 ... 1000 monochrome [BJC250]" "$status_bjcmono" \
-  "lbp8"     "Canon LBP-8II laser printer" "$status_lbp8" \
-  "lbp1310"  "Canon LBP-1310 laser printer [CPCA]" "$status_lbp1310" \
-  "lbp1510"  "Canon LBP-1510 laser printer [CPCA]" "$status_lbp1510" \
-  "lbp1610"  "Canon LBP-1610 laser printer [CPCA]" "$status_lbp1610" \
-  "lbp1710"  "Canon LBP-1710 laser printer [CPCA]" "$status_lbp1710" \
-  "lbp1810"  "Canon LBP-1810 laser printer [CPCA]" "$status_lbp1810" \
-  "lbp1910"  "Canon LBP-1910 laser printer [CPCA]" "$status_lbp1910" \
-  "lips2p"   "Canon LIPS II+ [LIPS]" "$status_lips2p" \
-  "lips3"    "Canon LIPS III [LIPS]" "$status_lips3" \
-  "lips4"    "Canon LIPS IV [LIPS]" "$status_lips4" \
-  "bjc880j"  "Canon LIPS IVc (BJC-680J/880J) [LIPS]" "$status_bjc880j" \
-  "lips4v"   "Canon LIPS IV, vector output mode [LIPS]" "$status_lips4v" \
-  "m8510"    "C.Itoh M8510 printer" "$status_m8510" \
-  "coslw2p"  "CoStar LabelWriter II II/Plus" "$status_coslw2p" \
-  "coslwxl"  "CoStar LabelWriter XL" "$status_coslwxl" \
-  "uniprint" "Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X mono/color driver" "$status_uniprint" \
-  "dmprt"    "Configurable dot matrix printer driver [DMPRT]" "$status_dmprt" \
-  "lj250"    "DEC LJ250 Companion color printer" "$status_lj250" \
-  "declj250" "DEC LJ250 driver (alternate)" "$status_declj250" \
-  "ap3250"   "Epson ActionPrinter 3250" "$status_ap3250" \
-  "epson"    "Epson-compatible dot matrix, 9/24-pin" "$status_epson" \
-  "eps9mid"  "Epson-compatible 9-pin, interleaved lines, medium resol" "$status_eps9mid" \
-  "eps9high" "Epson-compatible 9-pin, interleaved lines, triple resol" "$status_eps9high" \
-  "lp8000"   "Epson LP-8000 line printer" "$status_lp8000" \
-  "epag"     "Epson ESC/Page laser printer (generic) [EPAG]" "$status_epag" \
-  "escpage"  "Epson ESC/Page laser printer (generic) [LIPS]" "$status_escpage" \
-  "lp2000"   "Epson LP-2000/3000/7000/7000G laser printer [LIPS]" "$status_lp2000" \
-  "alc8600"  "Epson AL-C8600 color laser printer [EPLASER]" "$status_alc8600" \
-  "alc8500"  "Epson AL-C8500 color laser printer [EPLASER]" "$status_alc8500" \
-  "alc2000"  "Epson AL-C2000 color laser printer [EPLASER]" "$status_alc2000" \
-  "alc4000"  "Epson AL-C4000 color laser printer [EPLASER]" "$status_alc4000" \
-  "alc1900"  "Epson AL-C1900 color laser printer [EPLASER]" "$status_alc1900" \
-  "alc4100"  "Epson AL-C4100 color laser printer [EPLASER]" "$status_alc4100" \
-  "lp9800c"  "Epson LP-9800C color laser printer [EPLASER]" "$status_lp9800c" \
-  "lp9000c"  "Epson LP-9000C color laser printer [EPLASER]" "$status_lp9000c" \
-  "lp9500c"  "Epson LP-9500C color laser printer [EPLASER]" "$status_lp9500c" \
-  "lp8800c"  "Epson LP-8800C color laser printer [EPLASER]" "$status_lp8800c" \
-  "lp8300c"  "Epson LP-8300C color laser printer [EPLASER]" "$status_lp8300c" \
-  "lp8500c"  "Epson LP-8500C color laser printer [EPLASER]" "$status_lp8500c" \
-  "lp3000c"  "Epson LP-3000C color laser printer [EPLASER]" "$status_lp3000c" \
-  "lp8200c"  "Epson LP-8200C color laser printer [EPLASER]" "$status_lp8200c" \
-  "lp8000c"  "Epson LP-8000C color laser printer [EPLASER]" "$status_lp8000c" \
-  "epl6100"  "Epson EPL-6100 laser printer [EPLASER]" "$status_epl6100" \
-  "epl5900"  "Epson EPL-5900 laser printer [EPLASER]" "$status_epl5900" \
-  "epl5800"  "Epson EPL-5800 laser printer [EPLASER]" "$status_epl5800" \
-  "epl2050"  "Epson EPL-N2050 laser printer [EPLASER]" "$status_epl2050" \
-  "epl2050p" "Epson EPL-N2050+ laser printer [EPLASER]" "$status_epl2050p" \
-  "epl2120"  "Epson EPL-N2120 laser printer [EPLASER]" "$status_epl2120" \
-  "epl2500"  "Epson EPL-N2500 laser printer [EPLASER]" "$status_epl2500" \
-  "epl2750"  "Epson EPL-N2750 laser printer [EPLASER]" "$status_epl2750" \
-  "lp9000b"  "Epson LP-9000B laser printer [EPLASER]" "$status_lp9000b" \
-  "lp2500"   "Epson LP-2500 laser printer [EPLASER]" "$status_lp2500" \
-  "lp9100"   "Epson LP-9100(R) laser printer [EPLASER]" "$status_lp9100" \
-  "lp7900"   "Epson LP-7900(R) laser printer [EPLASER]" "$status_lp7900" \
-  "lp7500"   "Epson LP-7500(R) laser printer [EPLASER]" "$status_lp7500" \
-  "lp2400"   "Epson LP-2400 laser printer [EPLASER]" "$status_lp2400" \
-  "lp2200"   "Epson LP-2200 laser printer [EPLASER]" "$status_lp2200" \
-  "lp9400"   "Epson LP-9400(R) laser printer [EPLASER]" "$status_lp9400" \
-  "lp8900"   "Epson LP-8900(R) laser printer [EPLASER]" "$status_lp8900" \
-  "lp8700"   "Epson LP-8700(R) laser printer [EPLASER]" "$status_lp8700" \
-  "lp8100"   "Epson LP-8100(R) laser printer [EPLASER]" "$status_lp8100" \
-  "lp7700"   "Epson LP-7700(R) laser printer [EPLASER]" "$status_lp7700" \
-  "lp8600f"  "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600f" \
-  "lp8400f"  "Epson LP-8400FX(N) laser printer [EPLASER]" "$status_lp8400f" \
-  "lp8300f"  "Epson LP-8300F laser printer [EPLASER]" "$status_lp8300f" \
-  "lp1900"   "Epson LP-1900(N) laser printer [EPLASER]" "$status_lp1900" \
-  "lp9600s"  "Epson LP-9600S laser printer [EPLASER]" "$status_lp9600s" \
-  "lp9300"   "Epson LP-9300 laser printer [EPLASER]" "$status_lp9300" \
-  "lp9600"   "Epson LP-9600 laser printer [EPLASER]" "$status_lp9600" \
-  "lp8600"   "Epson LP-8600FX(N) laser printer [EPLASER]" "$status_lp8600" \
-  "lp1800"   "Epson LP-1800 laser printer [EPLASER]" "$status_lp1800" \
-  "lq850"    "Epson LQ-850 (360x360), ok for Canon BJ300 in LQ850 emul" "$status_lq850" \
-  "epsonc"   "Epson LQ-2550 and Fujitsu 3400/2400/1200 color" "$status_epsonc" \
-  "mjc180"   "Epson MachJet series 180dpi, CMYK [MJC]" "$status_mjc180" \
-  "mjc360"   "Epson MachJet series 360dpi, CMYK [MJC]" "$status_mjc360" \
-  "mjc720"   "Epson MachJet series 720dpi, CMYK [MJC]" "$status_mjc720" \
-  "mj500c"   "Epson MachJet MJ-500C 360dpi, CMY or mono [MJC]" "$status_mj500c" \
-  "st800"    "Epson Stylus 800 printer" "$status_st800" \
-  "stcolor"  "Epson Stylus Color and II/IIs/1500 (see driver docu)" "$status_stcolor" \
-  "photoex"  "Epson Stylus Color Photo, Photo EX, Photo 700" "$status_photoex" \
-  "lp2563"   "HP 2563B line printer" "$status_lp2563" \
-  "dnj650c"  "HP DesignJet 650C" "$status_dnj650c" \
-  "deskjet"  "HP DeskJet and DeskJet Plus" "$status_deskjet" \
-  "djet500"  "HP DeskJet 500 (for DeskJet 600 use -r600)" "$status_djet500" \
-  "cdeskjet" "HP DeskJet 500C, 1 bit/pixel color" "$status_cdeskjet" \
-  "djet500c" "HP DeskJet 500C alternate driver, not for 550/560C" "$status_djet500c" \
-  "cdjcolor" "HP DeskJet 500C/540C, 24bit/pxl+FS dith, Citizen Projet IIc" "$status_cdjcolor" \
-  "cdjmono"  "HP DeskJet 500/510/520/540C b/w printing" "$status_cdjmono" \
-  "cdj500"   "HP DeskJet 500/540C (same as cdjcolor)" "$status_cdj500" \
-  "cdj550"   "HP DeskJet 550C/560C/660C/660Cse" "$status_cdj550" \
-  "cdj670"   "HP DeskJet 670/690 [HP8XX]" "$status_cdj670" \
-  "cdj850"   "HP DeskJet 850/855/870/1100 [HP8XX]" "$status_cdj850" \
-  "cdj880"   "HP DeskJet 880 [HP8XX]" "$status_cdj880" \
-  "cdj890"   "HP DeskJet 890 [HP8XX]" "$status_cdj890" \
-  "cdj1600"  "HP DeskJet 1600 [HP8XX]" "$status_cdj1600" \
-  "cdj970"   "HP DeskJet 970CXi [DJ970]" "$status_cdj970" \
-  "laserjet" "HP LaserJet" "$status_laserjet" \
-  "ljetplus" "HP LaserJet Plus" "$status_ljetplus" \
-  "ljet2p"   "HP LaserJet IId/IIp/III* with TIFF compression" "$status_ljet2p" \
-  "ljet3"    "HP LaserJet III* with Delta Row compression" "$status_ljet3" \
-  "ljet3d"   "HP LaserJet IIID with duplex capability" "$status_ljet3d" \
-  "ljet4"    "HP LaserJet 4 and 5L/5P (not real LJ5), defaults to 600 dpi" "$status_ljet4" \
-  "ljet4d"   "HP LaserJet 4 (defaults to 600 dpi) with duplex" "$status_ljet4d" \
-  "lj4dith"  "HP LaserJet 4 with Floyd-Steinberg dithering" "$status_lj4dith" \
-  "cljet5"   "HP LaserJet 5/5M Color (new driver, old=cljet5pr)" "$status_cljet5" \
-  "cljet5c"  "HP LaserJet 5/5M Color Simple" "$status_cljet5c" \
-  "cljet5pr" "HP LaserJet 5/5M Color (old drv. with rotation hacks/flaws)" "$status_cljet5pr" \
-  "lj5mono"  "HP LaserJet 5 and 6 family (PCL5 / PCL XL), bitmap" "$status_lj5mono" \
-  "lj5gray"  "HP LaserJet 5 and 6 family, gray-scale bitmap" "$status_lj5gray" \
-  "pj"       "HP PaintJet XL driver " "$status_pj" \
-  "pjetxl"   "HP PaintJet XL driver (alternate)" "$status_pjetxl" \
-  "pjxl"     "HP PaintJet XL color printer" "$status_pjxl" \
-  "paintjet" "HP PaintJet color printer (alternate)" "$status_paintjet" \
-  "pjxl300"  "HP PaintJet XL300, DeskJet 1200C color printer, HP CopyJet" "$status_pjxl300" \
-  "pxlmono"  "HP PCL XL black-and-white printers (LaserJet 5 and 6 family)" "$status_pxlmono" \
-  "pxlcolor" "HP PCL XL color printers (Color LaserJet 4500/5000)" "$status_pxlcolor" \
-  "pcl3"     "HP PCL 3+ (generic) [PCL3]" "$status_pcl3" \
-  "ijs"      "HP Inkjet and other raster devices" "$status_ijs" \
-  "ibmpro"   "IBM 9-pin Proprinter" "$status_ibmpro" \
-  "jetp3852" "IBM Jetprinter ink-jet color (Model #3852)" "$status_jetp3852" \
-  "imagen"   "Imagen ImPress printers" "$status_imagen" \
-  "fs600"    "Kyocera FS-600 (600 dpi)" "$status_fs600" \
-  "lxm5700m" "Lexmark 5700 monotone" "$status_lxm5700m" \
-  "lxm3200"  "Lexmark 3200/Z12/Z22/Z31/Z32 [LXM3200]" "$status_lxm3200" \
-  "lx5000"   "Lexmark 5000/Z51/Z82 [LX5000]" "$status_lx5000" \
-  "lex2050"  "Lexmark 2050 [LEX7000]" "$status_lex2050" \
-  "lex3200"  "Lexmark 3200 [LEX7000]" "$status_lex3200" \
-  "lex5700"  "Lexmark 5700 [LEX7000]" "$status_lex5700" \
-  "lex7000"  "Lexmark 7000 [LEX7000]" "$status_lex7000" \
-  "cp50"     "Mitsubishi CP50 color" "$status_cp50" \
-  "necp6"    "NEC PinWriter P6/P6+/P60, 360x360 DPI resol" "$status_necp6" \
-  "npdl"     "NEC Printer Description Language [LIPS]" "$status_npdl" \
-  "oce9050"  "OCE 9050 printer" "$status_oce9050" \
-  "oki182"   "Okidata MicroLine 182" "$status_oki182" \
-  "okiibm"   "Okidata MicroLine IBM-compatible printers" "$status_okiibm" \
-  "atx23"    "Practical Automation ATX-23 label printer" "$status_atx23" \
-  "atx24"    "Practical Automation ATX-24 label printer" "$status_atx24" \
-  "atx38"    "Practical Automation ATX-38 label printer" "$status_atx38" \
-  "r4081"    "Ricoh 4081 laser printer" "$status_r4081" \
-  "rpdl"     "Ricoh Printer Description Language [LIPS]" "$status_rpdl" \
-  "gdi"      "Samsung SmartGDI laser printer [GDI]" "$status_gdi" \
-  "sj48"     "StarJet 48 inkjet printer" "$status_sj48" \
-  "t4693d2"  "Tektronix 4693d color, 2 bits per R/G/B component" "$status_t4693d2" \
-  "t4693d4"  "Tektronix 4693d color, 4 bits per R/G/B component" "$status_t4693d4" \
-  "t4693d8"  "Tektronix 4693d color, 8 bits per R/G/B component" "$status_t4693d8" \
-  "tek4696"  "Tektronix 4695/4696 inkjet plotter" "$status_tek4696" \
-  "bmpmono"  "BMP Monochrome" "$status_bmpmono" \
-  "bmpgray"  "BMP 8-bit gray" "$status_bmpgray" \
-  "bmp16"    "BMP 4-bit EGA/VGA" "$status_bmp16" \
-  "bmp256"   "BMP 8-bit 256-color" "$status_bmp256" \
-  "bmp16m"   "BMP 24-bit" "$status_bmp16m" \
-  "bmp32b"   "BMP 32-bit pseudo-.BMP" "$status_bmp32b" \
-  "bmpsep1"  "BMP Separated 1-bit CMYK" "$status_bmpsep1" \
-  "bmpsep8"  "BMP Separated 8-bit CMYK" "$status_bmpsep8" \
-  "ccr"      "CalComp Raster format" "$status_ccr" \
-  "cgmmono"  "CGM Monochrome -- LOW LEVEL OUTPUT ONLY" "$status_cgmmono" \
-  "cgm8"     "CGM 8-bit 256-color -- DITTO" "$status_cgm8" \
-  "cgm24"    "CGM 24-bit color -- DITTO" "$status_cgm24" \
-  "cif"      "CIF file format for VLSI" "$status_cif" \
-  "dfaxhigh" "DigiBoard, DigiFAX software format (high resol)" "$status_dfaxhigh" \
-  "dfaxlow"  "DigiFAX low (normal) resol" "$status_dfaxlow" \
-  "xcf"      "Gimp XCF, RGB" "$status_xcf" \
-  "xcfcmyk"  "Gimp XCF, CMYK" "$status_xcfcmyk" \
-  "faxg3"    "Group 3 fax, with EOLs but no header or EOD" "$status_faxg3" \
-  "faxg32d"  "Group 3 2-D fax, with EOLs but no header or EOD" "$status_faxg32d" \
-  "faxg4"    "Group 4 fax, with EOLs but no header or EOD" "$status_faxg4" \
-  "miff24"   "ImageMagick MIFF, 24-bit direct color, RLE compressed" "$status_miff24" \
-  "inferno"  "Inferno bitmaps" "$status_inferno" \
-  "jpeg"     "JPEG format, RGB output" "$status_jpeg" \
-  "jpeggray" "JPEG format, gray output" "$status_jpeggray" \
-  "mgrmono"  "MGR devices 1-bit monochrome" "$status_mgrmono" \
-  "mgrgray2" "MGR devices 2-bit gray scale" "$status_mgrgray2" \
-  "mgrgray4" "MGR devices 4-bit gray scale" "$status_mgrgray4" \
-  "mgrgray8" "MGR devices 8-bit gray scale" "$status_mgrgray8" \
-  "mgr4"     "MGR devices 4-bit (VGA) color" "$status_mgr4" \
-  "mgr8"     "MGR devices 8-bit color" "$status_mgr8" \
-  "pcxmono"  "PCX file format, monochrome 1-bit b/w" "$status_pcxmono" \
-  "pcxgray"  "PCX file format, 8-bit gray scale" "$status_pcxgray" \
-  "pcx16"    "PCX file format, 4-bit planar EGA/VGA color" "$status_pcx16" \
-  "pcx256"   "PCX file format, 8-bit chunky color" "$status_pcx256" \
-  "pcx24b"   "PCX file format, 24-bit color 3x8-bit planes" "$status_pcx24b" \
-  "pcxcmyk"  "PCX file format, 4-bit chunky CMYK color" "$status_pcxcmyk" \
-  "pdfwrite" "PDF output (like Adobe Acrobat Distiller)" "$status_pdfwrite" \
-  "psdrgb"   "PhotoShop PSD, RGB" "$status_psdrgb" \
-  "psdcmyk"  "PhotoShop PSD, CMYK" "$status_psdcmyk" \
-  "bit"      "Plain bits, monochrome" "$status_bit" \
-  "bitrgb"   "Plain bits, RGB" "$status_bitrgb" \
-  "bitcmyk"  "Plain bits, CMYK" "$status_bitcmyk" \
-  "plan9bm"  "Plan 9 bitmap format" "$status_plan9bm" \
-  "pam"      "Portable Arbitrary Map file format" "$status_pam" \
-  "pbm"      "Portable Bitmap,  plain format" "$status_pbm" \
-  "pbmraw"   "Portable Bitmap,  raw format" "$status_pbmraw" \
-  "pgm"      "Portable Graymap, plain format" "$status_pgm" \
-  "pgmraw"   "Portable Graymap, raw format" "$status_pgmraw" \
-  "pgnm"     "Portable Graymap, plain format, optim. to PBM" "$status_pgnm" \
-  "pgnmraw"  "Portable Graymap, raw format, optim. to PBM" "$status_pgmraw" \
-  "pnm"      "Portable Pixmap,  plain format RGB, optim. to PGM/PBM" "$status_pnm" \
-  "pnmraw"   "Portable Pixmap,  raw format RGB, optim. to PGM/PBM" "$status_pnmraw" \
-  "ppm"      "Portable Pixmap,  plain format RGB" "$status_ppm" \
-  "ppmraw"   "Portable Pixmap,  raw format RGB" "$status_ppmraw" \
-  "pkm"      "Portable inKmap (plain format) (4-bit CMYK => RGB)" "$status_pkm" \
-  "pkmraw"   "Portable inKmap (raw format) (4-bit CMYK => RGB)" "$status_pkmraw" \
-  "pksm"     "Portable Separated map (plain) (4-bit CMYK => 4 pages)" "$status_pksm" \
-  "pksmraw"  "Portable Separated map (raw) (4-bit CMYK => 4 pages)" "$status_pksmraw" \
-  "pngmono"  "PNG Monochrome Portable Network Graphics" "$status_pngmono" \
-  "pnggray"  "PNG 8-bit gray Portable Network Graphics" "$status_pnggray" \
-  "png16"    "PNG 4-bit color Portable Network Graphics" "$status_png16" \
-  "png256"   "PNG 8-bit color Portable Network Graphics" "$status_png256" \
-  "png16m"   "PNG 24-bit color Portable Network Graphics" "$status_png16m" \
-  "pngalpha" "PNG 32-bit RGBA color Portable Network Graphics" "$status_pngalpha" \
-  "psmono"   "PostScript (Level 1) monochrome image" "$status_psmono" \
-  "psgray"   "PostScript (Level 1) 8-bit gray image" "$status_psgray" \
-  "psrgb"    "PostScript (Level 2) 24-bit color image" "$status_psrgb" \
-  "pswrite"  "PostScript output (like PostScript Distillery)" "$status_pswrite" \
-  "ps2write" "PostScript (Level 2) output" "$status_ps2write" \
-  "epswrite" "EPS output (like PostScript Distillery)" "$status_epswrite" \
-  "sgirgb"   "SGI RGB pixmap format" "$status_sgirgb" \
-  "sunhmono" "Harlequin variant of 1-bit Sun raster file" "$status_sunhmono" \
-  "tiffcrle" "TIFF CCITT RLE 1 dim = Group 3 fax with no EOLs" "$status_tiffcrle" \
-  "tiffg3"   "TIFF Group 3 fax with EOLs" "$status_tiffg3" \
-  "tiffg32d" "TIFF Group 3 2-D fax" "$status_tiffg32d" \
-  "tiffg4"   "TIFF Group 4 fax" "$status_tiffg4" \
-  "tiff12nc" "TIFF 12-bit RGB, no compression" "$status_tiff12nc" \
-  "tiff24nc" "TIFF 24-bit RGB, no compression, NeXT std. format" "$status_tiff24nc" \
-  "tifflzw"  "TIFF LZW,      tag = 5,     mono" "$status_tifflzw" \
-  "tiffpack" "TIFF PackBits, tag = 32773, mono" "$status_tiffpack" \
-  "bbox"     "Bounding box output" "$status_bbox" \
-  "devicen"  "DeviceN process color model device" "$status_devicen" \
-  "perm"     "DeviceN which permutes color components" "$status_perm" \
-  "spotcmyk" "DeviceN with CMYK and spot color support" "$status_spotcmyk" \
-2> $tempfile
-
-	retval=$?
-
-	if [ -s $tempfile ]; then
-		set `sed 's/"//g' $tempfile`
-	fi
-	rm -f $tempfile
-
-	case $retval in
-		0)	if [ -z "$*" ]; then
-				echo "Nothing selected"
-			fi
-			;;
-		1)	echo "Cancel pressed."
-			exit 1
-			;;
-	esac
-fi
-
-exec > ${WRKSRC}/Makefile
-
-echo "DEVICE_DEVS=	\\"
-
-for i; do
-	echo "	\$(DD)$i.dev	\\"
-done
-
-echo ""
-cat "${WRKSRC}/src/unix-gcc.mak"

From ctriv at midnightbsd.org  Sat Jan  3 19:29:28 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:29:28 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: print/libspectre: Added libspectre-0.2.2
Message-ID: <200901040029.n040TSvw053461@stargazer.midnightbsd.org>

Log Message:
-----------
Added libspectre-0.2.2

Added Files:
-----------
    mports/print/libspectre:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ print/libspectre/pkg-descr
@@ -0,0 +1,3 @@
+A small library for rendering Postscript documents
+
+WWW: http://libspectre.freedesktop.org/wiki/
--- /dev/null
+++ print/libspectre/pkg-plist
@@ -0,0 +1,14 @@
+include/libspectre/spectre-document.h
+include/libspectre/spectre-exporter.h
+include/libspectre/spectre-macros.h
+include/libspectre/spectre-page.h
+include/libspectre/spectre-render-context.h
+include/libspectre/spectre-status.h
+include/libspectre/spectre-version.h
+include/libspectre/spectre.h
+lib/libspectre.a
+lib/libspectre.la
+lib/libspectre.so
+lib/libspectre.so.1
+libdata/pkgconfig/libspectre.pc
+ at dirrm include/libspectre
--- /dev/null
+++ print/libspectre/Makefile
@@ -0,0 +1,22 @@
+#
+# $MidnightBSD: mports/print/libspectre/Makefile,v 1.1 2009/01/04 00:29:27 ctriv Exp $
+#    $MCom: ports/print/libspectre/Makefile,v 1.2 2008/03/13 16:30:50 ahze Exp $
+
+PORTNAME=	libspectre
+PORTVERSION=	0.2.2
+CATEGORIES=	print
+MASTER_SITES=	http://libspectre.freedesktop.org/releases/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	A small library for rendering Postscript documents
+LICENSE=	gpl2
+
+LIB_DEPENDS=	cairo.2:${PORTSDIR}/graphics/cairo
+
+USE_AUTOTOOLS=	libtool:15
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack gnomeprefix ltverhack
+USE_GHOSTSCRIPT=yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-L${LOCALBASE}/lib"
+
+.include 
--- /dev/null
+++ print/libspectre/distinfo
@@ -0,0 +1,3 @@
+MD5 (libspectre-0.2.2.tar.gz) = 0600653653d9313e3be135b2217ea7fd
+SHA256 (libspectre-0.2.2.tar.gz) = 94d4e7b5916f925f992380237bc6ac9227291531b4cd18a21df54caef147f704
+SIZE (libspectre-0.2.2.tar.gz) = 391727

From ctriv at midnightbsd.org  Sat Jan  3 19:30:23 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:30:23 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add libspectre
Message-ID: <200901040030.n040UNEr053810@stargazer.midnightbsd.org>

Log Message:
-----------
add libspectre

Modified Files:
--------------
    mports/print:
        Makefile (r1.39 -> r1.40)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/Makefile,v
retrieving revision 1.39
retrieving revision 1.40
diff -L print/Makefile -L print/Makefile -u -r1.39 -r1.40
--- print/Makefile
+++ print/Makefile
@@ -34,10 +34,11 @@
     SUBDIR += jadetex
     SUBDIR += libgnomecups
     SUBDIR += libgnomeprint
-    SUBDIR += libgnomeprintmm
     SUBDIR += libgnomeprint-reference
+    SUBDIR += libgnomeprintmm
     SUBDIR += libijs
     SUBDIR += libpaper
+    SUBDIR += libspectre
     SUBDIR += mp-letter
     SUBDIR += pdflib
     SUBDIR += pecl-pdflib

From ctriv at midnightbsd.org  Sat Jan  3 19:39:19 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:39:19 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: devel/qca: Added qca-2.0.0
Message-ID: <200901040039.n040dJDe054439@stargazer.midnightbsd.org>

Log Message:
-----------
Added qca-2.0.0

Added Files:
-----------
    mports/devel/qca:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/devel/qca/files:
        patch-cmake-modules_FindQt4.cmake (r1.1)
        patch-src-src.pro (r1.1)

-------------- next part --------------
--- /dev/null
+++ devel/qca/pkg-descr
@@ -0,0 +1,13 @@
+QCA aims to provide a straightforward and cross-platform crypto API,
+using Qt datatypes and conventions.
+
+Supported features:
+
+  * SSL/TLS
+  * X509
+  * SASL
+  * RSA
+  * Hashing (SHA1, MD5)
+  * Ciphers (Blowfish, 3DES, AES)
+
+WWW: http://delta.affinix.com/qca/
--- /dev/null
+++ devel/qca/pkg-plist
@@ -0,0 +1,26 @@
+bin/qcatool2
+certs/rootcerts.pem
+include/QtCrypto/QtCrypto
+include/QtCrypto/qca.h
+include/QtCrypto/qca_basic.h
+include/QtCrypto/qca_cert.h
+include/QtCrypto/qca_core.h
+include/QtCrypto/qca_export.h
+include/QtCrypto/qca_keystore.h
+include/QtCrypto/qca_publickey.h
+include/QtCrypto/qca_securelayer.h
+include/QtCrypto/qca_securemessage.h
+include/QtCrypto/qca_support.h
+include/QtCrypto/qca_textfilter.h
+include/QtCrypto/qca_tools.h
+include/QtCrypto/qcaprovider.h
+include/QtCrypto/qpipe.h
+lib/libqca.so
+lib/libqca.so.2
+lib/libqca.so.2.0.0
+libdata/pkgconfig/qca.pc
+mkspecs/features/crypto.prf
+ at dirrmtry mkspecs/features
+ at dirrmtry mkspecs
+ at dirrmtry include/QtCrypto
+ at dirrmtry certs
--- /dev/null
+++ devel/qca/Makefile
@@ -0,0 +1,32 @@
+#
+# $MidnightBSD: mports/devel/qca/Makefile,v 1.1 2009/01/04 00:39:16 ctriv Exp $
+#
+
+PORTNAME=	qca
+PORTVERSION=	2.0.0
+CATEGORIES=	devel
+MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/
+DISTNAME=	qca-${PORTVERSION}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Cross-platform crypto API for QT
+LICENSE=	lgpl
+
+USE_AUTOTOOLS=	libtool:15
+USE_BZIP2=	yes
+USE_CMAKE=	yes
+CMAKE_USE_PTHREAD=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	qmake gui moc uic rcc qtestlib network
+USE_OPENSSL=	yes
+USE_LDCONFIG=	yes
+
+CMAKE_ARGS+=	-DQT_QMAKE_EXECUTABLE=${QMAKE}
+
+post-patch:
+	${MKDIR} ${WRKSRC}/plugins
+	${REINPLACE_CMD} -e \
+	's,$${LIB_SUFFIX}/pkgconfig/,data/pkgconfig,' \
+	${WRKSRC}/CMakeLists.txt
+
+.include 
--- /dev/null
+++ devel/qca/distinfo
@@ -0,0 +1,3 @@
+MD5 (qca-2.0.0.tar.bz2) = 07d54358ef4880d05b3c6f56b629aa55
+SHA256 (qca-2.0.0.tar.bz2) = 2ed0d49300459ae1f2d138fc2e68ed7f92850065981032c96f2538e1878fc2d3
+SIZE (qca-2.0.0.tar.bz2) = 5106520
--- /dev/null
+++ devel/qca/files/patch-cmake-modules_FindQt4.cmake
@@ -0,0 +1,11 @@
+--- cmake/modules/FindQt4.cmake.orgi	2008-01-20 20:23:37.000000000 +0100
++++ cmake/modules/FindQt4.cmake	2008-01-20 20:24:42.000000000 +0100
+@@ -482,7 +482,7 @@
+   MARK_AS_ADVANCED( QT_LIBRARY_DIR QT_INCLUDE_DIR QT_QT_INCLUDE_DIR QT_DOC_DIR)
+ 
+   # Set QT_INCLUDES
+-  SET( QT_INCLUDES ${QT_INCLUDE_DIR} ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default )
++  SET( QT_INCLUDES ${QT_QT_INCLUDE_DIR} ${QT_MKSPECS_DIR}/default ${QT_INCLUDE_DIR})
+ 
+ 
+     
--- /dev/null
+++ devel/qca/files/patch-src-src.pro
@@ -0,0 +1,11 @@
+--- src/src.pro.orig	2007-08-15 01:00:28.000000000 +0400
++++ src/src.pro	2008-02-06 17:30:57.000000000 +0300
+@@ -92,7 +92,7 @@
+ 	incfiles.files += $$QCA_INC/qca.h $$QCA_INC/QtCrypto
+ 	INSTALLS += incfiles
+ 
+-	manfiles.path = $$DATADIR/man/man1
++	manfiles.path = $$PREFIX/man/man1
+ 	manfiles.files = $$QCA_BASE/man/qcatool2.1
+ 	INSTALLS += manfiles
+ }

From ctriv at midnightbsd.org  Sat Jan  3 19:40:39 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:40:39 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add qca
Message-ID: <200901040040.n040edk5054788@stargazer.midnightbsd.org>

Log Message:
-----------
add qca

Modified Files:
--------------
    mports/devel:
        Makefile (r1.268 -> r1.269)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/Makefile,v
retrieving revision 1.268
retrieving revision 1.269
diff -L devel/Makefile -L devel/Makefile -u -r1.268 -r1.269
--- devel/Makefile
+++ devel/Makefile
@@ -20,11 +20,11 @@
     SUBDIR += autoconf262
     SUBDIR += autogen
     SUBDIR += automake-wrapper
+    SUBDIR += automake110
     SUBDIR += automake14
     SUBDIR += automake15
     SUBDIR += automake16
     SUBDIR += automake19
-    SUBDIR += automake110
     SUBDIR += automoc4
     SUBDIR += autotools
     SUBDIR += bison
@@ -84,9 +84,9 @@
     SUBDIR += gnome-vfs
     SUBDIR += gnustep
     SUBDIR += gnustep-make
-    SUBDIR += gorm
     SUBDIR += goffice
     SUBDIR += goffice04
+    SUBDIR += gorm
     SUBDIR += gstreamer-plugins-gconf
     SUBDIR += gstreamer-plugins-gnomevfs
     SUBDIR += gvfs
@@ -154,14 +154,13 @@
     SUBDIR += objcunit
     SUBDIR += oniguruma4
     SUBDIR += oniguruma5
-    SUBDIR += p5-Algorithm-Diff
     SUBDIR += p5-Algorithm-C3
+    SUBDIR += p5-Algorithm-Diff
     SUBDIR += p5-AppConfig
     SUBDIR += p5-B-Keywords
     SUBDIR += p5-BSD-Resource
     SUBDIR += p5-Cache-Cache
     SUBDIR += p5-Carp-Clan
-    SUBDIR += p5-Config-General
     SUBDIR += p5-Class-Accessor
     SUBDIR += p5-Class-Accessor-Chained
     SUBDIR += p5-Class-Accessor-Grouped
@@ -174,6 +173,7 @@
     SUBDIR += p5-Class-Inspector
     SUBDIR += p5-Class-Trigger
     SUBDIR += p5-Clone
+    SUBDIR += p5-Config-General
     SUBDIR += p5-Config-Tiny
     SUBDIR += p5-Data-Dumper
     SUBDIR += p5-Date-Calc
@@ -196,10 +196,10 @@
     SUBDIR += p5-IPC-Run
     SUBDIR += p5-IPC-ShareLite
     SUBDIR += p5-Locale-gettext
+    SUBDIR += p5-MRO-Compat
     SUBDIR += p5-Module-Build
     SUBDIR += p5-Module-Find
     SUBDIR += p5-Module-Pluggable
-    SUBDIR += p5-MRO-Compat
     SUBDIR += p5-Net-DBus
     SUBDIR += p5-Params-Util
     SUBDIR += p5-Params-Validate
@@ -207,8 +207,8 @@
     SUBDIR += p5-PathTools
     SUBDIR += p5-Pod-Coverage
     SUBDIR += p5-ReadLine-Perl
-    SUBDIR += p5-Return-Value
     SUBDIR += p5-Readonly
+    SUBDIR += p5-Return-Value
     SUBDIR += p5-SDL
     SUBDIR += p5-Scope-Guard
     SUBDIR += p5-Spiffy
@@ -230,10 +230,10 @@
     SUBDIR += p5-Time-HiRes
     SUBDIR += p5-Time-Local
     SUBDIR += p5-TimeDate
-    SUBDIR += p5-threads-shared
     SUBDIR += p5-UNIVERSAL-moniker
     SUBDIR += p5-UNIVERSAL-require
     SUBDIR += p5-threads
+    SUBDIR += p5-threads-shared
     SUBDIR += p5-version
     SUBDIR += patch
     SUBDIR += pccts
@@ -268,6 +268,7 @@
     SUBDIR += py-gobject
     SUBDIR += py-orbit
     SUBDIR += py-xdg
+    SUBDIR += qca
     SUBDIR += qmake
     SUBDIR += qmake4
     SUBDIR += qt4
@@ -286,7 +287,7 @@
     SUBDIR += qt4-qt3support
     SUBDIR += qt4-qtestlib
     SUBDIR += qt4-qvfb
-    SUBDIR += qt4-rcc 
+    SUBDIR += qt4-rcc
     SUBDIR += qt4-script
     SUBDIR += qt4-uic
     SUBDIR += qt4-uic3

From ctriv at midnightbsd.org  Sat Jan  3 19:55:09 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:55:09 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: archivers/libzip: Added libzip-0.8
Message-ID: <200901040055.n040t9YD056212@stargazer.midnightbsd.org>

Log Message:
-----------
Added libzip-0.8

Added Files:
-----------
    mports/archivers/libzip:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
    mports/archivers/libzip/files:
        patch-man_Makefile.in (r1.1)

-------------- next part --------------
--- /dev/null
+++ archivers/libzip/pkg-descr
@@ -0,0 +1,6 @@
+libzip is a C library for reading, creating, and modifying zip archives. Files
+can be added from data buffers, files, or compressed data copied directly from
+other zip archives. Changes made without closing the archive can be reverted.
+The API is documented by man pages.
+
+WWW: http://www.nih.at/libzip/
--- /dev/null
+++ archivers/libzip/Makefile
@@ -0,0 +1,71 @@
+#
+# $MidnightBSD: mports/archivers/libzip/Makefile,v 1.1 2009/01/04 00:55:06 ctriv Exp $
+#
+
+PORTNAME=	libzip
+PORTVERSION=	0.8
+CATEGORIES=	archivers devel
+MASTER_SITES=	http://www.nih.at/libzip/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	A C library for reading, creating, and modifying zip archives
+LICENSE=	bsd3
+
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	gnomehack pkgconfig
+
+PLIST_FILES=	bin/zipcmp \
+		bin/zipmerge \
+		include/zip.h \
+		lib/libzip.a \
+		lib/libzip.la \
+		lib/libzip.so \
+		lib/libzip.so.1 \
+		libdata/pkgconfig/libzip.pc
+
+MAN1=		zipcmp.1 \
+		zipmerge.1
+
+MAN3=		libzip.3 \
+		zip_add.3 \
+		zip_add_dir.3 \
+		zip_close.3 \
+		zip_delete.3 \
+		zip_error_clear.3 \
+		zip_error_get.3 \
+		zip_error_get_sys_type.3 \
+		zip_error_to_str.3 \
+		zip_errors.3 \
+		zip_fclose.3 \
+		zip_file_error_clear.3 \
+		zip_file_error_get.3 \
+		zip_file_strerror.3 \
+		zip_fopen.3 \
+		zip_fopen_index.3 \
+		zip_fread.3 \
+		zip_get_archive_comment.3 \
+		zip_get_file_comment.3 \
+		zip_get_name.3 \
+		zip_get_num_files.3 \
+		zip_name_locate.3 \
+		zip_open.3 \
+		zip_rename.3 \
+		zip_replace.3 \
+		zip_set_archive_comment.3 \
+		zip_set_file_comment.3 \
+		zip_source_buffer.3 \
+		zip_source_file.3 \
+		zip_source_filep.3 \
+		zip_source_free.3 \
+		zip_source_function.3 \
+		zip_source_zip.3 \
+		zip_stat.3 \
+		zip_stat_index.3 \
+		zip_stat_init.3 \
+		zip_strerror.3 \
+		zip_unchange.3 \
+		zip_unchange_all.3 \
+		zip_unchange_archive.3
+
+.include 
--- /dev/null
+++ archivers/libzip/distinfo
@@ -0,0 +1,3 @@
+MD5 (libzip-0.8.tar.gz) = b0087c2a12b312f8ec2df1052b2acb4f
+SHA256 (libzip-0.8.tar.gz) = 5a1b231d002b1a87ecab26874491ec6bea36b108f5f37769a2dc79b10623c047
+SIZE (libzip-0.8.tar.gz) = 414095
--- /dev/null
+++ archivers/libzip/files/patch-man_Makefile.in
@@ -0,0 +1,13 @@
+--- man/Makefile.in.orig	2007-08-02 13:44:34.000000000 +0400
++++ man/Makefile.in	2007-08-02 13:46:45.000000000 +0400
+@@ -154,8 +154,8 @@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-man1_MANS = ${MAN1:.mdoc=.${MANFMT}}
+-man3_MANS = ${MAN3:.mdoc=.${MANFMT}}
++man1_MANS = ${MAN1}
++man3_MANS = ${MAN3}
+ DISTCLEANFILES = ${HTML}
+ EXTRA_DIST = ${MANDOC} ${MAN} CMakeLists.txt
+ MAN1 = zipcmp.mdoc zipmerge.mdoc

From ctriv at midnightbsd.org  Sat Jan  3 19:55:16 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:55:16 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: libzip, zipios++.
Message-ID: <200901040055.n040tGYD056261@stargazer.midnightbsd.org>

Log Message:
-----------
added: libzip, zipios++. removed: zipios.

Modified Files:
--------------
    mports/archivers:
        Makefile (r1.32 -> r1.33)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/archivers/Makefile,v
retrieving revision 1.32
retrieving revision 1.33
diff -L archivers/Makefile -L archivers/Makefile -u -r1.32 -r1.33
--- archivers/Makefile
+++ archivers/Makefile
@@ -18,6 +18,7 @@
     SUBDIR += lha-ac
     SUBDIR += libmspack
     SUBDIR += libunrar
+    SUBDIR += libzip
     SUBDIR += lzo
     SUBDIR += lzo2
     SUBDIR += p5-Archive-Tar

From ctriv at midnightbsd.org  Sat Jan  3 19:56:27 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:56:27 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: mporter: a few bug fixes.
Message-ID: <200901040056.n040uRFR056368@stargazer.midnightbsd.org>

Log Message:
-----------
a few bug fixes.

Modified Files:
--------------
    mports/Tools/scripts:
        mporter (r1.1 -> r1.2)

-------------- next part --------------
Index: mporter
===================================================================
RCS file: /home/cvs/mports/Tools/scripts/mporter,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Tools/scripts/mporter -L Tools/scripts/mporter -u -r1.1 -r1.2
--- Tools/scripts/mporter
+++ Tools/scripts/mporter
@@ -115,7 +115,7 @@
 		chdir($orig) || die "Couldn't chdir $orig: $!\n";
 	}
 	
-	run("cvs add Makefile distinfo pkg-*");
+	system("cvs add Makefile distinfo pkg-*");
 	
 	if (-d 'files') {
 		run("cvs add files");
@@ -252,7 +252,7 @@
 		}
 		
 		
-		if (m/SUBDIR\s*\+?=\s*([\.\w-]+)/) {
+		if (m/SUBDIR\s*\+?=\s*([\.\w+-]+)/) {
 			push(@{$self->{subdirs}}, $1);
 		} else {
 			die "Couldn't match first subdir.";

From ctriv at midnightbsd.org  Sat Jan  3 19:57:04 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:57:04 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: textproc/ebook-tools: Added
	ebook-tools-0.1.1
Message-ID: <200901040057.n040v4Bn056460@stargazer.midnightbsd.org>

Log Message:
-----------
Added ebook-tools-0.1.1

Added Files:
-----------
    mports/textproc/ebook-tools:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ textproc/ebook-tools/pkg-descr
@@ -0,0 +1,4 @@
+ebook-tools provides tools for accessing and converting
+various ebook file formats. 
+
+WWW:	http://sourceforge.net/projects/ebook-tools
--- /dev/null
+++ textproc/ebook-tools/pkg-plist
@@ -0,0 +1,7 @@
+bin/einfo
+bin/lit2epub
+include/epub.h
+include/epub_shared.h
+lib/libepub.so
+lib/libepub.so.0
+lib/libepub.so.0.1.1
--- /dev/null
+++ textproc/ebook-tools/Makefile
@@ -0,0 +1,25 @@
+#
+# $MidnightBSD: mports/textproc/ebook-tools/Makefile,v 1.1 2009/01/04 00:57:04 ctriv Exp $
+#
+
+PORTNAME=	ebook-tools
+PORTVERSION=	0.1.1
+CATEGORIES=	textproc kde
+MASTER_SITES=	SF
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Accessing and converting various ebook file formats
+LICENSE=	mit
+
+LIB_DEPENDS=	zip.1:${PORTSDIR}/archivers/libzip
+
+USE_KDE4=	kdehier kdeprefix
+USE_CMAKE=	yes
+CMAKE_VERBOSE=	yes
+USE_LDCONFIG=	yes
+USE_GNOME=	libxml2 pkgconfig
+
+post-extract:
+	${MKDIR}	${WRKSRC}/build
+
+.include 
--- /dev/null
+++ textproc/ebook-tools/distinfo
@@ -0,0 +1,3 @@
+MD5 (ebook-tools-0.1.1.tar.gz) = 15946af6f946eabe8247cdef9ada2b88
+SHA256 (ebook-tools-0.1.1.tar.gz) = e940999f7dd19171de9262b5c18ee1946fff314ae955f91e9d5214c140c5d41d
+SIZE (ebook-tools-0.1.1.tar.gz) = 43280

From ctriv at midnightbsd.org  Sat Jan  3 19:58:05 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:58:05 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add ebook-tools
Message-ID: <200901040058.n040w5Vx056554@stargazer.midnightbsd.org>

Log Message:
-----------
add ebook-tools

Modified Files:
--------------
    mports/textproc:
        Makefile (r1.111 -> r1.112)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/textproc/Makefile,v
retrieving revision 1.111
retrieving revision 1.112
diff -L textproc/Makefile -L textproc/Makefile -u -r1.111 -r1.112
--- textproc/Makefile
+++ textproc/Makefile
@@ -32,6 +32,7 @@
     SUBDIR += docproj
     SUBDIR += dsssl-docbook-modular
     SUBDIR += easydiff
+    SUBDIR += ebook-tools
     SUBDIR += enchant
     SUBDIR += etoile-lucenekit
     SUBDIR += etoile-ogrekit
@@ -49,8 +50,8 @@
     SUBDIR += iso8879
     SUBDIR += ispell
     SUBDIR += ispell-alt-de
-    SUBDIR += ispell-neu-de
     SUBDIR += ispell-de
+    SUBDIR += ispell-neu-de
     SUBDIR += jade
     SUBDIR += latex-service
     SUBDIR += libcroco
@@ -68,7 +69,6 @@
     SUBDIR += openjade
     SUBDIR += opensp
     SUBDIR += p5-HTML-Tidy
-    SUBDIR += p5-libxml
     SUBDIR += p5-PPI
     SUBDIR += p5-Parse-Syslog
     SUBDIR += p5-Perl-Critic
@@ -79,10 +79,10 @@
     SUBDIR += p5-SGML-Parser-OpenSP
     SUBDIR += p5-SGMLSpm
     SUBDIR += p5-String-Format
+    SUBDIR += p5-Test-Perl-Critic
     SUBDIR += p5-Text-Autoformat
     SUBDIR += p5-Text-Diff
     SUBDIR += p5-Text-Glob
-    SUBDIR += p5-Test-Perl-Critic
     SUBDIR += p5-Text-Reform
     SUBDIR += p5-Text-Tabs+Wrap
     SUBDIR += p5-Text-WordDiff
@@ -104,6 +104,7 @@
     SUBDIR += p5-XML-Writer
     SUBDIR += p5-XML-XPath
     SUBDIR += p5-YAML
+    SUBDIR += p5-libxml
     SUBDIR += php5-ctype
     SUBDIR += php5-dom
     SUBDIR += php5-pspell
@@ -113,10 +114,10 @@
     SUBDIR += php5-xmlreader
     SUBDIR += php5-xmlwriter
     SUBDIR += php5-xsl
-    SUBDIR += py-libxml2
-    SUBDIR += py-xml
     SUBDIR += popup
     SUBDIR += py-docutils
+    SUBDIR += py-libxml2
+    SUBDIR += py-xml
     SUBDIR += qt4-clucene
     SUBDIR += qt4-xml
     SUBDIR += qt4-xmlpatterns

From laffer1 at midnightbsd.org  Sat Jan  3 20:43:20 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 20:43:20 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: www/linux-opera: FInally update opera for
	linux
Message-ID: <200901040143.n041hKin060728@stargazer.midnightbsd.org>

Log Message:
-----------
FInally update opera for linux

Modified Files:
--------------
    mports/www/linux-opera:
        Makefile (r1.11 -> r1.12)
        distinfo (r1.7 -> r1.8)
        pkg-plist (r1.3 -> r1.4)
    mports/www/linux-opera/files:
        patch-install.sh (r1.2 -> r1.3)
        patch-search.ini (r1.2 -> r1.3)

Added Files:
-----------
    mports/www/linux-opera/files:
        linux-opera.desktop.in (r1.1)
        patch-pluginpath.ini (r1.1)

Removed Files:
-------------
    mports/www/linux-opera/files:
        patch-locale::en::search.ini

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L www/linux-opera/pkg-plist -L www/linux-opera/pkg-plist -u -r1.3 -r1.4
--- www/linux-opera/pkg-plist
+++ www/linux-opera/pkg-plist
@@ -1,24 +1,25 @@
 bin/linux-opera
- at comment share/applications/linux-opera.desktop
+share/apps/Internet/linux-opera.desktop
+share/applnk/Internet/linux-opera.desktop
+%%DOCSDIR%%/LGPL
 %%DOCSDIR%%/LICENSE
 %%DATADIR%%/bin/missingsyms.so
 %%DATADIR%%/bin/opera
+%%DATADIR%%/bin/operaplugincleaner
+%%DATADIR%%/bin/operapluginwrapper
 %%DATADIR%%/bin/spellcheck.so
 %%DATADIR%%/bin/works
-%%DATADIR%%/chartables.bin
-%%DATADIR%%/config/opera6rc
-%%DATADIR%%/config/opera6rc.fixed
+%%DATADIR%%/encoding.bin
 %%DATADIR%%/html40_entities.dtd
-%%DATADIR%%/images/opera.xpm
-%%DATADIR%%/images/opera_16x16.png
-%%DATADIR%%/images/opera_22x22.png
-%%DATADIR%%/images/opera_32x32.png
-%%DATADIR%%/images/opera_48x48.png
 %%DATADIR%%/ini/dialog.ini
 %%DATADIR%%/ini/fastforward.ini
 %%DATADIR%%/ini/filehandler.ini
+%%DATADIR%%/ini/font.ini
+%%DATADIR%%/ini/mailproviders.xml
 %%DATADIR%%/ini/pluginpath.ini
+%%DATADIR%%/ini/speeddial_default.ini
 %%DATADIR%%/ini/standard_keyboard.ini
+%%DATADIR%%/ini/standard_keyboard_compat.ini
 %%DATADIR%%/ini/standard_menu.ini
 %%DATADIR%%/ini/standard_mouse.ini
 %%DATADIR%%/ini/standard_toolbar.ini
@@ -27,14 +28,163 @@
 %%DATADIR%%/java/opera.jar
 %%DATADIR%%/java/opera.policy
 %%DATADIR%%/lngcode.txt
-%%DATADIR%%/locale/en/default.adr
+%%DATADIR%%/locale/be/byelorussian.lng
+%%DATADIR%%/locale/be/license.txt
+%%DATADIR%%/locale/be/opera6.adr
+%%DATADIR%%/locale/be/search.ini
+%%DATADIR%%/locale/bg/bulgarian.lng
+%%DATADIR%%/locale/bg/license.txt
+%%DATADIR%%/locale/bg/opera6.adr
+%%DATADIR%%/locale/bg/search.ini
+%%DATADIR%%/locale/cs/czech.lng
+%%DATADIR%%/locale/cs/license.txt
+%%DATADIR%%/locale/cs/opera6.adr
+%%DATADIR%%/locale/cs/search.ini
+%%DATADIR%%/locale/da/dansk.lng
+%%DATADIR%%/locale/da/license.txt
+%%DATADIR%%/locale/da/opera6.adr
+%%DATADIR%%/locale/da/search.ini
+%%DATADIR%%/locale/de/deutsch.lng
+%%DATADIR%%/locale/de/license.txt
+%%DATADIR%%/locale/de/opera6.adr
+%%DATADIR%%/locale/de/search.ini
+%%DATADIR%%/locale/el/greek.lng
+%%DATADIR%%/locale/el/license.txt
+%%DATADIR%%/locale/el/opera6.adr
+%%DATADIR%%/locale/el/search.ini
+%%DATADIR%%/locale/en-GB/british.lng
+%%DATADIR%%/locale/en-GB/license.txt
+%%DATADIR%%/locale/en-GB/opera6.adr
+%%DATADIR%%/locale/en-GB/search.ini
 %%DATADIR%%/locale/en/license.txt
+%%DATADIR%%/locale/en/opera6.adr
 %%DATADIR%%/locale/en/search.ini
 %%DATADIR%%/locale/english.lng
+%%DATADIR%%/locale/es-ES/espanol-espana.lng
+%%DATADIR%%/locale/es-ES/license.txt
+%%DATADIR%%/locale/es-ES/opera6.adr
+%%DATADIR%%/locale/es-ES/search.ini
+%%DATADIR%%/locale/es-LA/espanol-america_latina.lng
+%%DATADIR%%/locale/es-LA/license.txt
+%%DATADIR%%/locale/es-LA/opera6.adr
+%%DATADIR%%/locale/es-LA/search.ini
+%%DATADIR%%/locale/et/eesti.lng
+%%DATADIR%%/locale/et/license.txt
+%%DATADIR%%/locale/et/opera6.adr
+%%DATADIR%%/locale/et/search.ini
+%%DATADIR%%/locale/fi/license.txt
+%%DATADIR%%/locale/fi/opera6.adr
+%%DATADIR%%/locale/fi/search.ini
+%%DATADIR%%/locale/fi/suomi.lng
+%%DATADIR%%/locale/fr-CA/francais-canadien.lng
+%%DATADIR%%/locale/fr-CA/license.txt
+%%DATADIR%%/locale/fr-CA/opera6.adr
+%%DATADIR%%/locale/fr-CA/search.ini
+%%DATADIR%%/locale/fr/francais.lng
+%%DATADIR%%/locale/fr/license.txt
+%%DATADIR%%/locale/fr/opera6.adr
+%%DATADIR%%/locale/fr/search.ini
+%%DATADIR%%/locale/fy/frisian.lng
+%%DATADIR%%/locale/fy/license.txt
+%%DATADIR%%/locale/fy/opera6.adr
+%%DATADIR%%/locale/fy/search.ini
+%%DATADIR%%/locale/hi/hindi.lng
+%%DATADIR%%/locale/hi/license.txt
+%%DATADIR%%/locale/hi/opera6.adr
+%%DATADIR%%/locale/hi/search.ini
+%%DATADIR%%/locale/hr/croatian.lng
+%%DATADIR%%/locale/hr/license.txt
+%%DATADIR%%/locale/hr/opera6.adr
+%%DATADIR%%/locale/hr/search.ini
+%%DATADIR%%/locale/hu/hungarian.lng
+%%DATADIR%%/locale/hu/license.txt
+%%DATADIR%%/locale/hu/opera6.adr
+%%DATADIR%%/locale/hu/search.ini
+%%DATADIR%%/locale/id/indonesian.lng
+%%DATADIR%%/locale/id/license.txt
+%%DATADIR%%/locale/id/opera6.adr
+%%DATADIR%%/locale/id/search.ini
+%%DATADIR%%/locale/it/italiano.lng
+%%DATADIR%%/locale/it/license.txt
+%%DATADIR%%/locale/it/opera6.adr
+%%DATADIR%%/locale/it/search.ini
+%%DATADIR%%/locale/ja/japanese.lng
+%%DATADIR%%/locale/ja/license.txt
+%%DATADIR%%/locale/ja/opera6.adr
+%%DATADIR%%/locale/ja/search.ini
+%%DATADIR%%/locale/ka/georgian.lng
+%%DATADIR%%/locale/ka/license.txt
+%%DATADIR%%/locale/ka/opera6.adr
+%%DATADIR%%/locale/ka/search.ini
+%%DATADIR%%/locale/ko/korean.lng
+%%DATADIR%%/locale/ko/license.txt
+%%DATADIR%%/locale/ko/opera6.adr
+%%DATADIR%%/locale/ko/search.ini
+%%DATADIR%%/locale/lt/license.txt
+%%DATADIR%%/locale/lt/lithuanian.lng
+%%DATADIR%%/locale/lt/opera6.adr
+%%DATADIR%%/locale/lt/search.ini
+%%DATADIR%%/locale/mk/license.txt
+%%DATADIR%%/locale/mk/macedonian.lng
+%%DATADIR%%/locale/mk/opera6.adr
+%%DATADIR%%/locale/mk/search.ini
+%%DATADIR%%/locale/nb/license.txt
+%%DATADIR%%/locale/nb/norsk.lng
+%%DATADIR%%/locale/nb/opera6.adr
+%%DATADIR%%/locale/nb/search.ini
+%%DATADIR%%/locale/nl/license.txt
+%%DATADIR%%/locale/nl/nederlands.lng
+%%DATADIR%%/locale/nl/opera6.adr
+%%DATADIR%%/locale/nl/search.ini
+%%DATADIR%%/locale/nn/license.txt
+%%DATADIR%%/locale/nn/nynorsk.lng
+%%DATADIR%%/locale/nn/opera6.adr
+%%DATADIR%%/locale/nn/search.ini
+%%DATADIR%%/locale/pl/license.txt
+%%DATADIR%%/locale/pl/opera6.adr
+%%DATADIR%%/locale/pl/polski.lng
+%%DATADIR%%/locale/pl/search.ini
+%%DATADIR%%/locale/pt-BR/brazilportuguese.lng
+%%DATADIR%%/locale/pt-BR/license.txt
+%%DATADIR%%/locale/pt-BR/opera6.adr
+%%DATADIR%%/locale/pt-BR/search.ini
+%%DATADIR%%/locale/pt/license.txt
+%%DATADIR%%/locale/pt/opera6.adr
+%%DATADIR%%/locale/pt/portuguese.lng
+%%DATADIR%%/locale/pt/search.ini
+%%DATADIR%%/locale/ru/license.txt
+%%DATADIR%%/locale/ru/opera6.adr
+%%DATADIR%%/locale/ru/russian.lng
+%%DATADIR%%/locale/ru/search.ini
+%%DATADIR%%/locale/sv/license.txt
+%%DATADIR%%/locale/sv/opera6.adr
+%%DATADIR%%/locale/sv/search.ini
+%%DATADIR%%/locale/sv/svenska.lng
+%%DATADIR%%/locale/ta/license.txt
+%%DATADIR%%/locale/ta/opera6.adr
+%%DATADIR%%/locale/ta/search.ini
+%%DATADIR%%/locale/ta/tamil.lng
+%%DATADIR%%/locale/te/license.txt
+%%DATADIR%%/locale/te/opera6.adr
+%%DATADIR%%/locale/te/search.ini
+%%DATADIR%%/locale/te/telugu.lng
+%%DATADIR%%/locale/tr/license.txt
+%%DATADIR%%/locale/tr/opera6.adr
+%%DATADIR%%/locale/tr/search.ini
+%%DATADIR%%/locale/tr/turkce.lng
+%%DATADIR%%/locale/uk/license.txt
+%%DATADIR%%/locale/uk/opera6.adr
+%%DATADIR%%/locale/uk/search.ini
+%%DATADIR%%/locale/uk/ukrainian.lng
+%%DATADIR%%/locale/zh-cn/chinese_simp.lng
+%%DATADIR%%/locale/zh-cn/license.txt
+%%DATADIR%%/locale/zh-cn/opera6.adr
+%%DATADIR%%/locale/zh-cn/search.ini
+%%DATADIR%%/locale/zh-tw/chinese.lng
+%%DATADIR%%/locale/zh-tw/license.txt
+%%DATADIR%%/locale/zh-tw/opera6.adr
+%%DATADIR%%/locale/zh-tw/search.ini
 %%DATADIR%%/opera6.adr
-%%DATADIR%%/plugins/libnpp.so
-%%DATADIR%%/plugins/operaplugincleaner
-%%DATADIR%%/plugins/operapluginwrapper
 %%DATADIR%%/search.ini
 %%DATADIR%%/skin/standard_skin.zip
 %%DATADIR%%/skin/windows_skin.zip
@@ -44,22 +194,31 @@
 %%DATADIR%%/styles/config.css
 %%DATADIR%%/styles/contentblock.css
 %%DATADIR%%/styles/dir.css
-%%DATADIR%%/styles/drives.css
 %%DATADIR%%/styles/error.css
 %%DATADIR%%/styles/history.css
 %%DATADIR%%/styles/im.css
 %%DATADIR%%/styles/image.css
 %%DATADIR%%/styles/images/bar.png
 %%DATADIR%%/styles/images/center.png
+%%DATADIR%%/styles/images/customize.gif
+%%DATADIR%%/styles/images/darkBox.png
+%%DATADIR%%/styles/images/defaultFavicon.png
+%%DATADIR%%/styles/images/flag.png
+%%DATADIR%%/styles/images/folder.png
 %%DATADIR%%/styles/images/opera.png
 %%DATADIR%%/styles/images/red_center.png
 %%DATADIR%%/styles/images/red_left.png
 %%DATADIR%%/styles/images/red_right.png
 %%DATADIR%%/styles/images/root.png
+%%DATADIR%%/styles/images/section.png
+%%DATADIR%%/styles/images/smartGroup.png
 %%DATADIR%%/styles/images/top.png
 %%DATADIR%%/styles/info.css
+%%DATADIR%%/styles/mathml.css
+%%DATADIR%%/styles/message.css
 %%DATADIR%%/styles/mime.css
 %%DATADIR%%/styles/plugins.css
+%%DATADIR%%/styles/search.css
 %%DATADIR%%/styles/user/accessibility.css
 %%DATADIR%%/styles/user/altdebugger.css
 %%DATADIR%%/styles/user/classid.css
@@ -77,6 +236,7 @@
 %%DATADIR%%/styles/user/tablelayout.css
 %%DATADIR%%/styles/user/toc.css
 %%DATADIR%%/styles/warning.css
+%%DATADIR%%/styles/webfeeds.html
 %%DATADIR%%/styles/wml.css
 %%DATADIR%%/svg-mo.dat
 %%DATADIR%%/svg-mobd.dat
@@ -90,13 +250,51 @@
 @dirrm %%DATADIR%%/styles
 @dirrm %%DATADIR%%/skin
 @dirrm %%DATADIR%%/plugins
+ at dirrm %%DATADIR%%/locale/zh-tw
+ at dirrm %%DATADIR%%/locale/zh-cn
+ at dirrm %%DATADIR%%/locale/uk
+ at dirrm %%DATADIR%%/locale/tr
+ at dirrm %%DATADIR%%/locale/te
+ at dirrm %%DATADIR%%/locale/ta
+ at dirrm %%DATADIR%%/locale/sv
+ at dirrm %%DATADIR%%/locale/ru
+ at dirrm %%DATADIR%%/locale/pt-BR
+ at dirrm %%DATADIR%%/locale/pt
+ at dirrm %%DATADIR%%/locale/pl
+ at dirrm %%DATADIR%%/locale/nn
+ at dirrm %%DATADIR%%/locale/nl
+ at dirrm %%DATADIR%%/locale/nb
+ at dirrm %%DATADIR%%/locale/mk
+ at dirrm %%DATADIR%%/locale/lt
+ at dirrm %%DATADIR%%/locale/ko
+ at dirrm %%DATADIR%%/locale/ka
+ at dirrm %%DATADIR%%/locale/ja
+ at dirrm %%DATADIR%%/locale/it
+ at dirrm %%DATADIR%%/locale/id
+ at dirrm %%DATADIR%%/locale/hu
+ at dirrm %%DATADIR%%/locale/hr
+ at dirrm %%DATADIR%%/locale/hi
+ at dirrm %%DATADIR%%/locale/fy
+ at dirrm %%DATADIR%%/locale/fr-CA
+ at dirrm %%DATADIR%%/locale/fr
+ at dirrm %%DATADIR%%/locale/fi
+ at dirrm %%DATADIR%%/locale/et
+ at dirrm %%DATADIR%%/locale/es-LA
+ at dirrm %%DATADIR%%/locale/es-ES
+ at dirrm %%DATADIR%%/locale/en-GB
 @dirrm %%DATADIR%%/locale/en
+ at dirrm %%DATADIR%%/locale/el
+ at dirrm %%DATADIR%%/locale/de
+ at dirrm %%DATADIR%%/locale/da
+ at dirrm %%DATADIR%%/locale/cs
+ at dirrm %%DATADIR%%/locale/bg
+ at dirrm %%DATADIR%%/locale/be
 @dirrm %%DATADIR%%/locale
 @dirrm %%DATADIR%%/java
 @dirrm %%DATADIR%%/ini
- at dirrm %%DATADIR%%/images
- at dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%/bin
 @dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%
 @dirrmtry share/applications
+ at dirrmtry share/apps/Internet
+ at dirrmtry share/applnk/Internet
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/Makefile,v
retrieving revision 1.11
retrieving revision 1.12
diff -L www/linux-opera/Makefile -L www/linux-opera/Makefile -u -r1.11 -r1.12
--- www/linux-opera/Makefile
+++ www/linux-opera/Makefile
@@ -7,8 +7,7 @@
 #
 
 PORTNAME=	opera
-PORTVERSION=	${OPERA_VER}.${OPERA_DATE}
-PORTREVISION=	1
+PORTVERSION=	${OPERA_VER}
 CATEGORIES=	www linux
 MASTER_SITES=	ftp://ftp.opera.com/pub/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
 		ftp://ftp.sunet.se/pub/www/clients/Opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
@@ -21,7 +20,7 @@
 		http://gd.tuwien.ac.at/infosys/browsers/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/www/opera/linux/${OPERA_VER:S/.//}/final/en/i386/static/&,}
 PKGNAMEPREFIX=	linux-
-DISTNAME=	${PORTNAME}-${OPERA_VER}-${OPERA_DATE}.1-static-qt.i386-en
+DISTNAME=	${PORTNAME}-${OPERA_VER}.gcc4-static-qt3.i386
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	A blazingly fast, full-featured, standards-compliant browser
@@ -29,7 +28,7 @@
 
 RUN_DEPENDS=	${LINUXBASE}/usr/lib/libaspell.so.15:${PORTSDIR}/textproc/linux-aspell
 
-WRKSRC=		${WRKDIR}/${DISTNAME}-${OPERA_BUILD}
+WRKSRC=		${WRKDIR}/${DISTNAME:S/.gcc/-${OPERA_BUILD}.gcc/}
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_LINUX=	yes
@@ -37,34 +36,43 @@
 
 NO_BUILD=	yes
 
-DEPRECATED=	There is a security issue with this verison of opera.
-
-OPERA_VER=	9.27
-OPERA_DATE=	20080331
-OPERA_BUILD=	709
-
+OPERA_VER=	9.63
+OPERA_BUILD=	2474
 DATADIR=	${PREFIX}/share/${UNIQUENAME}
 DOCSDIR=	${PREFIX}/share/doc/${UNIQUENAME}
 
 MAN1=		linux-opera.1
 
+post-extract:
+	@${MV} ${WRKSRC}/usr/share/man/man1/opera.1 \
+		${WRKSRC}/usr/share/man/man1/${UNIQUENAME}.1
+	@${SED} -e 's|@PREFIX@|${LOCALBASE}|g' ${FILESDIR}/linux-opera.desktop.in >${WRKDIR}/linux-opera.desktop
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g ; \
 		s|%%LOCALBASE%%|${LOCALBASE}|g ; s|%%X11BASE%%|${X11BASE}|g' \
-			${WRKSRC}/install.sh ${WRKSRC}/ini/pluginpath.ini
+			${WRKSRC}/install.sh ${WRKSRC}/usr/share/opera/ini/pluginpath.ini
+	${REINPLACE_CMD} -e 's|FreeBSD|MidnightBSD|g' \
+		${WRKSRC}/install.sh 
+	@${REINPLACE_CMD} -e 's|man1/opera.1|man1/${UNIQUENAME}.1|g' \
+		${WRKSRC}/Manifest.md5
 	@${FIND} ${WRKSRC} -name '*.orig' -delete
 	@${FIND} ${WRKSRC} -name '*.bak' -delete
 
 do-install:
-	${MKDIR} ${PREFIX}/share/applications
-	${MKDIR} ${PREFIX}/share/pixmaps
-	${INSTALL_DATA} ${WRKSRC}/images/opera.xpm ${PREFIX}/share/pixmaps/linux-opera.xpm
+	@${MKDIR} ${PREFIX}/share/apps/Internet
+	@${MKDIR} ${PREFIX}/share/applnk/Internet
+	@${MKDIR} ${PREFIX}/share/applications
+	@${MKDIR} ${PREFIX}/share/pixmaps
+	@${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/opera.xpm ${PREFIX}/share/pixmaps/linux-opera.xpm
 	@(cd ${WRKSRC} && ./install.sh \
 			--prefix=${PREFIX} \
 			--docdir=${DOCSDIR} \
 			--sharedir=${DATADIR} \
 			--exec_prefix=${DATADIR}/bin \
 			--plugindir=${DATADIR}/plugins)
+	@${INSTALL_DATA} ${WRKDIR}/linux-opera.desktop ${PREFIX}/share/apps/Internet/
+	@${INSTALL_DATA} ${WRKDIR}/linux-opera.desktop ${PREFIX}/share/applnk/Internet/
 
 # We must make sure that the correct java jar file is used after installation.
 post-fake:
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/distinfo,v
retrieving revision 1.7
retrieving revision 1.8
diff -L www/linux-opera/distinfo -L www/linux-opera/distinfo -u -r1.7 -r1.8
--- www/linux-opera/distinfo
+++ www/linux-opera/distinfo
@@ -1,3 +1,3 @@
-MD5 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = dbf6bae423a897e92c0fcf1f4752bd9a
-SHA256 (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 3f76e709ee4896abb8aa5dfc5ce7c1b75f476faf947c1f6bb8b125d0726bc031
-SIZE (opera-9.27-20080331.1-static-qt.i386-en.tar.bz2) = 6813669
+MD5 (opera-9.63.gcc4-static-qt3.i386.tar.bz2) = bda1689f1895f614509b74e1bdd61ec3
+SHA256 (opera-9.63.gcc4-static-qt3.i386.tar.bz2) = 0e33b1c2f8154147ce29c4f4ba02c20a76170363cf8f8269b4c047f49378b7d0
+SIZE (opera-9.63.gcc4-static-qt3.i386.tar.bz2) = 9266959
Index: patch-search.ini
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/files/patch-search.ini,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/linux-opera/files/patch-search.ini -L www/linux-opera/files/patch-search.ini -u -r1.2 -r1.3
--- www/linux-opera/files/patch-search.ini
+++ www/linux-opera/files/patch-search.ini
@@ -1,21 +1,21 @@
---- search.ini.orig	Wed Apr 11 12:53:11 2007
-+++ search.ini	Wed Apr 11 12:54:29 2007
-@@ -154,7 +154,7 @@
+--- usr/share/opera/search.ini.orig	2008-06-12 17:38:53.000000000 -0500
++++ usr/share/opera/search.ini	2008-06-12 17:40:57.000000000 -0500
+@@ -144,7 +144,7 @@
  Query=
- Key=o
+ Key=f
  Is post=0
 -Has endseparator=0
 +Has endseparator=-1
- Encoding=utf-8
- Search Type=11
+ Encoding=
+ Search Type=12
  Verbtext=0
-@@ -446,3 +446,55 @@
+@@ -444,3 +444,68 @@
  Verbtext=0
  Position=-1
  Nameid=291960
 +
-+[Search Engine 35]
-+Name=Google BS&D
++[Search Engine 32]
++Name=Google BSD
 +URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
 +Query=
 +Key=d
@@ -27,8 +27,88 @@
 +Position=-1
 +Nameid=0
 +
++[Search Engine 33]
++Name=FreeBSD mail archives
++URL=http://freebsd.rambler.ru/srch?words=%s
++Query=
++Key=m
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 34]
++Name=FreeBSD PRs
++URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
++Query=
++Key=p
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 35]
++Name=FreshPorts
++URL=http://www.freshports.org/search.php?query=%s
++Query=
++Key=t
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
 +[Search Engine 36]
-+Name=FreeBSD &mail archives
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
+--- usr/share/opera/locale/en/search.ini.orig	2008-06-12 17:39:11.000000000 -0500
++++ usr/share/opera/locale/en/search.ini	2008-06-12 17:41:48.000000000 -0500
+@@ -144,7 +144,7 @@
+ Query=
+ Key=f
+ Is post=0
+-Has endseparator=0
++Has endseparator=-1
+ Encoding=
+ Search Type=12
+ Verbtext=0
+@@ -444,3 +444,68 @@
+ Verbtext=0
+ Position=-1
+ Nameid=291960
++
++[Search Engine 32]
++Name=Google BSD
++URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
++Query=
++Key=d
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
++
++[Search Engine 33]
++Name=FreeBSD mail archives
 +URL=http://freebsd.rambler.ru/srch?words=%s
 +Query=
 +Key=m
@@ -40,8 +120,8 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 37]
-+Name=FreeBSD &PRs
++[Search Engine 34]
++Name=FreeBSD PRs
 +URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
 +Query=
 +Key=p
@@ -53,8 +133,8 @@
 +Position=-1
 +Nameid=0
 +
-+[Search Engine 38]
-+Name=FreshPor&ts
++[Search Engine 35]
++Name=FreshPorts
 +URL=http://www.freshports.org/search.php?query=%s
 +Query=
 +Key=t
@@ -65,3 +145,16 @@
 +Verbtext=0
 +Position=-1
 +Nameid=0
++
++[Search Engine 36]
++Name=FreeBSD.org
++URL=http://www.freebsd.org/cgi/search.cgi?max=25&source=www&words=%s&submit=Search
++Query=
++Key=c
++Is post=0
++Has endseparator=0
++Encoding=utf-8
++Search Type=0
++Verbtext=0
++Position=-1
++Nameid=0
--- /dev/null
+++ www/linux-opera/files/patch-pluginpath.ini
@@ -0,0 +1,82 @@
+--- usr/share/opera/ini/pluginpath.ini.orig	2008-06-12 11:59:40.000000000 -0500
++++ usr/share/opera/ini/pluginpath.ini	2008-06-12 12:02:35.000000000 -0500
+@@ -2,66 +2,26 @@
+ ; Do not edit this file while Opera is running
+ ; This file is stored in UTF-8 encoding
+ 
+-[KDE]
+-plugins=$HOME/.kde/share/config/kcmnspluginrc
+-
+ [Paths]
+-$PWD/plugins=1
+-$OPERA_PERSONALDIR/plugins=1
+-/usr/lib/opera/plugins=1
+-/usr/local/lib/opera/plugins=1
+-/opt/lib/opera/plugins=1
+-/opt/opera/lib/opera/plugins=1
++$HOME/.linux-opera/plugins=1
++%%PREFIX%%/share/linux-opera/plugins=1
+ 
+ ; Adobe Acrobat
+-/usr/local/Adobe/Reader8/Browser/intellinux=1
+-/usr/local/Acrobat7.0/Browsers/intellinux=1
+-/usr/local/Acrobat7/Browsers/intellinux=1
+-/usr/local/Acrobat5/Browsers/intellinux=1
+-/usr/local/Acrobat4/Browsers/intellinux=1
+-/usr/lib/Adobe/Reader8/Browser/intellinux=1
+-/usr/lib/Acrobat7.0/Browsers/intellinux=1
+-/usr/lib/Acrobat7/Browsers/intellinux=1
+-/usr/lib/Acrobat5/Browsers/intellinux=1
+-/usr/lib/Acrobat4/Browsers/intellinux=1
+-/usr/X11R6/lib/Adobe/Reader8/Browser/intellinux=1
+-/usr/X11R6/lib/Acrobat7.0/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat7/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat5/Browsers/intellinux=1
+-/usr/X11R6/lib/Acrobat4/Browsers/intellinux=1
+-/opt/Adobe/Reader8/Browser/intellinux=1
+-/opt/Acrobat7.0/Browsers/intellinux=1
+-/opt/Acrobat7/Browsers/intellinux=1
+-/opt/Acrobat5/Browsers/intellinux=1
+-/opt/Acrobat4/Browsers/intellinux=1
+-/usr/Adobe/Reader8/Browser/intellinux=1
+-/usr/Acrobat7.0/Browsers/intellinux=1
+-/usr/Acrobat7/Browsers/intellinux=1
+-/usr/Acrobat5/Browsers/intellinux=1
+-/usr/Acrobat4/Browsers/intellinux=1
++%%LOCALBASE%%/Acrobat5/Browsers/intellinux=1
+ 
+ ; Realplayer
+-/usr/lib/RealPlayer8/Plugins=1
+-/usr/lib/realplay/plugins=1
+-/usr/lib/RealPlayer8=1
+-/usr/lib/realplay=1
++%%LOCALBASE%%/lib/RealPlayer=1
++%%LOCALBASE%%/lib/RealPlayer/plugins=1
+ 
+ ; Flash
+-/usr/lib/flash-plugin=1
+-/usr/lib/flashplugin-nonfree=1
+-
+-; Netscape Plug-in Paths
+-$HOME/.netscape6/plugins=1
+-$HOME/.netscape/plugins=1
+-/opt/netscape/plugins=1
+-/usr/lib/netscape/plugins=1
+-/usr/local/netscape/plugins=1
+-/usr/local/lib/netscape/plugins=1
+-$HOME/.kde/.konqueror/nsplugins=1
++%%LOCALBASE%%/lib/linux-flashplugin6=1
++%%LOCALBASE%%/lib/linux-flashplugin7=1
+ 
+ ; Since Mozilla supports NS plugins, there might
+ ; be some in the Mozilla plugin directory.
+-/usr/lib/mozilla/plugins=1
+-/usr/X11R6/lib/mozilla/plugins=1
+-/usr/lib64/browser-plugins=1
+-/usr/lib/browser-plugins=1
++%%LOCALBASE%%/lib/linux-mozilla/plugins=1
++
++; Global plugins path in FreeBSD. Need this for
++; the Adobe Acrobat7 and other plugins too.
++%%LOCALBASE%%/lib/browser_linux_plugins=1
++%%LOCALBASE%%/lib/npapi/symlinks/linux-opera=1
--- www/linux-opera/files/patch-locale::en::search.ini
+++ /dev/null
@@ -1,67 +0,0 @@
---- locale/en/search.ini.orig	Wed Apr 11 12:54:55 2007
-+++ locale/en/search.ini	Wed Apr 11 12:55:41 2007
-@@ -154,7 +154,7 @@
- Query=
- Key=o
- Is post=0
--Has endseparator=0
-+Has endseparator=-1
- Encoding=utf-8
- Search Type=11
- Verbtext=0
-@@ -446,3 +446,55 @@
- Verbtext=0
- Position=-1
- Nameid=291960
-+
-+[Search Engine 35]
-+Name=Google BS&D
-+URL=http://www.google.com/bsd?q=%s&sourceid=opera&num=%i&ie=utf-8&oe=utf-8
-+Query=
-+Key=d
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 36]
-+Name=FreeBSD &mail archives
-+URL=http://freebsd.rambler.ru/srch?words=%s
-+Query=
-+Key=m
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 37]
-+Name=FreeBSD &PRs
-+URL=http://www.freebsd.org/cgi/query-pr.cgi?pr=%s
-+Query=
-+Key=p
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
-+
-+[Search Engine 38]
-+Name=FreshPor&ts
-+URL=http://www.freshports.org/search.php?query=%s
-+Query=
-+Key=t
-+Is post=0
-+Has endseparator=0
-+Encoding=utf-8
-+Search Type=0
-+Verbtext=0
-+Position=-1
-+Nameid=0
Index: patch-install.sh
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/files/patch-install.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -L www/linux-opera/files/patch-install.sh -L www/linux-opera/files/patch-install.sh -u -r1.2 -r1.3
--- www/linux-opera/files/patch-install.sh
+++ www/linux-opera/files/patch-install.sh
@@ -1,17 +1,8 @@
---- install.sh.luke	Sat Oct 20 11:07:59 2007
-+++ install.sh	Sat Oct 20 11:09:39 2007
-@@ -81,7 +81,7 @@
- 
-     os=`uname -s` || error 'uname'
-     case $os in
--	FreeBSD|NetBSD|DragonFly) os=AnyBSD;;
-+	FreeBSD|NetBSD|DragonFly|MidnightBSD) os=AnyBSD;;
- 	SunOS*) os=SunOS;;
-     esac
-     case $os in AnyBSD|OpenBSD) str_defaultprefix="/usr/local";; esac
-@@ -805,10 +805,9 @@
+--- install.sh.orig	2008-06-11 15:33:00.000000000 -0500
++++ install.sh	2008-07-02 22:49:18.000000000 -0500
+@@ -832,10 +832,9 @@
      case "${machine}:${os}" in
- 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD)
+ 	x86:Linux|x86_64:Linux|x86:AnyBSD|x86_64:AnyBSD|x86:OpenBSD|x86:QNX)
  	    wrapper_ibmjava="
 -	    IBMJava2-142/jre \\
 -	    IBMJava2-141/jre \\
@@ -23,7 +14,7 @@
  	    wrapper_sunjava_machine="i386"
  	;;
  
-@@ -838,16 +837,16 @@
+@@ -865,10 +864,19 @@
  		error 'os'
  	;;
      esac
@@ -32,32 +23,19 @@
  
      wrapper_contain="#!/bin/sh
  
++# Required to check on shm_allow_removed if it is disable then set the
++# OPERA_NUM_XSHM to 0 or it will causing Opera to halt or/and give strange
++# behavior.
++if [ \`/sbin/sysctl -n kern.ipc.shm_allow_removed\` -eq 0 ]; then
++	OPERA_NUM_XSHM=\"0\"
++	export OPERA_NUM_XSHM
++	echo \"shm_allow_removed is disable, set OPERA_NUM_XSHM to 0 to disable shared memory.\"
++fi
++
  # Required for Session Management
--case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
-+case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=/usr/local/bin/$0;; esac
+ case \$0 in /*) OPERA_SCRIPT_PATH=\$0;; *) OPERA_SCRIPT_PATH=`/bin/pwd`/\$0;; esac
  export OPERA_SCRIPT_PATH
- 
- # Location of the Opera binaries
--OPERA_BINARYDIR=${str_localdirexec}
-+OPERA_BINARYDIR=/usr/local/share/linux-opera/bin
- export OPERA_BINARYDIR
- 
- # Parse commandline parameters
-@@ -890,10 +889,10 @@
- 
- # Opera enviroment
- if test \"\${OPERA_DIR}\" = '' ; then
--  if test -d ${str_localdirshare} ; then
--    OPERA_DIR=${str_localdirshare}
-+  if test -d /usr/local/share/linux-opera ; then
-+    OPERA_DIR=/usr/local/share/linux-opera
-   else
--    echo \"OPERA_DIR unset and not found at expected location (${str_localdirshare})\"
-+    echo \"OPERA_DIR unset and not found at expected location (/usr/local/share/linux-opera)\"
-     exit 1
-   fi
- fi
-@@ -901,6 +900,10 @@
+@@ -928,8 +936,12 @@
  OPERA_LD_PRELOAD=\"\${LD_PRELOAD}\"
  export OPERA_LD_PRELOAD
  
@@ -66,42 +44,43 @@
 +export OPERA_PERSONALDIR
 +
  # Native Java enviroment
- if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-     INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-@@ -908,8 +911,8 @@
- fi
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
--    if test -f \"\${HOME}/.opera/javapath.txt\"; then
--        INIJAVA=\`cat \${HOME}/.opera/javapath.txt\`
-+    if test -f \"\${OPERA_PERSONALDIR}/javapath.txt\"; then
-+        INIJAVA=\`cat \${OPERA_PERSONALDIR}/javapath.txt\`
-         if test -f \"\${INIJAVA}/libjava.so\"; then OPERA_JAVA_DIR=\"\${INIJAVA}\"; fi
-     fi
- fi
-@@ -924,69 +927,16 @@
- 
- if test ! \"\${OPERA_JAVA_DIR}\"; then
+-for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.opera\"
++for d in \"\$OPERA_PERSONALDIR\" \"\$HOME/.linux-opera\"
+ do if test -f \"\$d/javapath.txt\"
+    then
+       INIJAVA=\`cat \"\$d/javapath.txt\"\`
+@@ -950,85 +962,17 @@
  
+ if test ! \"\${OPERA_JAVA_DIR}\"
+ then
 -    PREFIXES=\"
 -	/usr
 -	/usr/java
 -	/usr/lib
 -	/usr/local
 -	/opt\"
-+    PREFIXES=\"/usr/local\"
++    PREFIXES=\"%%LOCALBASE%%\"
  
      for SUNJAVA in \\
+-	java-6-sun \\
+-	java-6-sun-1.6.0.00 \\
+-	java-1.5.0-sun \\
+-	java-1.5.0-sun-1.5.0.09 \\
+-	java-1.5.0-sun-1.5.0.09/jre \\
+-	java-1.5.0-sun-1.5.0.08 \\
+-	java-1.5.0-sun-1.5.0.08/jre \\
+-	java-1.5.0-sun-1.5.0.07 \\
+-	java-1.5.0-sun-1.5.0.07/jre \\
 -	java-1.5.0-sun-1.5.0.06 \\
 -	java-1.5.0-sun-1.5.0.06/jre \\
--	java-1.5.0-sun-1.5.0.05 \\
--	java-1.5.0-sun-1.5.0.05/jre \\
--	java-1.5.0-sun-1.5.0.04 \\
--	java-1.5.0-sun-1.5.0.04/jre \\
 -	jre1.5.0_06 \\
 -	jdk1.5.0_06/jre \\
+-	java-1.5.0-sun-1.5.0.05 \\
+-	java-1.5.0-sun-1.5.0.05/jre \\
 -	jre1.5.0_05 \\
 -	jdk1.5.0_05/jre \\
+-	java-1.5.0-sun-1.5.0.04 \\
+-	java-1.5.0-sun-1.5.0.04/jre \\
 -	jre1.5.0_04 \\
 -	jdk1.5.0_04/jre \\
 -	jre1.5.0_03 \\
@@ -110,6 +89,7 @@
 -	jdk1.5.0_02/jre \\
 -	jre1.5.0_01 \\
 -	jdk1.5.0_01/jre \\
+-	jdk1.5.0/jre \\
 -	j2re1.4.2_06 \\
 -	j2sdk1.4.2_06/jre \\
 -	j2re1.4.2_04 \\
@@ -147,6 +127,12 @@
 -	jdk1.2/jre \\
 -	jre \\
 -	java \\
+-	jdk1.3.1/jre \\
+-	jdk1.4.2/jre \\
+-	jdk1.5.0/jre \\
+-	jdk1.6.0/jre \\
+-	diablo-jre1.5.0 \\
+-	diablo-jdk1.5.0/jre \\
 +	linux-blackdown-jdk1.3.1/jre \\
 +	linux-blackdown-jdk1.4.1/jre \\
 +	linux-blackdown-jdk1.4.2/jre \\
@@ -154,10 +140,11 @@
 +	linux-sun-jdk1.4.1/jre \\
 +	linux-sun-jdk1.4.2/jre \\
 +	linux-sun-jdk1.5.0/jre \\
++	linux-sun-jdk1.6.0/jre \\
  	; do
- 	for PREFIX in \${PREFIXES}; do
- 	    if test -f \"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}/libjava.so\"; then OPERA_JAVA_DIR=\"\${PREFIX}/\${SUNJAVA}/lib/${wrapper_sunjava_machine}\" && break; fi
-@@ -1037,11 +987,8 @@
+ 	for PREFIX in \${PREFIXES}
+ 	do d=\"\$PREFIX/\$SUNJAVA/lib/$wrapper_sunjava_machine\"
+@@ -1082,11 +1026,7 @@
  
  # Acrobat Reader
  for BINDIR in \\
@@ -166,12 +153,21 @@
 -    /usr/X11R6/lib/Acrobat[45]/bin \\
 -    /opt/Acrobat[45]/bin \\
 -    /usr/Acrobat[45]/bin \\
-+    /usr/local/Acrobat5/bin \\
-+    /usr/local/Acrobat5/bin \\
++    %%LOCALBASE%%/Acrobat5/bin \\
      ; do
      if test -d \${BINDIR} ; then PATH=\${PATH}:\${BINDIR}; fi
  done
-@@ -1063,13 +1010,6 @@
+@@ -1099,8 +1039,7 @@
+ 
+ # Spellchecker needs to find libaspell.so.15
+ for LIBASPELL_DIR in \\
+-    /usr/local/lib \\
+-    /opkg/lib \\
++    %%LINUXBASE%%/usr/lib \\
+ ; do
+     if ls \$LIBASPELL_DIR/libaspell.so.1[5-9] >/dev/null 2>&1
+     then LD_LIBRARY_PATH=\"\${LD_LIBRARY_PATH}:\${LIBASPELL_DIR}\"
+@@ -1108,13 +1047,6 @@
  done"
  
  case "${os}" in
@@ -185,7 +181,7 @@
      SunOS)
  wrapper_contain="${wrapper_contain}
  
-@@ -1098,7 +1038,7 @@
+@@ -1143,7 +1075,7 @@
  };
  
  // Opera package classes get all permissions
@@ -194,158 +190,166 @@
  	permission java.security.AllPermission;
  };
  
-@@ -1167,7 +1107,7 @@
+@@ -1260,12 +1192,12 @@
      chop "${OPERADESTDIR}" "str_localdirshare"
      chop "${OPERADESTDIR}" "str_localdirplugin"
  
+-    md5check Manifest.md5
++    #md5check Manifest.md5
+     part_install "`manifest_path operapluginwrapper`" "$exec_dir" Binaries
+     manifest_contains operapluginwrapper-native && part_install "`manifest_path operapluginwrapper-native`" "$exec_dir" Binaries
+     manifest_contains operapluginwrapper-ia32-linux && part_install "`manifest_path operapluginwrapper-ia32-linux`" "$exec_dir" Binaries
+     part_install "`manifest_path LICENSE`" "$doc_dir" Documentation
+-    part_install "`manifest_path man1/opera.1`" "$man_dir" "Manual page"
++    part_install "`manifest_path man1/linux-opera.1`" "$man_dir" "Manual page"
+ 
+     share_src="`manifest_path 'html40_entities\.dtd'`"
+     part_install "$share_src" "$share_dir" "Shared resources"
+@@ -1274,76 +1206,20 @@
+     mkdir $mkdirv $mkdirp $plugin_dir/
+ 
+     # Wrapper
 -    backup ${wrapper_dir}/opera opera
 +    #backup ${wrapper_dir}/opera opera
- 
-     # Executable
-     debug_msg 1 "Executable"
-@@ -1201,7 +1141,7 @@
+     debug_msg 1 "Wrapper"
+     mkdir $mkdirv $mkdirp $wrapper_dir/
  
      #cp $cpv $cpf wrapper.sh $wrapper_dir/opera
      generate_wrapper
 -    chmod $chmodv 755 $wrapper_dir/opera
 +    chmod $chmodv 755 $wrapper_dir/linux-opera
  
-     # Manual page
-     debug_msg 1 "Manual page"
-@@ -1210,7 +1150,7 @@
-     chmod $chmodv 755 ${man_dir}
-     mkdir $mkdirv $mkdirp ${man_dir}/man1
-     chmod $chmodv 755 ${man_dir}/man1
--    cp $cpv $cpf man/opera.1 ${man_dir}/man1
-+    cp $cpv $cpf man/opera.1 ${man_dir}/man1/linux-opera.1
- 
-     # Documentation
-     debug_msg 1 "Documentation"
-@@ -1242,13 +1182,6 @@
- 	mkdir $mkdirv $mkdirp $share_dir/ini/
- 	chmod $chmodv 755 $share_dir/ini
- 	cp $cpv $cpf $cpR ini/* $share_dir/ini/
--	if test -f $share_dir/ini/pluginpath.ini
--	then (
--	    echo
--	    echo '; locally installed:'
--	    echo "${str_localdirplugin}=1"
--	    ) >> $share_dir/ini/pluginpath.ini
--	fi
-     fi
- 
-     mkdir $mkdirv $mkdirp $share_dir/locale/
-@@ -1340,43 +1273,11 @@
- 
-     if test -z "${OPERADESTDIR}"
+     if test -z "$OPERADESTDIR"
      then
 -	# System wide configuration files
--	config_dir="/etc"
+-	case $os in AnyBSD|OpenBSD) config_dir="/usr/local/etc";; *) config_dir="/etc";; esac
+-	# TODO: work out what's going on here and replace with something that sets OPERA_ROOTPREFS to where they went !
 -	if can_write_to "$config_dir"
 -	then
--	    echo
--	    echo "System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " would be ignored if installed with the prefix \"$prefix\"."
--	    if con_firm "Do you want to install them in $config_dir"
+-	    warn
+-	    warn "System wide configuration files:"
+-	    warn "  $config_dir/opera6rc"
+-	    warn "  $config_dir/opera6rc.fixed"
+-	    warn " would be ignored if installed with the prefix \"$prefix\"."
+-	    bool_config=1
+-	    if [ "$flag_mode" = '--interactive' ]
+-	    then con_firm "Do you want to install them in $config_dir" || bool_config=0
+-	    else warn "Installing in default location $config_dir instead."
+-	    fi
+-
+-	    if [ $bool_config -eq 1 ]
 -	    then
--		backup $config_dir/opera6rc opera6rc config
--		backup $config_dir/opera6rc.fixed opera6rc.fixed config
--		cp $cpv $cpf config/opera6rc $config_dir
--		cp $cpv $cpf config/opera6rc.fixed $config_dir
+-		if [ -f "$config_dir/opera6rc" ]
+-		then
+-		    if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/opera6rc exists: over-write it ?"
+-		    then
+-			backup $config_dir/opera6rc opera6rc config
+-			cp $cpv $cpf etc/opera6rc $config_dir
+-		    fi
+-		else cp $cpv $cpf etc/opera6rc $config_dir
+-		fi
+-		if [ -f "$config_dir/opera6rc.fixed" ]
+-		then
+-		    if [ "$flag_mode" = '--interactive' ] && con_firm "$config_dir/opera6rc.fixed exists: over-write it ?"
+-		    then
+-			backup $config_dir/opera6rc.fixed opera6rc.fixed config
+-			cp $cpv $cpf etc/opera6rc.fixed $config_dir
+-		    fi
+-		else cp $cpv $cpf etc/opera6rc.fixed $config_dir
+-		fi
 -	    fi
 -	else
--	    echo
--	    echo "User \"${USERNAME}\" does not have write access to $config_dir"
--	    echo " System wide configuration files:"
--	    echo "  $config_dir/opera6rc"
--	    echo "  $config_dir/opera6rc.fixed"
--	    echo " were not installed."
+-	    warn
+-	    warn "User \"${USERNAME}\" does not have write access to $config_dir"
+-	    warn " System wide configuration files:"
+-	    warn "  $config_dir/opera6rc"
+-	    warn "  $config_dir/opera6rc.fixed"
+-	    warn " were not installed."
 -	fi
 -
  	# Shorcuts and Icons
  	bool_icons=1 # install icons by default
- 
 -	if test "${flag_mode}" = "--force" -o "${flag_mode}" = "--prefix="
 -	then
--	    echo
--	    echo "Shortcut icons will be ignored if installed with the prefix \"$prefix\"."
--	    con_firm "Do you want to (try to) install them in default locations" || bool_icons=0
+-	    warn
+-	    warn "Shortcut icons would be ignored if installed with the prefix \"$prefix\"."
+-	    if [ "$flag_mode" = "--force" ]
+-	    then warn "Installing them in default locations."
+-	    else bool_icons=0; warn "Ignoring them; menus shall lack nice icons."
+-	    fi
 -	fi
 -
- 	if test "${bool_icons}" -ne 0
+ 	if test "$bool_icons" -ne 0
 -	then xdg
 +	then icons
  	fi
  
      fi # OPERADESTDIR
-@@ -1428,19 +1329,19 @@
-     # arg1 = location
-     # arg2 = type
- 
--    desktop_file="${1}/opera.desktop"
-+    desktop_file="${1}/linux-opera.desktop"
-     desktop_contain='[Desktop Entry]'
- 
-     if test ${2}; then
- 	if test "${2}" = "xdg"; then
- 	    desktop_contain="${desktop_contain}
+@@ -1392,21 +1268,21 @@
+     echo '[Desktop Entry]'
+     if test -z "$1"
+     then cat < ${desktop_file}
-     chmod $chmodv 644 ${desktop_file}
-@@ -1528,55 +1430,28 @@
+ Type=Application
++Categories=Application;Network;WebBrowser;
+ EOF
+ }
+ 
+@@ -1462,7 +1339,7 @@
+ {
+     # arg1 = location
+     # arg2 = type
+-    desktop_content $2 > "$1/opera.desktop" && chmod $chmodv 644 "$1/opera.desktop"
++    desktop_content $2 > "$1/linux-opera.desktop" && chmod $chmodv 644 "$1/linux-opera.desktop"
+ }
+ 
+ generate_mdk_menu()
+@@ -1487,51 +1364,26 @@
  
      debug_msg 0 "in icons()"
  
@@ -354,64 +358,58 @@
 -	if test -w /usr/share
 -	then
 -	    mkdir $mkdirv $mkdirp /usr/share/icons/
--	    chmod $chmodv 755 /usr/share/icons
--	    cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+-	    cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
 -	fi
 -    elif test -w /usr/share/icons
--    then cp $cpv $share_dir/images/opera.xpm /usr/share/icons/opera.xpm
+-    then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/icons/opera.xpm
 -    fi
 -
 -    if test ! -d /usr/share/pixmaps
--    then
++    if test ! -d %%LOCALBASE%%/share/pixmaps/
+     then
 -	if test -w /usr/share
--	then
++	if test -w %%LOCALBASE%%/share
+ 	then
 -	    mkdir $mkdirv $mkdirp /usr/share/pixmaps/
--	    chmod $chmodv 755 /usr/share/pixmaps
--	    cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
--	fi
+-	    cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
++	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/pixmaps/
++	    cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
+ 	fi
 -    elif test -w /usr/share/pixmaps/
--    then cp $cpv $share_dir/images/opera.xpm /usr/share/pixmaps/opera.xpm
--    fi
--
+-    then cp $cpv $share_src/pixmaps/opera.xpm /usr/share/pixmaps/opera.xpm
++    elif test -w %%LOCALBASE%%/share/pixmaps/
++    then cp $cpv usr/share/icons/hicolor/48x48/apps/opera.png %%LOCALBASE%%/share/pixmaps/linux-opera.png
+     fi
+ 
 -    if test ! -d /etc/X11/wmconfig/
-+    if test ! -d /usr/local/share/pixmaps/
++    if test ! -d %%LOCALBASE%%/share/applications/
      then
 -	if test -w /etc/X11
-+	if test -w /usr/local/share
++	if test -w %%LOCALBASE%%/share
  	then
 -	    mkdir $mkdirv $mkdirp /etc/X11/wmconfig/
--	    chmod $chmodv 755 /etc/X11/wmconfig
 -	    generate_wmconfig /etc/X11/wmconfig
-+	    mkdir $mkdirv $mkdirp /usr/local/share/pixmaps/
-+	    chmod $chmodv 755 /usr/local/share/pixmaps
-+	    cp $cpv $share_dir/images/opera_48x48.png /usr/local/share/pixmaps/linux-opera.png
- 	fi
+-	fi
 -    elif test -w /etc/X11/wmconfig/
 -    then generate_wmconfig /etc/X11/wmconfig
-+    elif test -w /usr/local/share/pixmaps/
-+    then cp $cpv $share_dir/images/opera_48x48.png /usr/local/share/pixmaps/linux-opera.png
-     fi
- 
+-    fi
+-
 -    if test -d /etc/X11/applnk/
-+    if test ! -d /usr/local/share/applications/
-     then
+-    then
 -	if test ! -d /etc/X11/applnk/Internet/
-+	if test -w /usr/local/share
- 	then
+-	then
 -	    if test -w /etc/X11/applnk
 -	    then
 -		mkdir $mkdirv $mkdirp /etc/X11/applnk/Internet/
--		chmod $chmodv 755 /etc/X11/applnk/Internet
 -		generate_desktop /etc/X11/applnk/Internet
 -	    fi
 -	elif test -w /etc/X11/applnk/Internet
 -	then generate_desktop /etc/X11/applnk/Internet
-+	    mkdir $mkdirv $mkdirp /usr/local/share/applications/
-+	    chmod $chmodv 755 /usr/local/share/applications
-+	    generate_desktop /usr/local/share/applications
++	    mkdir $mkdirv $mkdirp %%LOCALBASE%%/share/applications/
++	    generate_desktop %%LOCALBASE%%/share/applications
  	fi
-+    elif test -w /usr/local/share/applications
-+    then generate_desktop /usr/local/share/applications
++    elif test -w %%LOCALBASE%%/share/applications
++    then generate_desktop %%LOCALBASE%%/share/applications
      fi
  }
  
--- /dev/null
+++ www/linux-opera/files/linux-opera.desktop.in
@@ -0,0 +1,12 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Opera Web Browser
+GenericName=Web Browser
+Comment=Browse the web
+Exec=linux-opera %u
+Icon=@PREFIX@/share/pixmaps/linux-opera.xpm
+StartupNotify=false
+Terminal=false
+Type=Application
+Categories=Application;Network;
+MimeType=text/html;text/xml;application/xhtml+xml;

From laffer1 at midnightbsd.org  Sat Jan  3 20:44:36 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 20:44:36 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: pkg-message: fix message
Message-ID: <200901040144.n041ia9b060834@stargazer.midnightbsd.org>

Log Message:
-----------
fix message

Modified Files:
--------------
    mports/www/linux-opera:
        pkg-message (r1.5 -> r1.6)

-------------- next part --------------
Index: pkg-message
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/pkg-message,v
retrieving revision 1.5
retrieving revision 1.6
diff -L www/linux-opera/pkg-message -L www/linux-opera/pkg-message -u -r1.5 -r1.6
--- www/linux-opera/pkg-message
+++ www/linux-opera/pkg-message
@@ -1,5 +1,3 @@
-Changelog for 9.25 Final: http://www.opera.com/docs/changelogs/linux/925/
-
 Backup your personal "~/.linux-opera" directory prior to running Opera
 for the first time. 
 

From laffer1 at midnightbsd.org  Sat Jan  3 21:24:49 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 21:24:49 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: this MAY fix a problem with the
	linux-opera script.
Message-ID: <200901040224.n042Onnb064473@stargazer.midnightbsd.org>

Log Message:
-----------
this MAY fix a problem with the linux-opera script.  However, i can't test this due to linux-expat

Modified Files:
--------------
    mports/www/linux-opera:
        Makefile (r1.12 -> r1.13)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/linux-opera/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -L www/linux-opera/Makefile -L www/linux-opera/Makefile -u -r1.12 -r1.13
--- www/linux-opera/Makefile
+++ www/linux-opera/Makefile
@@ -66,11 +66,12 @@
 	@${MKDIR} ${PREFIX}/share/pixmaps
 	@${INSTALL_DATA} ${WRKSRC}/usr/share/pixmaps/opera.xpm ${PREFIX}/share/pixmaps/linux-opera.xpm
 	@(cd ${WRKSRC} && ./install.sh \
-			--prefix=${PREFIX} \
-			--docdir=${DOCSDIR} \
-			--sharedir=${DATADIR} \
-			--exec_prefix=${DATADIR}/bin \
-			--plugindir=${DATADIR}/plugins)
+			--prefix=${TRUE_PREFIX} \
+			--docdir=${TRUE_PREFIX}/share/doc/linux-opera \
+			--sharedir=${TRUE_PREFIX}/share/linux-opera \
+			--exec_prefix=${TRUE_PREFIX}/share/linux-opera/bin \
+			--plugindir=${TRUE_PREFIX}/share/linux-opera/plugins \
+			--DESTDIR=${FAKE_DESTDIR})
 	@${INSTALL_DATA} ${WRKDIR}/linux-opera.desktop ${PREFIX}/share/apps/Internet/
 	@${INSTALL_DATA} ${WRKDIR}/linux-opera.desktop ${PREFIX}/share/applnk/Internet/
 

From ctriv at midnightbsd.org  Sat Jan  3 22:19:35 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:19:35 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: bsd.mport.mk: workaround bug where prefix
	is already set before
Message-ID: <200901040319.n043JZLS069475@stargazer.midnightbsd.org>

Log Message:
-----------
workaround bug where prefix is already set before extensions are loaded. 
This should fix ports that have USE_LINUX_RPM set, but are installed in
LOCALBASE.

Modified Files:
--------------
    mports/Mk:
        bsd.mport.mk (r1.133 -> r1.134)

-------------- next part --------------
Index: bsd.mport.mk
===================================================================
RCS file: /home/cvs/mports/Mk/bsd.mport.mk,v
retrieving revision 1.133
retrieving revision 1.134
diff -L Mk/bsd.mport.mk -L Mk/bsd.mport.mk -u -r1.133 -r1.134
--- Mk/bsd.mport.mk
+++ Mk/bsd.mport.mk
@@ -58,7 +58,9 @@
 
 .if defined(USE_X_PREFIX) || defined(USE_IMAKE)
 PREFIX?=	${X11BASE_REL}
-.elif defined(USE_LINUX_PREFIX)
+# sadly, we have to use a little hack here.  Once linux-rpm.mk is loaded, this 
+# will already have been evaluated. XXX - Find a better fix in the future.
+.elif defined(USE_LINUX_PREFIX) || defined(USE_LINUX_RPM)
 PREFIX?=	${LINUXBASE_REL}
 .else
 PREFIX?=	${LOCALBASE_REL}

From ctriv at midnightbsd.org  Sat Jan  3 22:20:40 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:20:40 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: graphics/kdegraphics4: Added
	kdegraphics-4.1.3
Message-ID: <200901040320.n043KeW5069903@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdegraphics-4.1.3

Added Files:
-----------
    mports/graphics/kdegraphics4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/graphics/kdegraphics4/files:
        patch-kamera-config-kamera.h (r1.1)
        patch-libs__libkdcraw__CMakeLists.txt (r1.1)
        patch-libs__libkexiv2__CMakeLists.txt (r1.1)
        patch-libs__libkipi__CMakeLists.txt (r1.1)

-------------- next part --------------
--- /dev/null
+++ graphics/kdegraphics4/pkg-descr
@@ -0,0 +1,5 @@
+KDE provides an integrated X11 based environment, much like CDE.
+This particular port installs the graphics and image manipulation
+components of KDE4.
+
+WWW: http://www.kde.org/
--- /dev/null
+++ graphics/kdegraphics4/pkg-plist
@@ -0,0 +1,548 @@
+bin/gwenview
+bin/kbackgroundsnapshot
+bin/kcolorchooser
+bin/kolourpaint
+bin/kruler
+bin/ksnapshot
+bin/okular
+bin/xf86gammacfg
+include/libkdcraw/dcrawbinary.h
+include/libkdcraw/dcrawinfocontainer.h
+include/libkdcraw/dcrawsettingswidget.h
+include/libkdcraw/kdcraw.h
+include/libkdcraw/libkdcraw_export.h
+include/libkdcraw/rawdecodingsettings.h
+include/libkdcraw/rawfiles.h
+include/libkdcraw/version.h
+include/libkexiv2/kexiv2.h
+include/libkexiv2/libkexiv2_export.h
+include/libkexiv2/version.h
+include/libkipi/imagecollection.h
+include/libkipi/imagecollectionselector.h
+include/libkipi/imagecollectionshared.h
+include/libkipi/imageinfo.h
+include/libkipi/imageinfoshared.h
+include/libkipi/interface.h
+include/libkipi/libkipi_export.h
+include/libkipi/plugin.h
+include/libkipi/pluginloader.h
+include/libkipi/uploadwidget.h
+include/libkipi/version.h
+include/libksane/ksane.h
+include/libksane/libksane_export.h
+include/libksane/version.h
+include/okular/core/action.h
+include/okular/core/annotations.h
+include/okular/core/area.h
+include/okular/core/document.h
+include/okular/core/fileprinter.h
+include/okular/core/fontinfo.h
+include/okular/core/form.h
+include/okular/core/generator.h
+include/okular/core/global.h
+include/okular/core/okular_export.h
+include/okular/core/page.h
+include/okular/core/pagesize.h
+include/okular/core/pagetransition.h
+include/okular/core/sound.h
+include/okular/core/sourcereference.h
+include/okular/core/textdocumentgenerator.h
+include/okular/core/textpage.h
+include/okular/core/utils.h
+include/okular/core/version.h
+include/okular/interfaces/configinterface.h
+include/okular/interfaces/guiinterface.h
+include/okular/interfaces/printinterface.h
+lib/kde4/gsthumbnail.so
+lib/kde4/gvpart.so
+lib/kde4/kcm_kamera.so
+lib/kde4/kcm_kgamma.so
+lib/kde4/kio_kamera.so
+lib/kde4/kio_msits.so
+lib/kde4/ksaneplugin.so
+lib/kde4/okularGenerator_chmlib.so
+lib/kde4/okularGenerator_comicbook.so
+lib/kde4/okularGenerator_epub.so
+lib/kde4/okularGenerator_djvu.so
+lib/kde4/okularGenerator_dvi.so
+lib/kde4/okularGenerator_fb.so
+lib/kde4/okularGenerator_ghostview.so
+lib/kde4/okularGenerator_kimgio.so
+lib/kde4/okularGenerator_ooo.so
+lib/kde4/okularGenerator_plucker.so
+lib/kde4/okularGenerator_poppler.so
+lib/kde4/okularGenerator_tiff.so
+lib/kde4/okularGenerator_xps.so
+lib/kde4/okularpart.so
+lib/kde4/svgpart.so
+lib/libgwenviewlib.so
+lib/libgwenviewlib.so.5
+lib/libgwenviewlib.so.5.0.0
+lib/libkdcraw.so
+lib/libkdcraw.so.5
+lib/libkdcraw.so.5.0.0
+lib/libkdcraw5/CAMERALIST
+lib/libkdcraw5/kdcraw
+lib/libkexiv2.so
+lib/libkexiv2.so.6
+lib/libkexiv2.so.6.0.0
+lib/libkipi.so
+lib/libkipi.so.5
+lib/libkipi.so.5.0.0
+lib/libkolourpaint_lgpl.so
+lib/libkolourpaint_lgpl.so.5
+lib/libkolourpaint_lgpl.so.5.0.0
+lib/libksane.so
+lib/libksane.so.0
+lib/libksane.so.0.1.1
+lib/libokularcore.so
+lib/libokularcore.so.1
+lib/libokularcore.so.1.1.0
+lib/strigi/strigita_dvi.so
+libdata/pkgconfig/libkipi-kde4.pc
+libdata/pkgconfig/libkdcraw-kde4.pc
+libdata/pkgconfig/libkexiv2-kde4.pc
+libdata/pkgconfig/libksane.pc
+share/applications/kde4/gwenview.desktop
+share/applications/kde4/kcolorchooser.desktop
+share/applications/kde4/kolourpaint.desktop
+share/applications/kde4/kruler.desktop
+share/applications/kde4/ksnapshot.desktop
+share/applications/kde4/okular.desktop
+share/applications/kde4/okularApplication_chm.desktop
+share/applications/kde4/okularApplication_comicbook.desktop
+share/applications/kde4/okularApplication_epub.desktop
+share/applications/kde4/okularApplication_djvu.desktop
+share/applications/kde4/okularApplication_dvi.desktop
+share/applications/kde4/okularApplication_fb.desktop
+share/applications/kde4/okularApplication_ghostview.desktop
+share/applications/kde4/okularApplication_kimgio.desktop
+share/applications/kde4/okularApplication_ooo.desktop
+share/applications/kde4/okularApplication_pdf.desktop
+share/applications/kde4/okularApplication_plucker.desktop
+share/applications/kde4/okularApplication_tiff.desktop
+share/applications/kde4/okularApplication_xps.desktop
+share/apps/cmake/modules/FindKSane.cmake
+share/apps/cmake/modules/FindOkular.cmake
+share/apps/gvpart/gvpart-gwenview.rc
+share/apps/gvpart/gvpart.rc
+share/apps/gwenview/cursors/zoom.png
+share/apps/gwenview/fullscreenthemes/blackglass/checked.png
+share/apps/gwenview/fullscreenthemes/blackglass/scroll-left.png
+share/apps/gwenview/fullscreenthemes/blackglass/scroll-right.png
+share/apps/gwenview/fullscreenthemes/blackglass/style.css
+share/apps/gwenview/gwenviewui.rc
+share/apps/kgamma/pics/background.png
+share/apps/kgamma/pics/cmyscale.png
+share/apps/kgamma/pics/darkgrey.png
+share/apps/kgamma/pics/greyscale.png
+share/apps/kgamma/pics/lightgrey.png
+share/apps/kgamma/pics/midgrey.png
+share/apps/kgamma/pics/rgbscale.png
+share/apps/kipi/data/kipi-plugins_logo.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/16x16/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/22x22/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/32x32/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_brush.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_color_eraser.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_color_picker.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_curve.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_ellipse.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_elliptical_selection.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_eraser.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_flood_fill.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_free_form_selection.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_line.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_pen.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_polygon.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_polyline.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_rect_selection.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_rectangle.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_rounded_rectangle.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_spraycan.png
+share/apps/kolourpaint/icons/hicolor/48x48/actions/tool_text.png
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_brush.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_color_eraser.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_color_picker.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_curve.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_ellipse.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_elliptical_selection.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_eraser.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_flood_fill.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_free_form_selection.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_line.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_pen.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_polygon.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_polyline.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_rect_selection.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_rectangle.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_rounded_rectangle.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_spraycan.svgz
+share/apps/kolourpaint/icons/hicolor/scalable/actions/tool_text.svgz
+share/apps/kolourpaint/kolourpaintui.rc
+share/apps/kolourpaint/pics/color_transparent_26x26.png
+share/apps/kolourpaint/pics/colorbutton_swap_16x16.png
+share/apps/kolourpaint/pics/image_rotate_anticlockwise.png
+share/apps/kolourpaint/pics/image_rotate_clockwise.png
+share/apps/kolourpaint/pics/image_skew_horizontal.png
+share/apps/kolourpaint/pics/image_skew_vertical.png
+share/apps/kolourpaint/pics/option_opaque.png
+share/apps/kolourpaint/pics/option_transparent.png
+share/apps/kolourpaint/pics/resize.png
+share/apps/kolourpaint/pics/scale.png
+share/apps/kolourpaint/pics/smooth_scale.png
+share/apps/kolourpaint/pics/tool_spraycan_17x17.png
+share/apps/kolourpaint/pics/tool_spraycan_29x29.png
+share/apps/kolourpaint/pics/tool_spraycan_9x9.png
+share/apps/kruler/kruler.notifyrc
+share/apps/kruler/pics/kruler-east.png
+share/apps/kruler/pics/kruler-north.png
+share/apps/kruler/pics/kruler-south.png
+share/apps/kruler/pics/kruler-west.png
+share/apps/kruler/sounds/move.wav
+share/apps/libkdcraw/profiles/adobergb.icm
+share/apps/libkdcraw/profiles/applergb.icm
+share/apps/libkdcraw/profiles/prophoto.icm
+share/apps/libkdcraw/profiles/srgb-d65.icm
+share/apps/libkdcraw/profiles/srgb.icm
+share/apps/libkdcraw/profiles/widegamut.icm
+share/apps/okular/icons/hicolor/16x16/apps/okular-gv.png
+share/apps/okular/icons/hicolor/32x32/apps/okular-gv.png
+share/apps/okular/part.rc
+share/apps/okular/pics/checkmark.png
+share/apps/okular/pics/circle.png
+share/apps/okular/pics/comment.png
+share/apps/okular/pics/cross.png
+share/apps/okular/pics/help.png
+share/apps/okular/pics/insert.png
+share/apps/okular/pics/key.png
+share/apps/okular/pics/newparagraph.png
+share/apps/okular/pics/note.png
+share/apps/okular/pics/paperclip.png
+share/apps/okular/pics/paragraph.png
+share/apps/okular/pics/pushpin.png
+share/apps/okular/pics/rightarrow.png
+share/apps/okular/pics/rightpointer.png
+share/apps/okular/pics/star.png
+share/apps/okular/pics/tool-note-inline.png
+share/apps/okular/pics/tool-note.png
+share/apps/okular/pics/tool-stamp.png
+share/apps/okular/pics/tool_ellipse_okular.png
+share/apps/okular/pics/tool_hl_yellow.png
+share/apps/okular/pics/tool_ink_green.png
+share/apps/okular/pics/tool_line_okular.png
+share/apps/okular/pics/tool_note.png
+share/apps/okular/pics/tool_polygon_okular.png
+share/apps/okular/pics/uparrow.png
+share/apps/okular/pics/upleftarrow.png
+share/apps/okular/shell.rc
+share/apps/okular/tools.xml
+share/apps/svgpart/svgpart.rc
+share/config.kcfg/gssettings.kcfg
+share/config.kcfg/okular.kcfg
+share/config/okular.knsrc
+share/dbus-1/interfaces/org.kde.ksnapshot.xml
+share/doc/HTML/en/gwenview/browse_mode.png
+share/doc/HTML/en/gwenview/common
+share/doc/HTML/en/gwenview/fullscreen_mode.png
+share/doc/HTML/en/gwenview/index.cache.bz2
+share/doc/HTML/en/gwenview/index.docbook
+share/doc/HTML/en/gwenview/interface.docbook
+share/doc/HTML/en/gwenview/introduction.docbook
+share/doc/HTML/en/gwenview/keybindings.docbook
+share/doc/HTML/en/gwenview/mouse.docbook
+share/doc/HTML/en/gwenview/view_mode.png
+share/doc/HTML/en/kamera/common
+share/doc/HTML/en/kamera/index.cache.bz2
+share/doc/HTML/en/kamera/index.docbook
+share/doc/HTML/en/kgamma/common
+share/doc/HTML/en/kgamma/index.cache.bz2
+share/doc/HTML/en/kgamma/index.docbook
+share/doc/HTML/en/kolourpaint/brush_shapes.png
+share/doc/HTML/en/kolourpaint/color_box.png
+share/doc/HTML/en/kolourpaint/common
+share/doc/HTML/en/kolourpaint/eraser_shapes.png
+share/doc/HTML/en/kolourpaint/fcc_std_text.png
+share/doc/HTML/en/kolourpaint/fcc_trans_text.png
+share/doc/HTML/en/kolourpaint/fill_color_similarity.png
+share/doc/HTML/en/kolourpaint/fill_style.png
+share/doc/HTML/en/kolourpaint/image_balance.png
+share/doc/HTML/en/kolourpaint/image_emboss.png
+share/doc/HTML/en/kolourpaint/image_flatten.png
+share/doc/HTML/en/kolourpaint/image_flip.png
+share/doc/HTML/en/kolourpaint/image_invert.png
+share/doc/HTML/en/kolourpaint/image_reduce_colors.png
+share/doc/HTML/en/kolourpaint/image_resize_scale.png
+share/doc/HTML/en/kolourpaint/image_rotate.png
+share/doc/HTML/en/kolourpaint/image_skew.png
+share/doc/HTML/en/kolourpaint/image_soften_sharpen.png
+share/doc/HTML/en/kolourpaint/index.cache.bz2
+share/doc/HTML/en/kolourpaint/index.docbook
+share/doc/HTML/en/kolourpaint/kolourpaint-main.png
+share/doc/HTML/en/kolourpaint/line_width.png
+share/doc/HTML/en/kolourpaint/lines_30_45_deg.png
+share/doc/HTML/en/kolourpaint/lines_30_deg.png
+share/doc/HTML/en/kolourpaint/lines_45_deg.png
+share/doc/HTML/en/kolourpaint/rotate_image_30.png
+share/doc/HTML/en/kolourpaint/rotate_selection_30.png
+share/doc/HTML/en/kolourpaint/selections_opaque_transparent.png
+share/doc/HTML/en/kolourpaint/spraycan_patterns.png
+share/doc/HTML/en/kolourpaint/text_zoom_grid.png
+share/doc/HTML/en/kolourpaint/tool_brush.png
+share/doc/HTML/en/kolourpaint/tool_color_picker.png
+share/doc/HTML/en/kolourpaint/tool_color_washer.png
+share/doc/HTML/en/kolourpaint/tool_curve.png
+share/doc/HTML/en/kolourpaint/tool_ellipse.png
+share/doc/HTML/en/kolourpaint/tool_elliptical_selection.png
+share/doc/HTML/en/kolourpaint/tool_eraser.png
+share/doc/HTML/en/kolourpaint/tool_flood_fill.png
+share/doc/HTML/en/kolourpaint/tool_free_form_selection.png
+share/doc/HTML/en/kolourpaint/tool_line.png
+share/doc/HTML/en/kolourpaint/tool_pen.png
+share/doc/HTML/en/kolourpaint/tool_polygon.png
+share/doc/HTML/en/kolourpaint/tool_polyline.png
+share/doc/HTML/en/kolourpaint/tool_polystar.png
+share/doc/HTML/en/kolourpaint/tool_rect_selection.png
+share/doc/HTML/en/kolourpaint/tool_rectangle.png
+share/doc/HTML/en/kolourpaint/tool_rectangles.png
+share/doc/HTML/en/kolourpaint/tool_rounded_rectangle.png
+share/doc/HTML/en/kolourpaint/tool_selections.png
+share/doc/HTML/en/kolourpaint/tool_spraycan.png
+share/doc/HTML/en/kolourpaint/tool_text.png
+share/doc/HTML/en/kolourpaint/view_thumbnails.png
+share/doc/HTML/en/kruler/common
+share/doc/HTML/en/kruler/index.cache.bz2
+share/doc/HTML/en/kruler/index.docbook
+share/doc/HTML/en/ksnapshot/common
+share/doc/HTML/en/ksnapshot/index.cache.bz2
+share/doc/HTML/en/ksnapshot/index.docbook
+share/doc/HTML/en/ksnapshot/preview.png
+share/doc/HTML/en/ksnapshot/window.png
+share/doc/HTML/en/okular/common
+share/doc/HTML/en/okular/configure.png
+share/doc/HTML/en/okular/embedded-files-bar.png
+share/doc/HTML/en/okular/index.cache.bz2
+share/doc/HTML/en/okular/index.docbook
+share/icons/hicolor/128x128/apps/gwenview.png
+share/icons/hicolor/128x128/apps/kdcraw.png
+share/icons/hicolor/128x128/apps/kipi.png
+share/icons/hicolor/128x128/apps/kruler.png
+share/icons/hicolor/128x128/apps/okular.png
+share/icons/hicolor/16x16/actions/black-white.png
+share/icons/hicolor/16x16/actions/color.png
+share/icons/hicolor/16x16/actions/gray-scale.png
+share/icons/hicolor/16x16/apps/gwenview.png
+share/icons/hicolor/16x16/apps/kcolorchooser.png
+share/icons/hicolor/16x16/apps/kgamma.png
+share/icons/hicolor/16x16/apps/kipi.png
+share/icons/hicolor/16x16/apps/kolourpaint.png
+share/icons/hicolor/16x16/apps/kruler.png
+share/icons/hicolor/16x16/apps/ksnapshot.png
+share/icons/hicolor/16x16/apps/okular.png
+share/icons/hicolor/22x22/apps/gwenview.png
+share/icons/hicolor/22x22/apps/kcolorchooser.png
+share/icons/hicolor/22x22/apps/kipi.png
+share/icons/hicolor/22x22/apps/kolourpaint.png
+share/icons/hicolor/22x22/apps/kruler.png
+share/icons/hicolor/22x22/apps/ksnapshot.png
+share/icons/hicolor/22x22/apps/okular.png
+share/icons/hicolor/32x32/apps/gwenview.png
+share/icons/hicolor/32x32/apps/kdcraw.png
+share/icons/hicolor/32x32/apps/kgamma.png
+share/icons/hicolor/32x32/apps/kipi.png
+share/icons/hicolor/32x32/apps/kolourpaint.png
+share/icons/hicolor/32x32/apps/kruler.png
+share/icons/hicolor/32x32/apps/ksnapshot.png
+share/icons/hicolor/32x32/apps/okular.png
+share/icons/hicolor/48x48/apps/gwenview.png
+share/icons/hicolor/48x48/apps/kdcraw.png
+share/icons/hicolor/48x48/apps/kgamma.png
+share/icons/hicolor/48x48/apps/kipi.png
+share/icons/hicolor/48x48/apps/kolourpaint.png
+share/icons/hicolor/48x48/apps/kruler.png
+share/icons/hicolor/48x48/apps/ksnapshot.png
+share/icons/hicolor/48x48/apps/okular.png
+share/icons/hicolor/64x64/apps/gwenview.png
+share/icons/hicolor/64x64/apps/kdcraw.png
+share/icons/hicolor/64x64/apps/kruler.png
+share/icons/hicolor/64x64/apps/okular.png
+share/icons/hicolor/scalable/apps/gwenview.svgz
+share/icons/hicolor/scalable/apps/kolourpaint.svgz
+share/icons/hicolor/scalable/apps/kruler.svgz
+share/icons/hicolor/scalable/apps/ksnapshot.svgz
+share/icons/hicolor/scalable/apps/okular.svgz
+share/kde4/services/ServiceMenus/slideshow.desktop
+share/kde4/services/camera.protocol
+share/kde4/services/gsthumbnail.desktop
+share/kde4/services/gvpart.desktop
+share/kde4/services/kamera.desktop
+share/kde4/services/kgamma.desktop
+share/kde4/services/ksane_scan_service.desktop
+share/kde4/services/libokularGenerator_chmlib.desktop
+share/kde4/services/libokularGenerator_comicbook.desktop
+share/kde4/services/libokularGenerator_epub.desktop
+share/kde4/services/libokularGenerator_djvu.desktop
+share/kde4/services/libokularGenerator_dvi.desktop
+share/kde4/services/libokularGenerator_fb.desktop
+share/kde4/services/libokularGenerator_ghostview.desktop
+share/kde4/services/libokularGenerator_kimgio.desktop
+share/kde4/services/libokularGenerator_ooo.desktop
+share/kde4/services/libokularGenerator_plucker.desktop
+share/kde4/services/libokularGenerator_poppler.desktop
+share/kde4/services/libokularGenerator_tiff.desktop
+share/kde4/services/libokularGenerator_xps.desktop
+share/kde4/services/msits.protocol
+share/kde4/services/okularChm.desktop
+share/kde4/services/okularComicbook.desktop
+share/kde4/services/okularEPub.desktop
+share/kde4/services/okularDjvu.desktop
+share/kde4/services/okularDvi.desktop
+share/kde4/services/okularFb.desktop
+share/kde4/services/okularGhostview.desktop
+share/kde4/services/okularKimgio.desktop
+share/kde4/services/okularOoo.desktop
+share/kde4/services/okularPlucker.desktop
+share/kde4/services/okularPoppler.desktop
+share/kde4/services/okularTiff.desktop
+share/kde4/services/okularXps.desktop
+share/kde4/services/okular_part.desktop
+share/kde4/services/svgpart.desktop
+share/kde4/servicetypes/kipiplugin.desktop
+share/kde4/servicetypes/okularGenerator.desktop
+ at dirrmtry share/kde4/servicetypes
+ at dirrmtry share/kde4/services/ServiceMenus
+ at dirrmtry share/kde4/services
+ at dirrmtry share/kde4
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16/actions
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrm share/doc/HTML/en/okular
+ at dirrm share/doc/HTML/en/ksnapshot
+ at dirrm share/doc/HTML/en/kruler
+ at dirrm share/doc/HTML/en/kolourpaint
+ at dirrm share/doc/HTML/en/kgamma
+ at dirrm share/doc/HTML/en/kamera
+ at dirrm share/doc/HTML/en/gwenview
+ at dirrmtry share/doc/HTML/en
+ at dirrmtry share/doc/HTML
+ at dirrmtry share/doc
+ at dirrmtry share/dbus-1/interfaces
+ at dirrmtry share/dbus-1
+ at dirrmtry share/config.kcfg
+ at dirrmtry share/config
+ at dirrmtry share/apps/svgpart
+ at dirrm share/apps/okular/pics
+ at dirrm share/apps/okular/icons/hicolor/32x32/apps
+ at dirrm share/apps/okular/icons/hicolor/32x32
+ at dirrm share/apps/okular/icons/hicolor/16x16/apps
+ at dirrm share/apps/okular/icons/hicolor/16x16
+ at dirrm share/apps/okular/icons/hicolor
+ at dirrm share/apps/okular/icons
+ at dirrm share/apps/okular
+ at dirrm share/apps/libkdcraw/profiles
+ at dirrm share/apps/libkdcraw
+ at dirrm share/apps/kruler/sounds
+ at dirrm share/apps/kruler/pics
+ at dirrm share/apps/kruler
+ at dirrm share/apps/kolourpaint/pics
+ at dirrm share/apps/kolourpaint/icons/hicolor/scalable/actions
+ at dirrm share/apps/kolourpaint/icons/hicolor/scalable
+ at dirrm share/apps/kolourpaint/icons/hicolor/48x48/actions
+ at dirrm share/apps/kolourpaint/icons/hicolor/48x48
+ at dirrm share/apps/kolourpaint/icons/hicolor/32x32/actions
+ at dirrm share/apps/kolourpaint/icons/hicolor/32x32
+ at dirrm share/apps/kolourpaint/icons/hicolor/22x22/actions
+ at dirrm share/apps/kolourpaint/icons/hicolor/22x22
+ at dirrm share/apps/kolourpaint/icons/hicolor/16x16/actions
+ at dirrm share/apps/kolourpaint/icons/hicolor/16x16
+ at dirrm share/apps/kolourpaint/icons/hicolor
+ at dirrm share/apps/kolourpaint/icons
+ at dirrm share/apps/kolourpaint
+ at dirrm share/apps/kipi/data
+ at dirrm share/apps/kipi
+ at dirrm share/apps/kgamma/pics
+ at dirrm share/apps/kgamma
+ at dirrm share/apps/gwenview/fullscreenthemes/blackglass
+ at dirrm share/apps/gwenview/fullscreenthemes
+ at dirrm share/apps/gwenview/cursors
+ at dirrm share/apps/gwenview
+ at dirrm share/apps/gvpart
+ at dirrmtry share/apps/cmake/modules
+ at dirrmtry share/apps/cmake
+ at dirrmtry share/apps
+ at dirrmtry share/applications/kde4
+ at dirrmtry share/applications
+ at dirrmtry lib/strigi
+ at dirrm lib/libkdcraw5
+ at dirrm include/okular/interfaces
+ at dirrm include/okular/core
+ at dirrm include/okular
+ at dirrm include/libksane
+ at dirrm include/libkipi
+ at dirrm include/libkexiv2
+ at dirrm include/libkdcraw
--- /dev/null
+++ graphics/kdegraphics4/Makefile
@@ -0,0 +1,50 @@
+#
+# $MidnightBSD: mports/graphics/kdegraphics4/Makefile,v 1.1 2009/01/04 03:20:37 ctriv Exp $
+
+PORTNAME=	kdegraphics
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	graphics kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Graphics utilities for the KDE4 integrated X11 desktop
+LICENSE=	gpl2
+
+BUILD_DEPENDS=	kpsewhich:${PORTSDIR}/print/teTeX-base
+LIB_DEPENDS=	art_lgpl_2:${PORTSDIR}/graphics/libart_lgpl \
+		fontconfig:${PORTSDIR}/x11-fonts/fontconfig \
+		freetype:${PORTSDIR}/print/freetype2 \
+		fribidi:${PORTSDIR}/converters/fribidi \
+		lcms:${PORTSDIR}/graphics/lcms \
+		paper:${PORTSDIR}/print/libpaper \
+		poppler-qt4:${PORTSDIR}/graphics/poppler-qt4 \
+		exiv2.3:${PORTSDIR}/graphics/exiv2 \
+		chm.0:${PORTSDIR}/misc/chmlib \
+		sane.1:${PORTSDIR}/graphics/sane-backends \
+		gphoto2.2:${PORTSDIR}/graphics/libgphoto2 \
+		djvulibre:${PORTSDIR}/graphics/djvulibre-nox11 \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		spectre.1:${PORTSDIR}/print/libspectre \
+		qca.2:${PORTSDIR}/devel/qca \
+		epub.0:${PORTSDIR}/textproc/ebook-tools
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_GL=			glut
+USE_GHOSTSCRIPT=	yes
+USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+USE_BZIP2=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl gui moc rcc uic svg iconengines pixeltool
+
+post-extract:
+	${MKDIR} ${WRKSRC}
+
+post-patch:
+	${FIND} ${WRKSRC}/.. -type f -name CMakeLists.txt | ${XARGS} \
+		${REINPLACE_CMD} -e 's|pkgconfig|../libdata/pkgconfig|'
+
+.include 
--- /dev/null
+++ graphics/kdegraphics4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdegraphics-4.1.3.tar.bz2) = 62513c5d92fae359705266eb2365c526
+SHA256 (KDE/kdegraphics-4.1.3.tar.bz2) = eda3bd5a000359532d8b8e59986de0fe84ad32724a62403d446ada512a822a4d
+SIZE (KDE/kdegraphics-4.1.3.tar.bz2) = 3434831
--- /dev/null
+++ graphics/kdegraphics4/files/patch-libs__libkexiv2__CMakeLists.txt
@@ -0,0 +1,13 @@
+--- ../libs/libkexiv2/CMakeLists.txt.orig	2008-06-03 17:48:03.000000000 +0400
++++ ../libs/libkexiv2/CMakeLists.txt	2008-08-18 20:07:28.000000000 +0400
+@@ -52,8 +52,8 @@
+   SUBDIRS(libkexiv2)
+ 
+   IF(NOT WIN32)
+-    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkexiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.pc)
++    CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkexiv2.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2-kde4.pc)
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkexiv2.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.lsm)
+-    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
++    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkexiv2-kde4.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+   ENDIF(NOT WIN32)
+ endif (EXIV2_FOUND)
--- /dev/null
+++ graphics/kdegraphics4/files/patch-libs__libkdcraw__CMakeLists.txt
@@ -0,0 +1,12 @@
+--- ../libs/libkdcraw/CMakeLists.txt.orig	2008-06-03 17:48:03.000000000 +0400
++++ ../libs/libkdcraw/CMakeLists.txt	2008-08-18 20:05:56.000000000 +0400
+@@ -62,7 +62,7 @@
+ SUBDIRS(profiles)
+ 
+ IF(NOT WIN32)
+-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc)
++  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw-kde4.pc)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkdcraw.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.lsm)
+-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
++  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkdcraw-kde4.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+ ENDIF(NOT WIN32)
--- /dev/null
+++ graphics/kdegraphics4/files/patch-libs__libkipi__CMakeLists.txt
@@ -0,0 +1,13 @@
+--- ../libs/libkipi/CMakeLists.txt.orig	2008-06-03 17:48:04.000000000 +0400
++++ ../libs/libkipi/CMakeLists.txt	2008-08-18 20:07:58.000000000 +0400
+@@ -51,8 +51,8 @@
+ SUBDIRS(libkipi)
+ 
+ IF(NOT WIN32)
+-  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkipi.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkipi.pc)
++  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkipi.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkipi-kde4.pc)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/libkipi.lsm.cmake ${CMAKE_CURRENT_BINARY_DIR}/libkipi.lsm)
+-  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkipi.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
++  INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/libkipi-kde4.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig )
+ ENDIF(NOT WIN32)
+ INSTALL(FILES kipiplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR})
--- /dev/null
+++ graphics/kdegraphics4/files/patch-kamera-config-kamera.h
@@ -0,0 +1,11 @@
+--- ../kamera/config-kamera.h.cmake.orig	2008-02-10 12:38:09.000000000 +0100
++++ ../kamera/config-kamera.h.cmake	2008-02-10 12:38:35.000000000 +0100
+@@ -1,6 +1,6 @@
+ /* Define if we have va_copy */
+-/* #undef HAVE_VA_COPY */
++#define HAVE_VA_COPY
+ 
+ /* Define if we have __va_copy */
+-#define HAVE___VA_COPY 1
++/* #define HAVE___VA_COPY 1 */
+ 

From ctriv at midnightbsd.org  Sat Jan  3 22:20:49 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:20:49 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: kdegraphics4.
Message-ID: <200901040320.n043KnD9069951@stargazer.midnightbsd.org>

Log Message:
-----------
added: kdegraphics4.

Modified Files:
--------------
    mports/graphics:
        Makefile (r1.85 -> r1.86)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/graphics/Makefile,v
retrieving revision 1.85
retrieving revision 1.86
diff -L graphics/Makefile -L graphics/Makefile -u -r1.85 -r1.86
--- graphics/Makefile
+++ graphics/Makefile
@@ -39,6 +39,7 @@
     SUBDIR += jpeg
     SUBDIR += kamera
     SUBDIR += kdegraphics3
+    SUBDIR += kdegraphics4
     SUBDIR += kooka
     SUBDIR += kuickshow
     SUBDIR += lcms

From ctriv at midnightbsd.org  Sat Jan  3 22:28:39 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:28:39 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: security/libotr: Added libotr-3.2.0
Message-ID: <200901040328.n043SdRF070601@stargazer.midnightbsd.org>

Log Message:
-----------
Added libotr-3.2.0

Added Files:
-----------
    mports/security/libotr:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ security/libotr/pkg-descr
@@ -0,0 +1,4 @@
+This is the library and toolkit for Off-the-Record Messaging used by
+the pidgin-otr plugin.
+
+WWW: http://www.cypherpunks.ca/otr/
--- /dev/null
+++ security/libotr/pkg-plist
@@ -0,0 +1,27 @@
+bin/otr_mackey
+bin/otr_modify
+bin/otr_parse
+bin/otr_readforge
+bin/otr_remac
+bin/otr_sesskeys
+include/libotr/auth.h
+include/libotr/b64.h
+include/libotr/context.h
+include/libotr/dh.h
+include/libotr/mem.h
+include/libotr/message.h
+include/libotr/privkey.h
+include/libotr/privkey-t.h
+include/libotr/proto.h
+include/libotr/serial.h
+include/libotr/sm.h
+include/libotr/tlv.h
+include/libotr/userstate.h
+include/libotr/version.h
+lib/libotr.a
+lib/libotr.la
+lib/libotr.so
+lib/libotr.so.4
+libdata/pkgconfig/libotr.pc
+share/aclocal/libotr.m4
+ at dirrm include/libotr
--- /dev/null
+++ security/libotr/Makefile
@@ -0,0 +1,40 @@
+# ex:ts=8
+#
+# $MidnightBSD: mports/security/libotr/Makefile,v 1.1 2009/01/04 03:28:38 ctriv Exp $
+#
+
+PORTNAME=	libotr
+PORTVERSION=	3.2.0
+CATEGORIES=	security
+MASTER_SITES=	http://www.cypherpunks.ca/otr/ \
+		http://dougbarton.us/Downloads/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} ${DISTNAME}${EXTRACT_SUFX}.asc
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	The portable OTR Messaging Library and toolkit
+LICENSE=	gpl2
+
+LIB_DEPENDS=	gpg-error.0:${PORTSDIR}/security/libgpg-error \
+		gcrypt:${PORTSDIR}/security/libgcrypt
+
+USE_GNOME=	pkgconfig
+USE_AUTOTOOLS=	autoconf:262 libtool:15
+USE_LDCONFIG=	yes
+
+MAN1=		otr_toolkit.1
+MLINKS=		otr_toolkit.1 otr_parse.1 \
+		otr_toolkit.1 otr_sesskeys.1 \
+		otr_toolkit.1 otr_mackey.1 \
+		otr_toolkit.1 otr_readforge.1 \
+		otr_toolkit.1 otr_modify.1 \
+		otr_toolkit.1 otr_remac.1
+
+verify: checksum
+	gpg --verify ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}.asc
+
+post-patch:
+	@${REINPLACE_CMD} -e 's#^pkgconfigdir .*#pkgconfigdir = ${PREFIX}/libdata/pkgconfig#' \
+	    ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.am
+
+.include 
--- /dev/null
+++ security/libotr/distinfo
@@ -0,0 +1,6 @@
+MD5 (libotr-3.2.0.tar.gz) = faba02e60f64e492838929be2272f839
+SHA256 (libotr-3.2.0.tar.gz) = d83b9d20e36e2a4a55e5336f15d1d218d627bc0af7af94e3835bdc8b6d8b6693
+SIZE (libotr-3.2.0.tar.gz) = 430299
+MD5 (libotr-3.2.0.tar.gz.asc) = d2bf4eed45d75728b7c8f357d8846d78
+SHA256 (libotr-3.2.0.tar.gz.asc) = ac0cdb8ec410cf35c632aee2b0d9d75525a2d59361d3b23002f598e35ac79f65
+SIZE (libotr-3.2.0.tar.gz.asc) = 191

From ctriv at midnightbsd.org  Sat Jan  3 22:29:17 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:29:17 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add libotr
Message-ID: <200901040329.n043THsS070666@stargazer.midnightbsd.org>

Log Message:
-----------
add libotr

Modified Files:
--------------
    mports/security:
        Makefile (r1.84 -> r1.85)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/Makefile,v
retrieving revision 1.84
retrieving revision 1.85
diff -L security/Makefile -L security/Makefile -u -r1.84 -r1.85
--- security/Makefile
+++ security/Makefile
@@ -5,9 +5,9 @@
 
     SUBDIR += aide
     SUBDIR += ca-roots
-    SUBDIR += ca_root_nss   
+    SUBDIR += ca_root_nss
     SUBDIR += chroot_safe
-    SUBDIR += clamav 
+    SUBDIR += clamav
     SUBDIR += courier-authlib
     SUBDIR += courier-authlib-base
     SUBDIR += courierpassd
@@ -35,6 +35,7 @@
     SUBDIR += libksba
     SUBDIR += libmcrypt
     SUBDIR += libntlm
+    SUBDIR += libotr
     SUBDIR += libssh2
     SUBDIR += libtasn1
     SUBDIR += linux-openssl
@@ -77,11 +78,12 @@
     SUBDIR += qca-tls
     SUBDIR += saint
     SUBDIR += secpwgen
+    SUBDIR += smap
+    SUBDIR += snort
     SUBDIR += sshguard
+    SUBDIR += sshguard-ipfilter
     SUBDIR += sshguard-ipfw
     SUBDIR += sshguard-pf
-    SUBDIR += smap
-    SUBDIR += snort
     SUBDIR += sudo
     SUBDIR += tor
     SUBDIR += tripwire

From ctriv at midnightbsd.org  Sat Jan  3 22:38:47 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:38:47 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: net/libvncserver: Added libvncserver-0.9.1
Message-ID: <200901040338.n043clKm071680@stargazer.midnightbsd.org>

Log Message:
-----------
Added libvncserver-0.9.1

Added Files:
-----------
    mports/net/libvncserver:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ net/libvncserver/pkg-descr
@@ -0,0 +1,4 @@
+LibVNCServer is ripped out of Xvnc to provide an easy API to write one's own
+vnc server.
+
+WWW: http://libvncserver.sourceforge.net/
--- /dev/null
+++ net/libvncserver/pkg-plist
@@ -0,0 +1,18 @@
+bin/libvncserver-config
+include/rfb/default8x16.h
+include/rfb/keysym.h
+include/rfb/rfb.h
+include/rfb/rfbclient.h
+include/rfb/rfbconfig.h
+include/rfb/rfbint.h
+include/rfb/rfbproto.h
+include/rfb/rfbregion.h
+lib/libvncclient.a
+lib/libvncserver.a
+lib/libvncserver.so.0
+lib/libvncserver.so
+lib/libvncserver.la
+lib/libvncclient.so.0
+lib/libvncclient.so
+lib/libvncclient.la
+ at dirrm include/rfb
--- /dev/null
+++ net/libvncserver/Makefile
@@ -0,0 +1,35 @@
+# ex:ts=8
+#
+# $MidnightBSD: mports/net/libvncserver/Makefile,v 1.1 2009/01/04 03:38:47 ctriv Exp $
+#
+
+PORTNAME=	libvncserver
+PORTVERSION=	0.9.1
+CATEGORIES=	net devel
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	LibVNCServer-${PORTVERSION}
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Provide an easy API to write one's own vnc server
+LICENSE=	gpl2
+
+LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
+
+USE_GNOME=	gnometarget
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--without-x
+
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^SUBDIRS/s|x11vnc||g' ${WRKSRC}/Makefile.in
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/rfb/default8x16.h ${PREFIX}/include/rfb
+
+.include 
--- /dev/null
+++ net/libvncserver/distinfo
@@ -0,0 +1,3 @@
+MD5 (LibVNCServer-0.9.1.tar.gz) = aa00efc3dabde82fde9509bfbab0aba4
+SHA256 (LibVNCServer-0.9.1.tar.gz) = 0fbda7fc37c1f360bdbeb586e48d6203a5ef56a8cfc3b78887d7d90db683f282
+SIZE (LibVNCServer-0.9.1.tar.gz) = 1060476

From ctriv at midnightbsd.org  Sat Jan  3 22:40:05 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:40:05 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Add libvncserver
Message-ID: <200901040340.n043e5pg072031@stargazer.midnightbsd.org>

Log Message:
-----------
Add libvncserver

Modified Files:
--------------
    mports/net:
        Makefile (r1.92 -> r1.93)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/Makefile,v
retrieving revision 1.92
retrieving revision 1.93
diff -L net/Makefile -L net/Makefile -u -r1.92 -r1.93
--- net/Makefile
+++ net/Makefile
@@ -6,8 +6,8 @@
     SUBDIR += 44bsd-rdist
     SUBDIR += GeoIP
     SUBDIR += avahi
-    SUBDIR += avahi-autoipd
     SUBDIR += avahi-app
+    SUBDIR += avahi-autoipd
     SUBDIR += avahi-gtk
     SUBDIR += avahi-libdns
     SUBDIR += avahi-qt3
@@ -28,19 +28,20 @@
     SUBDIR += hping
     SUBDIR += htpdate
     SUBDIR += ilbc
+    SUBDIR += ipw-firmware
+    SUBDIR += iwi-firmware
     SUBDIR += jags
     SUBDIR += kdenetwork3
+    SUBDIR += ldap2dns
+    SUBDIR += ldapdiff
     SUBDIR += libdnet
+    SUBDIR += libgweather
     SUBDIR += libnet
     SUBDIR += libnet10
     SUBDIR += libpcap
-    SUBDIR += libgweather
+    SUBDIR += libvncserver
     SUBDIR += linc
     SUBDIR += liveMedia
-    SUBDIR += ipw-firmware
-    SUBDIR += iwi-firmware
-    SUBDIR += ldap2dns
-    SUBDIR += ldapdiff
     SUBDIR += mDNSResponder
     SUBDIR += netatalk
     SUBDIR += netcat
@@ -90,6 +91,7 @@
     SUBDIR += skype
     SUBDIR += tsocks
     SUBDIR += ulxmlrpcpp
+    SUBDIR += vino
     SUBDIR += vnc2swf
     SUBDIR += vncreflector
     SUBDIR += x11vnc
@@ -104,5 +106,4 @@
     SUBDIR += zniper
     SUBDIR += zsync
     SUBDIR += ztelnet
-    SUBDIR += vino
 .include 

From ctriv at midnightbsd.org  Sat Jan  3 22:43:37 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:43:37 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: security/qca-ossl: Added qca-ossl-2.0.0.b3
Message-ID: <200901040343.n043hbTb072283@stargazer.midnightbsd.org>

Log Message:
-----------
Added qca-ossl-2.0.0.b3

Added Files:
-----------
    mports/security/qca-ossl:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ security/qca-ossl/pkg-descr
@@ -0,0 +1,18 @@
+Taking a hint from the similarly-named Java Cryptography Architecture,
+QCA aims to provide a straightforward and cross-platform crypto
+API, using Qt datatypes and conventions. QCA separates the API from
+the implementation, using plugins known as Providers. The advantage
+of this model is to allow applications to avoid linking to or
+explicitly depending on any particular cryptographic library. This
+allows one to easily change or upgrade crypto implementations
+without even needing to recompile the application. QCA should work
+everywhere Qt does, including Windows/Unix/MacOSX.
+
+Capabilities:
+TLS, CMS, X.509, RSA, DSA, Diffie-Hellman, PKCS#7, PKCS#12, SHA0,
+SHA1, SHA224, SHA256, SHA384, SHA512, MD2, MD4, MD5, RIPEMD160,
+Blowfish, DES, 3DES, AES128, AES192, AES256, CAST5, HMAC(SHA1, MD5,
+RIPEMD160), PBKDF1(MD2, SHA1), PBKDF2(SHA1)
+
+
+WWW: http://delta.affinix.com/qca/
--- /dev/null
+++ security/qca-ossl/pkg-plist
@@ -0,0 +1,4 @@
+lib/qt4/plugins/crypto/libqca-ossl.so
+lib/qt4/plugins/crypto/libqca-ossl.so.debug
+ at dirrmtry %%QT_PLUGINDIR%%/crypto
+ at dirrmtry %%QT_PLUGINDIR%%
--- /dev/null
+++ security/qca-ossl/Makefile
@@ -0,0 +1,33 @@
+#
+# $MidnightBSD: mports/security/qca-ossl/Makefile,v 1.1 2009/01/04 03:43:37 ctriv Exp $
+
+PORTNAME=	qca-ossl
+DISTVERSION=	2.0.0-beta3
+CATEGORIES=	security
+MASTER_SITES=	http://delta.affinix.com/download/qca/2.0/plugins/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Cross-platform crypto API for QT
+LICENSE=	lgpl
+
+LIB_DEPENDS=	qca.2:${PORTSDIR}/devel/qca
+
+USE_BZIP2=	yes
+USE_QT_VER=	4
+USE_GNOME=	pkgconfig
+HAS_CONFIGURE=	yes
+QT_NONSTANDARD=	yes
+QT_COMPONENTS=	corelib qmake_build moc_build
+USE_OPENSSL=	yes
+
+CONFIGURE_ENV=	QMAKESPEC=${LOCALBASE}/share/qt4/mkspecs/freebsd-g++ \
+		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} \
+		PTHREAD_LDFLAGS=${PTHREAD_LIBS}
+CONFIGURE_ARGS=	--plugins-path=${PREFIX}/${QT_PLUGINDIR} --qtdir=${LOCALBASE} \
+		--with-qca=${LOCALBASE}
+
+QT_PLUGINDIR=	lib/qt4/plugins
+
+PLIST_SUB+=	QT_PLUGINDIR="${QT_PLUGINDIR}"
+
+.include 
--- /dev/null
+++ security/qca-ossl/distinfo
@@ -0,0 +1,3 @@
+MD5 (qca-ossl-2.0.0-beta3.tar.bz2) = bdc62c01321385c7da8d27b3902910ce
+SHA256 (qca-ossl-2.0.0-beta3.tar.bz2) = 08e09ff586b184d5fb53b88f0b48eed0a7bf0a5f210a9f97a76cf4cd5446c67b
+SIZE (qca-ossl-2.0.0-beta3.tar.bz2) = 49188

From ctriv at midnightbsd.org  Sat Jan  3 22:44:31 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 22:44:31 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: qca-ossl.
Message-ID: <200901040344.n043iVCM072375@stargazer.midnightbsd.org>

Log Message:
-----------
added: qca-ossl.

Modified Files:
--------------
    mports/security:
        Makefile (r1.85 -> r1.86)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/security/Makefile,v
retrieving revision 1.85
retrieving revision 1.86
diff -L security/Makefile -L security/Makefile -u -r1.85 -r1.86
--- security/Makefile
+++ security/Makefile
@@ -75,6 +75,7 @@
     SUBDIR += php5-mhash
     SUBDIR += php5-openssl
     SUBDIR += pinentry
+    SUBDIR += qca-ossl
     SUBDIR += qca-tls
     SUBDIR += saint
     SUBDIR += secpwgen

From laffer1 at midnightbsd.org  Sat Jan  3 23:01:46 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 23:01:46 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: MidnightBSD current requires
	compat6x for this port
Message-ID: <200901040401.n0441kvr074226@stargazer.midnightbsd.org>

Log Message:
-----------
MidnightBSD current requires compat6x for this port

Modified Files:
--------------
    mports/java/diablo-jdk15:
        Makefile (r1.8 -> r1.9)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jdk15/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L java/diablo-jdk15/Makefile -L java/diablo-jdk15/Makefile -u -r1.8 -r1.9
--- java/diablo-jdk15/Makefile
+++ java/diablo-jdk15/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	jdk
 PORTVERSION=	${JDK_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -53,6 +53,9 @@
 .include 
 
 JDK_OSREL=freebsd6
+.if ${OSVERSION} >= 3000
+LIB_DEPENDS=  z.3:${PORTSDIR}/misc/compat6x
+.endif
 
 .if !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip

From laffer1 at midnightbsd.org  Sat Jan  3 23:07:51 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sat, 3 Jan 2009 23:07:51 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: java/diablo-jdk15: update time zone
	updater
Message-ID: <200901040407.n0447pqY074752@stargazer.midnightbsd.org>

Log Message:
-----------
update time zone updater

Modified Files:
--------------
    mports/java/diablo-jdk15:
        Makefile (r1.9 -> r1.10)
        distinfo (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jdk15/Makefile,v
retrieving revision 1.9
retrieving revision 1.10
diff -L java/diablo-jdk15/Makefile -L java/diablo-jdk15/Makefile -u -r1.9 -r1.10
--- java/diablo-jdk15/Makefile
+++ java/diablo-jdk15/Makefile
@@ -59,8 +59,8 @@
 
 .if !defined(WITHOUT_TZUPDATE)
 EXTRACT_DEPENDS+=	unzip:${PORTSDIR}/archivers/unzip
-TZUPDATE_VERSION=	1.3.3
-TZUPDATE_TZVERSION=	2007k
+TZUPDATE_VERSION=	1_3_11
+TZUPDATE_TZVERSION=	2008i
 TZUPDATEFILE=		tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}.zip
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} ${TZUPDATEFILE}
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
@@ -107,7 +107,7 @@
 	@${UNZIP_CMD} -qo ${DISTDIR}/${TZUPDATEFILE} -d ${WRKDIR}
 	@# Update time zones
 	@-${WRKSRC}/bin/java -jar \
-		${WRKDIR}/tzupdater-${TZUPDATE_VERSION}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
+		${WRKDIR}/tzupdater-${TZUPDATE_VERSION:S/_/./g}-${TZUPDATE_TZVERSION}/tzupdater.jar -u -bc
 	@-${RM} -rf ${WRKSRC}/jre/lib/zi.tzdata*
 .endif
 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/java/diablo-jdk15/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -L java/diablo-jdk15/distinfo -L java/diablo-jdk15/distinfo -u -r1.5 -r1.6
--- java/diablo-jdk15/distinfo
+++ java/diablo-jdk15/distinfo
@@ -4,6 +4,6 @@
 MD5 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 611e29db0b841d8c1cd170582946a666
 SHA256 (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = b7e010658271bebadaa9ea1f410d7af27fcbc0f864a69feea5cd60c6683aa4c9
 SIZE (diablo-caffe-freebsd6-i386-1.5.0_07-b01.tar.bz2) = 54347274
-MD5 (tzupdater-1.3.3-2007k.zip) = beeab3fe5cad31b993197d6e74bacb90
-SHA256 (tzupdater-1.3.3-2007k.zip) = 056d3cb5ff8becb9d37ff0fec0da10fe881f42cc1eedbda3b39f5e2e7c6a8062
-SIZE (tzupdater-1.3.3-2007k.zip) = 263715
+MD5 (tzupdater-1_3_11-2008i.zip) = 4bb928818a5d81be3ac3edf90b33ee36
+SHA256 (tzupdater-1_3_11-2008i.zip) = 69bebfa219bcaffa68cee999e0df76e6730902779f3123a4b41726d33c9b5f9d
+SIZE (tzupdater-1_3_11-2008i.zip) = 262340

From ctriv at midnightbsd.org  Sat Jan  3 23:30:18 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 23:30:18 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: sqlite.mk: Make USE_SQLITE a no op when
	OSVERSION is 0.2.x or
Message-ID: <200901040430.n044UIwZ076906@stargazer.midnightbsd.org>

Log Message:
-----------
Make USE_SQLITE a no op when OSVERSION is 0.2.x or greater.

Modified Files:
--------------
    mports/Mk/extensions:
        sqlite.mk (r1.1 -> r1.2)

-------------- next part --------------
Index: sqlite.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/sqlite.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Mk/extensions/sqlite.mk -L Mk/extensions/sqlite.mk -u -r1.1 -r1.2
--- Mk/extensions/sqlite.mk
+++ Mk/extensions/sqlite.mk
@@ -22,15 +22,18 @@
 _SQLITE_VER=	 ${USE_SQLITE}
 .endif
 
+
+.if ${OSVERSION} < 2000
 # USE_SQLITE is specified incorrectly, so mark this as IGNORE
-.if ${_SQLITE_VER} == "3"
+.	if ${_SQLITE_VER} == "3"
 LIB_DEPENDS+=	sqlite${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
 SQLITE_VER=	${_SQLITE_VER}
-.elif ${_SQLITE_VER} == "2"
+.	elif ${_SQLITE_VER} == "2"
 LIB_DEPENDS+=	sqlite.${_SQLITE_VER}:${PORTSDIR}/databases/sqlite${_SQLITE_VER}
 SQLITE_VER=	${_SQLITE_VER}
-.else
+.	else
 IGNORE=	cannot install: unknown sqlite version: ${_SQLITE_VER}
+.	endif
 .endif
 
 .endif # defined(_POSTMKINCLUDED) && !defined(Sqlite_Post_Include)

From ctriv at midnightbsd.org  Sat Jan  3 23:31:19 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 23:31:19 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: net/kdenetwork4: Added kdenetwork-4.1.3
Message-ID: <200901040431.n044VJpt077028@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdenetwork-4.1.3

Added Files:
-----------
    mports/net/kdenetwork4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ net/kdenetwork4/pkg-descr
@@ -0,0 +1 @@
+Network tools for KDE4.
--- /dev/null
+++ net/kdenetwork4/pkg-plist
@@ -0,0 +1,1618 @@
+bin/kget
+bin/kopete
+bin/kopete_latexconvert.sh
+bin/kppp
+bin/kppplogview
+bin/krdc
+bin/krfb
+bin/winpopup-install.sh
+bin/winpopup-send.sh
+include/kopete/kabcpersistence.h
+include/kopete/kopete_export.h
+include/kopete/kopeteaccount.h
+include/kopete/kopeteaccountmanager.h
+include/kopete/kopeteappearancesettings.h
+include/kopete/kopeteavatarmanager.h
+include/kopete/kopetebehaviorsettings.h
+include/kopete/kopeteblacklister.h
+include/kopete/kopetechatsession.h
+include/kopete/kopetechatsessionmanager.h
+include/kopete/kopetecommand.h
+include/kopete/kopetecommandhandler.h
+include/kopete/kopetecontact.h
+include/kopete/kopetecontactlist.h
+include/kopete/kopetecontactlistelement.h
+include/kopete/kopetecontacttaskbase.h
+include/kopete/kopetedeletecontacttask.h
+include/kopete/kopeteglobal.h
+include/kopete/kopetegroup.h
+include/kopete/kopeteidentity.h
+include/kopete/kopeteidentitymanager.h
+include/kopete/kopetemessage.h
+include/kopete/kopetemessageevent.h
+include/kopete/kopetemessagehandler.h
+include/kopete/kopetemessagehandlerchain.h
+include/kopete/kopetemetacontact.h
+include/kopete/kopetemimetypehandler.h
+include/kopete/kopeteonlinestatus.h
+include/kopete/kopeteonlinestatusmanager.h
+include/kopete/kopetepassword.h
+include/kopete/kopetepasswordedaccount.h
+include/kopete/kopetepicture.h
+include/kopete/kopeteplugin.h
+include/kopete/kopetepluginmanager.h
+include/kopete/kopeteproperty.h
+include/kopete/kopetepropertycontainer.h
+include/kopete/kopeteprotocol.h
+include/kopete/kopetesimplemessagehandler.h
+include/kopete/kopetestatusmanager.h
+include/kopete/kopetestatusmessage.h
+include/kopete/kopetestatussettings.h
+include/kopete/kopetetask.h
+include/kopete/kopetetransfermanager.h
+include/kopete/kopeteuiglobal.h
+include/kopete/kopeteversion.h
+include/kopete/ui/accountselector.h
+include/kopete/ui/addcontactpage.h
+include/kopete/ui/addressbookselectordialog.h
+include/kopete/ui/addressbookselectorwidget.h
+include/kopete/ui/avatardialog.h
+include/kopete/ui/avatarselectorwidget.h
+include/kopete/ui/editaccountwidget.h
+include/kopete/ui/kopetecontactaction.h
+include/kopete/ui/kopetefileconfirmdialog.h
+include/kopete/ui/kopeteinfodialog.h
+include/kopete/ui/kopetelistview.h
+include/kopete/ui/kopetelistviewitem.h
+include/kopete/ui/kopetelistviewsearchline.h
+include/kopete/ui/kopetepasswordwidget.h
+include/kopete/ui/kopetestdaction.h
+include/kopete/ui/kopeteview.h
+include/kopete/ui/kopeteviewplugin.h
+include/kopete/ui/ui_fileconfirmbase.h
+include/kopete/ui/ui_kopeteawaydialogbase.h
+include/kopete/ui/ui_kopetepasswordwidgetbase.h
+lib/kde4/fileshare_propsdlgplugin.so
+lib/kde4/kcm_fileshare.so
+lib/kde4/kcm_kcmsambaconf.so
+lib/kde4/kcm_kopete_accountconfig.so
+lib/kde4/kcm_kopete_addbookmarks.so
+lib/kde4/kcm_kopete_alias.so
+lib/kde4/kcm_kopete_appearanceconfig.so
+lib/kde4/kcm_kopete_autoreplace.so
+lib/kde4/kcm_kopete_avdeviceconfig.so
+lib/kde4/kcm_kopete_behaviorconfig.so
+lib/kde4/kcm_kopete_chatwindowconfig.so
+lib/kde4/kcm_kopete_highlight.so
+lib/kde4/kcm_kopete_history.so
+lib/kde4/kcm_kopete_latex.so
+lib/kde4/kcm_kopete_nowlistening.so
+lib/kde4/kcm_kopete_pipes.so
+lib/kde4/kcm_kopete_pluginconfig.so
+lib/kde4/kcm_kopete_privacy.so
+lib/kde4/kcm_kopete_statusconfig.so
+lib/kde4/kcm_kopete_texteffect.so
+lib/kde4/kcm_kopete_translator.so
+lib/kde4/kcm_kopete_urlpicpreview.so
+lib/kde4/kcm_kopete_webpresence.so
+lib/kde4/kded_dnssdwatcher.so
+lib/kde4/kget_bittorrentfactory.so
+lib/kde4/kget_kiofactory.so
+lib/kde4/kget_metalinkfactory.so
+lib/kde4/kget_mirrorsearchfactory.so
+lib/kde4/kget_multisegkiofactory.so
+lib/kde4/khtml_kget.so
+lib/kde4/kio_zeroconf.so
+lib/kde4/kopete_addbookmarks.so
+lib/kde4/kopete_aim.so
+lib/kde4/kopete_alias.so
+lib/kde4/kopete_autoreplace.so
+lib/kde4/kopete_chatwindow.so
+lib/kde4/kopete_contactnotes.so
+lib/kde4/kopete_emailwindow.so
+lib/kde4/kopete_gadu.so
+lib/kde4/kopete_highlight.so
+lib/kde4/kopete_history.so
+lib/kde4/kopete_icq.so
+lib/kde4/kopete_latex.so
+lib/kde4/kopete_msn.so
+lib/kde4/kopete_nowlistening.so
+lib/kde4/kopete_pipes.so
+lib/kde4/kopete_privacy.so
+lib/kde4/kopete_qq.so
+lib/kde4/kopete_sms.so
+lib/kde4/kopete_statistics.so
+lib/kde4/kopete_testbed.so
+lib/kde4/kopete_texteffect.so
+lib/kde4/kopete_translator.so
+lib/kde4/kopete_urlpicpreview.so
+lib/kde4/kopete_webpresence.so
+lib/kde4/kopete_wp.so
+lib/kde4/kopete_yahoo.so
+lib/kde4/libkrichtexteditpart.so
+lib/kde4/plasma_applet_kget.so
+lib/kde4/plasma_applet_knewsticker.so
+lib/kde4/plasma_engine_kget.so
+lib/kde4/kopete_jabber.so
+lib/kde4/kopete_groupwise.so
+lib/kde4/kopete_otr.so
+lib/kde4/kcm_kopete_otr.so
+lib/libiris_kopete.so.1.0.0
+lib/libiris_kopete.so.1
+lib/libiris_kopete.so
+lib/libqgroupwise.so
+lib/libkopete_otr_shared.so.1.0.0
+lib/libkopete_otr_shared.so.1
+lib/libkopete_otr_shared.so
+lib/libgadu_kopete.so
+lib/libgadu_kopete.so.1
+lib/libgadu_kopete.so.1.0.0
+lib/libkgetcore.so
+lib/libkgetcore.so.5
+lib/libkgetcore.so.5.0.0
+lib/libkopete.so
+lib/libkopete.so.5
+lib/libkopete.so.5.0.0
+lib/libkopete_msn_shared.so
+lib/libkopete_msn_shared.so.5
+lib/libkopete_msn_shared.so.5.0.0
+lib/libkopete_oscar.so
+lib/libkopete_oscar.so.5
+lib/libkopete_oscar.so.5.0.0
+lib/libkopete_videodevice.so
+lib/libkopete_videodevice.so.5
+lib/libkopete_videodevice.so.5.0.0
+lib/libkopeteaddaccountwizard.so
+lib/libkopeteaddaccountwizard.so.1
+lib/libkopeteaddaccountwizard.so.1.0.0
+lib/libkopetechatwindow_shared.so
+lib/libkopetechatwindow_shared.so.1
+lib/libkopetechatwindow_shared.so.1.0.0
+lib/libkopeteidentity.so
+lib/libkopeteidentity.so.1
+lib/libkopeteidentity.so.1.0.0
+lib/libkopeteprivacy.so
+lib/libkopeteprivacy.so.1
+lib/libkopeteprivacy.so.1.0.0
+lib/libkopetestatusmenu.so
+lib/libkopetestatusmenu.so.1
+lib/libkopetestatusmenu.so.1.0.0
+lib/libkyahoo.so
+lib/libkyahoo.so.1
+lib/libkyahoo.so.1.0.0
+lib/liboscar.so
+lib/liboscar.so.1
+lib/liboscar.so.1.0.0
+share/applications/kde4/Kppp.desktop
+share/applications/kde4/kget.desktop
+share/applications/kde4/kopete.desktop
+share/applications/kde4/kppplogview.desktop
+share/applications/kde4/krdc.desktop
+share/applications/kde4/krfb.desktop
+share/apps/desktoptheme/default/widgets/kget.svg
+share/apps/kconf_update/kopete-account-0.10.pl
+share/apps/kconf_update/kopete-account-kconf_update.sh
+share/apps/kconf_update/kopete-account-kconf_update.upd
+share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.sh
+share/apps/kconf_update/kopete-jabberpriorityaddition-kconf_update.upd
+share/apps/kconf_update/kopete-jabberproxytype-kconf_update.sh
+share/apps/kconf_update/kopete-jabberproxytype-kconf_update.upd
+share/apps/kconf_update/kopete-nameTracking.upd
+share/apps/kconf_update/kopete-pluginloader.pl
+share/apps/kconf_update/kopete-pluginloader.upd
+share/apps/kconf_update/kopete-pluginloader2.sh
+share/apps/kconf_update/kopete-pluginloader2.upd
+share/apps/kget/kget.notifyrc
+share/apps/kget/kgetui.rc
+share/apps/kget/pics/kget_splash.png
+share/apps/kget/www/blank.gif
+share/apps/kget/www/favicon.ico
+share/apps/kget/www/header-background.png
+share/apps/kget/www/header-separator.png
+share/apps/kget/www/hi64-apps-kget.png
+share/apps/kget/www/iepngfix.htc
+share/apps/kget/www/index.htm
+share/apps/kget/www/mootools-core-yc.js
+share/apps/kget/www/mootools-more.js
+share/apps/kget/www/new-download-background.png
+share/apps/kget/www/preferences-system.png
+share/apps/kget/www/title-border-bottom-downloads.png
+share/apps/kget/www/title-border-bottom-settings.png
+share/apps/kget/www/view-refresh.png
+share/apps/khtml/kpartplugins/kget_plug_in.rc
+share/apps/kopete/icons/crystalsvg/16x16/actions/aim_connecting.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/gg_con.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/icq_connecting.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/msn_connecting.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/qq_connecting.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/yahoo_connecting.mng
+share/apps/kopete/icons/crystalsvg/22x22/actions/qq_connecting.mng
+share/apps/kopete/icons/crystalsvg/32x32/actions/qq_connecting.mng
+share/apps/kopete/icons/crystalsvg/48x48/actions/qq_connecting.mng
+share/apps/kopete/icons/crystalsvg/64x64/actions/qq_connecting.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/jabber_connecting.mng
+share/apps/kopete/icons/crystalsvg/16x16/actions/groupwise_connecting.mng
+share/apps/kopete/icons/hicolor/16x16/actions/jabber_connecting.mng
+share/apps/kopete/icons/hicolor/16x16/actions/aim_away.png
+share/apps/kopete/icons/hicolor/16x16/actions/aim_connecting.mng
+share/apps/kopete/icons/hicolor/16x16/actions/aim_offline.png
+share/apps/kopete/icons/hicolor/16x16/actions/aim_online.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_away.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_connecting.mng
+share/apps/kopete/icons/hicolor/16x16/actions/icq_dnd.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_ffc.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_invisible.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_na.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_occupied.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_offline.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_online.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus0.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus1.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus10.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus11.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus12.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus13.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus14.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus15.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus16.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus17.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus18.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus19.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus2.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus20.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus21.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus22.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus23.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus24.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus25.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus26.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus27.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus28.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus29.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus3.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus30.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus31.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus4.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus5.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus6.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus7.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus8.png
+share/apps/kopete/icons/hicolor/16x16/actions/icq_xstatus9.png
+share/apps/kopete/icons/hicolor/16x16/apps/aim_protocol.png
+share/apps/kopete/icons/hicolor/16x16/apps/icq_protocol.png
+share/apps/kopete/icons/hicolor/32x32/apps/aim_protocol.png
+share/apps/kopete/icons/hicolor/32x32/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/kopete_avdevice.png
+share/apps/kopete/icons/oxygen/128x128/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/sms_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/testbed_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/wp_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/jabber_protocol.png
+share/apps/kopete/icons/oxygen/128x128/apps/yahoo_protocol.png
+share/apps/kopete/icons/oxygen/16x16/actions/aim_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/aim_offline.png
+share/apps/kopete/icons/oxygen/16x16/actions/aim_online.png
+share/apps/kopete/icons/oxygen/16x16/actions/aim_overlay.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_busy.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_busy_d.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_connecting.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_ignored.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_invi.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_invi_d.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_offline.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_offline_d.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_online.png
+share/apps/kopete/icons/oxygen/16x16/actions/gg_online_d.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_dnd.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_ffc.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_invisible.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_na.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_occupied.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_offline.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_online.png
+share/apps/kopete/icons/oxygen/16x16/actions/icq_overlay.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_blocked.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_brb.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_busy.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_invisible.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_lunch.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_na.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_newmsg.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_offline.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_online.png
+share/apps/kopete/icons/oxygen/16x16/actions/msn_phone.png
+share/apps/kopete/icons/oxygen/16x16/actions/wp_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/yahoo_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/yahoo_busy.png
+share/apps/kopete/icons/oxygen/16x16/actions/yahoo_idle.png
+share/apps/kopete/icons/oxygen/16x16/actions/yahoo_invisible.png
+share/apps/kopete/icons/oxygen/16x16/actions/yahoo_mobile.png
+share/apps/kopete/icons/oxygen/16x16/actions/yahoo_stealthed.png
+share/apps/kopete/icons/oxygen/16x16/actions/yahoo_tea.png
+share/apps/kopete/icons/oxygen/16x16/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/gadu_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/sms_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/testbed_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/wp_protocol.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_group.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_serv_off.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_offline.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_xa.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_na.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_original.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_online.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_serv_on.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_away.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_raw.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_chatty.png
+share/apps/kopete/icons/oxygen/16x16/actions/jabber_invisible.png
+share/apps/kopete/icons/oxygen/16x16/actions/groupwise_busy.png
+share/apps/kopete/icons/oxygen/16x16/actions/logging.png
+share/apps/kopete/icons/oxygen/16x16/actions/groupwise_online.png
+share/apps/kopete/icons/oxygen/16x16/actions/groupwise_invisible.png
+share/apps/kopete/icons/oxygen/16x16/actions/groupwise_away.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_http-ws.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_smtp.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_yahoo.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_aim.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_sms.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_tlen.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_gadu.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_msn.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_qq.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_icq.png
+share/apps/kopete/icons/oxygen/16x16/apps/jabber_gateway_irc.png
+share/apps/kopete/icons/oxygen/16x16/apps/groupwise_protocol.png
+share/apps/kopete/icons/oxygen/16x16/apps/yahoo_protocol.png
+share/apps/kopete/icons/oxygen/22x22/actions/yahoo_stealthed.png
+share/apps/kopete/icons/oxygen/32x32/apps/jabber_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/groupwise_protocol.png
+share/apps/kopete/icons/oxygen/32x32/actions/logging.png
+share/apps/kopete/icons/oxygen/22x22/apps/jabber_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/groupwise_protocol.png
+share/apps/kopete/icons/oxygen/22x22/actions/logging.png
+share/apps/kopete/icons/oxygen/22x22/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/kopete_avdevice.png
+share/apps/kopete/icons/oxygen/22x22/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/22x22/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/32x32/actions/yahoo_stealthed.png
+share/apps/kopete/icons/oxygen/32x32/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/gadu_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/kopete_avdevice.png
+share/apps/kopete/icons/oxygen/32x32/apps/latex.png
+share/apps/kopete/icons/oxygen/32x32/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/preferences-plugin-text-effect-kopete.png
+share/apps/kopete/icons/oxygen/32x32/apps/preferences-text-autocorrection-kopete.png
+share/apps/kopete/icons/oxygen/32x32/apps/preferences-text-highlighting-kopete.png
+share/apps/kopete/icons/oxygen/32x32/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/jabber_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/groupwise_protocol.png
+share/apps/kopete/icons/oxygen/64x64/actions/logging.png
+share/apps/kopete/icons/oxygen/32x32/apps/sms_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/testbed_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/wp_protocol.png
+share/apps/kopete/icons/oxygen/32x32/apps/yahoo_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/sms_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/testbed_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/wp_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/yahoo_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/jabber_protocol.png
+share/apps/kopete/icons/oxygen/48x48/apps/groupwise_protocol.png
+share/apps/kopete/icons/oxygen/48x48/actions/logging.png
+share/apps/kopete/icons/oxygen/64x64/apps/aim_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/icq_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/kopete_avdevice.png
+share/apps/kopete/icons/oxygen/64x64/apps/msn_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/qq_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/sms_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/testbed_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/wp_protocol.png
+share/apps/kopete/icons/oxygen/64x64/apps/yahoo_protocol.png
+share/apps/kopete/kopete.notifyrc
+share/apps/kopete/kopetechatwindow.rc
+share/apps/kopete/kopetecommandui.rc
+share/apps/kopete/kopeteemailwindow.rc
+share/apps/kopete/kopeteui.rc
+share/apps/kopete/nowlisteningchatui.rc
+share/apps/kopete/nowlisteningui.rc
+share/apps/kopete/styles/Clean/Contents/Resources/Footer.html
+share/apps/kopete/styles/Clean/Contents/Resources/Header.html
+share/apps/kopete/styles/Clean/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Clean/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Clean/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Clean/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Clean/Contents/Resources/Status.html
+share/apps/kopete/styles/Clean/Contents/Resources/images/action.png
+share/apps/kopete/styles/Clean/Contents/Resources/images/important.png
+share/apps/kopete/styles/Clean/Contents/Resources/images/internal.png
+share/apps/kopete/styles/Clean/Contents/Resources/main.css
+share/apps/kopete/styles/Clear/Contents/Resources/Footer.html
+share/apps/kopete/styles/Clear/Contents/Resources/Header.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Clear/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Clear/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Clear/Contents/Resources/Status.html
+share/apps/kopete/styles/Clear/Contents/Resources/Variants/No_avatars.css
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-arrow.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-avatar.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-inbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-arrow.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-avatar.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/body-outbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-inbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/footer-outbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-inbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-background.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-left.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/header-outbound-right.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-action.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-highlighted.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-internal.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-me.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-time.png
+share/apps/kopete/styles/Clear/Contents/Resources/images/icon-you.png
+share/apps/kopete/styles/Clear/Contents/Resources/main.css
+share/apps/kopete/styles/Gaim/Contents/Info.plist
+share/apps/kopete/styles/Gaim/Contents/Resources/Footer.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Header.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Status.html
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Contact-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Name-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/No-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/Variants/Status-Colors.css
+share/apps/kopete/styles/Gaim/Contents/Resources/main.css
+share/apps/kopete/styles/Hacker/COPYRIGHT
+share/apps/kopete/styles/Hacker/Contents/Info.plist
+share/apps/kopete/styles/Hacker/Contents/Resources/Footer.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Header.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/Context.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/NextContext.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/Context.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/NextContext.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Hacker/Contents/Resources/Status.html
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark2-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Dark2.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light2-Noback.css
+share/apps/kopete/styles/Hacker/Contents/Resources/Variants/Light2.css
+share/apps/kopete/styles/Hacker/Contents/Resources/images/background.png
+share/apps/kopete/styles/Hacker/Contents/Resources/images/background2.png
+share/apps/kopete/styles/Hacker/Contents/Resources/images/kopete.png
+share/apps/kopete/styles/Hacker/Contents/Resources/main.css
+share/apps/kopete/styles/Hacker/README
+share/apps/kopete/styles/Hacker/gpl.txt
+share/apps/kopete/styles/Konqi/Contents/Resources/Footer.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Header.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Status.html
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_moon.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_moon_without_transparency.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_blue_without_transparency.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green_without_trans.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/Side_green_without_transparency.css
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre1.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre2.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre3.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre4.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre5.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/cadre6.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-blue.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-green.png
+share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui/konqui-moon.jpg
+share/apps/kopete/styles/Konqi/Contents/Resources/main.css
+share/apps/kopete/styles/Konqi/Contents/Resources/puce.png
+share/apps/kopete/styles/Kopete/Contents/Resources/Footer.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Header.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Incoming/buddy_icon.png
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing/buddy_icon.png
+share/apps/kopete/styles/Kopete/Contents/Resources/Status.html
+share/apps/kopete/styles/Kopete/Contents/Resources/Variants/Big_pictures.css
+share/apps/kopete/styles/Kopete/Contents/Resources/Variants/Contact_color.css
+share/apps/kopete/styles/Kopete/Contents/Resources/Variants/_compact_.css
+share/apps/kopete/styles/Kopete/Contents/Resources/Variants/_compact_Contact_color.css
+share/apps/kopete/styles/Kopete/Contents/Resources/images/action.png
+share/apps/kopete/styles/Kopete/Contents/Resources/images/important.png
+share/apps/kopete/styles/Kopete/Contents/Resources/images/system.png
+share/apps/kopete/styles/Kopete/Contents/Resources/main.css
+share/apps/kopete/styles/Retropete/Contents/Resources/Footer.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Header.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/Action.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/Content.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Incoming/NextContent.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Action.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/Content.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing/NextContent.html
+share/apps/kopete/styles/Retropete/Contents/Resources/Status.html
+share/apps/kopete/styles/Retropete/Contents/Resources/main.css
+share/apps/kopete/webpresence/webpresence_html.xsl
+share/apps/kopete/webpresence/webpresence_html_images.xsl
+share/apps/kopete/webpresence/webpresence_xhtml.xsl
+share/apps/kopete/webpresence/webpresence_xhtml_images.xsl
+share/apps/kopete_contactnotes/contactnotesui.rc
+share/apps/kopete_history/historychatui.rc
+share/apps/kopete_history/historyui.rc
+share/apps/kopete_latex/latexchatui.rc
+share/apps/kopete_jabber/jabberchatui.rc
+share/apps/kopete_groupwise/gwchatui.rc
+share/apps/kopete_otr/otrchatui.rc
+share/apps/kopete_otr/otrui.rc
+share/config.kcfg/kopete_otr.kcfg
+share/apps/kopete_msn/msnchatui.rc
+share/apps/kopete_privacy/privacychatui.rc
+share/apps/kopete_privacy/privacyui.rc
+share/apps/kopete_statistics/statisticsui.rc
+share/apps/kopete_translator/translatorchatui.rc
+share/apps/kopete_translator/translatorui.rc
+share/apps/kopete_yahoo/yahoochatui.rc
+share/apps/kopete_yahoo/yahooconferenceui.rc
+share/apps/kopete_yahoo/yahooimui.rc
+share/apps/kopeterichtexteditpart/kopeterichtexteditpartfull.rc
+share/apps/kppp/Provider/Austria/.directory
+share/apps/kppp/Provider/Austria/Simon%032Media
+share/apps/kppp/Provider/Belarus/.directory
+share/apps/kppp/Provider/Belarus/AtlantTelecom
+share/apps/kppp/Provider/Czech_Republic/.directory
+share/apps/kppp/Provider/Czech_Republic/AICOM
+share/apps/kppp/Provider/Czech_Republic/ARsystem
+share/apps/kppp/Provider/Czech_Republic/ASYS
+share/apps/kppp/Provider/Czech_Republic/ApexNet
+share/apps/kppp/Provider/Czech_Republic/BohemiaNet
+share/apps/kppp/Provider/Czech_Republic/Brailcom
+share/apps/kppp/Provider/Czech_Republic/CITYNET
+share/apps/kppp/Provider/Czech_Republic/Contactel
+share/apps/kppp/Provider/Czech_Republic/ES-servis
+share/apps/kppp/Provider/Czech_Republic/Econnect
+share/apps/kppp/Provider/Czech_Republic/Falco_computer
+share/apps/kppp/Provider/Czech_Republic/Fortech
+share/apps/kppp/Provider/Czech_Republic/HP-NET
+share/apps/kppp/Provider/Czech_Republic/INTERNET_OnLine
+share/apps/kppp/Provider/Czech_Republic/INTERNEXT
+share/apps/kppp/Provider/Czech_Republic/IQNET
+share/apps/kppp/Provider/Czech_Republic/KPNQuest
+share/apps/kppp/Provider/Czech_Republic/M-soft
+share/apps/kppp/Provider/Czech_Republic/Nextra
+share/apps/kppp/Provider/Czech_Republic/ProfiNet
+share/apps/kppp/Provider/Czech_Republic/SeverNET
+share/apps/kppp/Provider/Czech_Republic/Video_OnLine
+share/apps/kppp/Provider/Czech_Republic/Volny
+share/apps/kppp/Provider/Denmark/.directory
+share/apps/kppp/Provider/Denmark/Get2Net
+share/apps/kppp/Provider/France/.directory
+share/apps/kppp/Provider/France/ClubInternetFull
+share/apps/kppp/Provider/Germany/.directory
+share/apps/kppp/Provider/Germany/CityWeb
+share/apps/kppp/Provider/Germany/FH%032Rhein%032Sieg%032%040Informatik%041
+share/apps/kppp/Provider/Germany/MUC%046DE
+share/apps/kppp/Provider/Germany/Netsurf
+share/apps/kppp/Provider/Irland/.directory
+share/apps/kppp/Provider/Irland/Eircom
+share/apps/kppp/Provider/Irland/IOL
+share/apps/kppp/Provider/Netherlands/.directory
+share/apps/kppp/Provider/Netherlands/12Move
+share/apps/kppp/Provider/Netherlands/Bart
+share/apps/kppp/Provider/Netherlands/Betuwenet%032BFree
+share/apps/kppp/Provider/Netherlands/Betuwenet%032BQuality
+share/apps/kppp/Provider/Netherlands/Cistron
+share/apps/kppp/Provider/Netherlands/Concepts%032ICT
+share/apps/kppp/Provider/Netherlands/Cubic%032Circle
+share/apps/kppp/Provider/Netherlands/Dataweb
+share/apps/kppp/Provider/Netherlands/Daxis%032Internet
+share/apps/kppp/Provider/Netherlands/Demon%032Internet
+share/apps/kppp/Provider/Netherlands/Energis-Ision
+share/apps/kppp/Provider/Netherlands/Euronet%032anytime
+share/apps/kppp/Provider/Netherlands/Euronet%032professional
+share/apps/kppp/Provider/Netherlands/FlakkeeNet
+share/apps/kppp/Provider/Netherlands/FreeAcces
+share/apps/kppp/Provider/Netherlands/Freeler%032basis
+share/apps/kppp/Provider/Netherlands/Freeler%032compleet
+share/apps/kppp/Provider/Netherlands/Freeler%032voordelig
+share/apps/kppp/Provider/Netherlands/HCC%032NET
+share/apps/kppp/Provider/Netherlands/Hacom
+share/apps/kppp/Provider/Netherlands/HetNet%032Basis%032Surfen
+share/apps/kppp/Provider/Netherlands/HetNet%032Frequent%032Surfen
+share/apps/kppp/Provider/Netherlands/HetNet%032Regelmatig%032Surfen
+share/apps/kppp/Provider/Netherlands/IAE
+share/apps/kppp/Provider/Netherlands/ILimburg
+share/apps/kppp/Provider/Netherlands/InterNLnet
+share/apps/kppp/Provider/Netherlands/Interbox
+share/apps/kppp/Provider/Netherlands/Internet%032Acces%032Facilities
+share/apps/kppp/Provider/Netherlands/Internet%032Online
+share/apps/kppp/Provider/Netherlands/Interstroom
+share/apps/kppp/Provider/Netherlands/IntroWeb%032Hengelo%032EO
+share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0323-cijferig%032kengetal
+share/apps/kppp/Provider/Netherlands/IntroWeb%032met%0324-cijferig%032kengetal
+share/apps/kppp/Provider/Netherlands/Kabelfoon
+share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0323%032cijferig%032kengetal
+share/apps/kppp/Provider/Netherlands/KeyAcces%032met%0324%032cijferig%032kengetal
+share/apps/kppp/Provider/Netherlands/Luna
+share/apps/kppp/Provider/Netherlands/Macom
+share/apps/kppp/Provider/Netherlands/Nederland.net
+share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Premium
+share/apps/kppp/Provider/Netherlands/Planet%032Internet%032Standaard
+share/apps/kppp/Provider/Netherlands/Plant%032Acces
+share/apps/kppp/Provider/Netherlands/Popin
+share/apps/kppp/Provider/Netherlands/PublishNet
+share/apps/kppp/Provider/Netherlands/Raketnet
+share/apps/kppp/Provider/Netherlands/Solcon
+share/apps/kppp/Provider/Netherlands/Support%032Net
+share/apps/kppp/Provider/Netherlands/Telebyte
+share/apps/kppp/Provider/Netherlands/Tiscali%032Compleet
+share/apps/kppp/Provider/Netherlands/Tiscali%032Gratis
+share/apps/kppp/Provider/Netherlands/UwNet
+share/apps/kppp/Provider/Netherlands/Via%032Networks
+share/apps/kppp/Provider/Netherlands/Wannadoo%032budget
+share/apps/kppp/Provider/Netherlands/Wannadoo%032budget%320plus
+share/apps/kppp/Provider/Netherlands/Wannadoo%032smartpack
+share/apps/kppp/Provider/Netherlands/Wirehub
+share/apps/kppp/Provider/Netherlands/XS4All
+share/apps/kppp/Provider/Netherlands/Zeelandnet
+share/apps/kppp/Provider/Netherlands/Zon%0322
+share/apps/kppp/Provider/Netherlands/Zon%032Gratis
+share/apps/kppp/Provider/Netherlands/Zon%032Inclusief
+share/apps/kppp/Provider/NewZealand/.directory
+share/apps/kppp/Provider/NewZealand/OrconInternet
+share/apps/kppp/Provider/NewZealand/Paradise
+share/apps/kppp/Provider/NewZealand/Voyager
+share/apps/kppp/Provider/NewZealand/XTRA
+share/apps/kppp/Provider/NewZealand/ihug
+share/apps/kppp/Provider/Norway/.directory
+share/apps/kppp/Provider/Norway/BGNett
+share/apps/kppp/Provider/Norway/Institutt%032for%032informatikk
+share/apps/kppp/Provider/Portugal/.directory
+share/apps/kppp/Provider/Portugal/Clix
+share/apps/kppp/Provider/Portugal/Netc
+share/apps/kppp/Provider/Portugal/OniNet
+share/apps/kppp/Provider/Slovenia/AmisNet
+share/apps/kppp/Provider/Slovenia/Arnes
+share/apps/kppp/Provider/Slovenia/Kiss
+share/apps/kppp/Provider/Slovenia/MojNet
+share/apps/kppp/Provider/Slovenia/SiOL
+share/apps/kppp/Provider/Slovenia/Volja
+share/apps/kppp/Provider/Sweden/.directory
+share/apps/kppp/Provider/Sweden/Tiscali
+share/apps/kppp/Provider/Sweden/Utfors
+share/apps/kppp/Provider/Switzerland/.directory
+share/apps/kppp/Provider/Switzerland/Bluewin
+share/apps/kppp/Provider/Taiwan/.directory
+share/apps/kppp/Provider/Taiwan/EraNet
+share/apps/kppp/Provider/Taiwan/HiNet
+share/apps/kppp/Provider/Taiwan/SeedNet
+share/apps/kppp/Provider/Ukraine/.directory
+share/apps/kppp/Provider/Ukraine/Adamant
+share/apps/kppp/Provider/Ukraine/IPTelecom
+share/apps/kppp/Provider/Ukraine/NuVse
+share/apps/kppp/Provider/United_Kingdom/.directory
+share/apps/kppp/Provider/United_Kingdom/Demon%032Green%0322120666
+share/apps/kppp/Provider/United_Kingdom/Demon%032Purple%0322121666
+share/apps/kppp/Provider/United_Kingdom/Demon%032Red%0320798666
+share/apps/kppp/Provider/United_Kingdom/FreeServe
+share/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032ISDN
+share/apps/kppp/Provider/United_Kingdom/UK%032Free%032Software%032Network%032Modem
+share/apps/kppp/Provider/United_Kingdom/UKPOST%032ISDN
+share/apps/kppp/Provider/United_Kingdom/UKPOST%032Modem
+share/apps/kppp/Provider/United_Kingdom/UTV
+share/apps/kppp/Provider/Yugoslavia/041Net
+share/apps/kppp/Provider/Yugoslavia/BeoTelNet
+share/apps/kppp/Provider/Yugoslavia/CG.Bar.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Berane.yu
+share/apps/kppp/Provider/Yugoslavia/CG.BijeloPolje.CG.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Budva.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Cetinje.yu
+share/apps/kppp/Provider/Yugoslavia/CG.HercegNovi.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Kotor.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Niksic.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Pljevlja.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Podgorica.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Tivat.yu
+share/apps/kppp/Provider/Yugoslavia/CG.Ulcinj.yu
+share/apps/kppp/Provider/Yugoslavia/CG.yu
+share/apps/kppp/Provider/Yugoslavia/DrenikNet
+share/apps/kppp/Provider/Yugoslavia/EUnet at Full
+share/apps/kppp/Provider/Yugoslavia/EUnet at Lite
+share/apps/kppp/Provider/Yugoslavia/EUnetBeograd
+share/apps/kppp/Provider/Yugoslavia/EUnetCacak
+share/apps/kppp/Provider/Yugoslavia/EUnetKragujevac
+share/apps/kppp/Provider/Yugoslavia/EUnetNis
+share/apps/kppp/Provider/Yugoslavia/EUnetNoviSad
+share/apps/kppp/Provider/Yugoslavia/EUnetPristina
+share/apps/kppp/Provider/Yugoslavia/EUnetSombor
+share/apps/kppp/Provider/Yugoslavia/EUnetSubotica
+share/apps/kppp/Provider/Yugoslavia/InfoSKY
+share/apps/kppp/Provider/Yugoslavia/PTT
+share/apps/kppp/Provider/Yugoslavia/SCnet
+share/apps/kppp/Provider/Yugoslavia/Sezampro
+share/apps/kppp/Provider/Yugoslavia/SuOnline
+share/apps/kppp/Provider/Yugoslavia/TippNet
+share/apps/kppp/Provider/Yugoslavia/VeratNet
+share/apps/kppp/Provider/Yugoslavia/YUBCnet
+share/apps/kppp/Rules/Argentina/Argentina_0610.rst
+share/apps/kppp/Rules/Argentina/Argentina_Local.rst
+share/apps/kppp/Rules/Australia/Local.rst
+share/apps/kppp/Rules/Australia/Optus_Residential.rst
+share/apps/kppp/Rules/Australia/STD_Zone_1_-_25-50_kms.rst
+share/apps/kppp/Rules/Australia/STD_Zone_2_-_50-85_kms.rst
+share/apps/kppp/Rules/Australia/STD_Zone_3_-_85-165_kms.rst
+share/apps/kppp/Rules/Australia/STD_Zone_4_-_165+_kms.rst
+share/apps/kppp/Rules/Austria/Business_1/Local.rst
+share/apps/kppp/Rules/Austria/Business_1/Long_Distance.rst
+share/apps/kppp/Rules/Austria/Business_1/Online.rst
+share/apps/kppp/Rules/Austria/Business_2/Local.rst
+share/apps/kppp/Rules/Austria/Business_2/Long_Distance.rst
+share/apps/kppp/Rules/Austria/Business_2/Online.rst
+share/apps/kppp/Rules/Austria/Minimum/Local.rst
+share/apps/kppp/Rules/Austria/Minimum/Long_Distance.rst
+share/apps/kppp/Rules/Austria/Minimum/Online.rst
+share/apps/kppp/Rules/Austria/Standard/Local.rst
+share/apps/kppp/Rules/Austria/Standard/Long_Distance.rst
+share/apps/kppp/Rules/Austria/Standard/Online.rst
+share/apps/kppp/Rules/Austria/Standard/UTA_easyinternet.rst
+share/apps/kppp/Rules/Bangladesh/ATT00007.rst
+share/apps/kppp/Rules/Bangladesh/ATT00010.rst
+share/apps/kppp/Rules/Belgium/Belgium_internet_euro.rst
+share/apps/kppp/Rules/Belgium/Belgium_internet_frank.rst
+share/apps/kppp/Rules/Belgium/Belgium_interzonal.rst
+share/apps/kppp/Rules/Belgium/Belgium_zonal.rst
+share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_home_-_bez_impulsa.rst
+share/apps/kppp/Rules/Bosnia_and_Herzegovina/BiHnet_-_student_-_bez_impulsa.rst
+share/apps/kppp/Rules/Bosnia_and_Herzegovina/SmartNet_PERSONAL_bez_impulsa.rst
+share/apps/kppp/Rules/Bosnia_and_Herzegovina/samo_impulsi.rst
+share/apps/kppp/Rules/Brasil/Brasil.rst
+share/apps/kppp/Rules/Brasil/Brasil_Ligbr.rst
+share/apps/kppp/Rules/Brasil/Rio_de_Janeiro.rst
+share/apps/kppp/Rules/Brasil/SaoPaulo.rst
+share/apps/kppp/Rules/Croatia/CARNet.rst
+share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Business_Internet.rst
+share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_Home_Internet.rst
+share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_180_+_660.rst
+share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_a_Internet_90_+_300.rst
+share/apps/kppp/Rules/Czechia/Czech_Telecom_Internet_2004_telefon_universal.rst
+share/apps/kppp/Rules/Denmark/12Move_Analog.rst
+share/apps/kppp/Rules/Denmark/12Move_ISDN.rst
+share/apps/kppp/Rules/Denmark/Cybercity_Friabonnement.rst
+share/apps/kppp/Rules/Denmark/Get2net_Betaling.rst
+share/apps/kppp/Rules/Denmark/Get2net_Gratis.rst
+share/apps/kppp/Rules/Denmark/Mobilix_Wanadoo.rst
+share/apps/kppp/Rules/Denmark/Teledanmark_Basis.rst
+share/apps/kppp/Rules/Denmark/Teledanmark_Favoritinternet.rst
+share/apps/kppp/Rules/Denmark/Worldonline-Analog.rst
+share/apps/kppp/Rules/Denmark/Worldonline-ISDN.rst
+share/apps/kppp/Rules/Estonia/Eesti_Telefon.rst
+share/apps/kppp/Rules/Finland/VLP.rst
+share/apps/kppp/Rules/France/Cegetel_Local.rst
+share/apps/kppp/Rules/France/Cegetel_National.rst
+share/apps/kppp/Rules/France/France_Telecom_Internet.rst
+share/apps/kppp/Rules/France/France_Telecom_Local.rst
+share/apps/kppp/Rules/France/France_Telecom_National.rst
+share/apps/kppp/Rules/France/Le_9_Local.rst
+share/apps/kppp/Rules/France/Le_9_National.rst
+share/apps/kppp/Rules/France/OneTel.rst
+share/apps/kppp/Rules/France/Tele2_Local.rst
+share/apps/kppp/Rules/France/Tele2_National.rst
+share/apps/kppp/Rules/France/Wanadoo_Free.rst
+share/apps/kppp/Rules/Germany/1und1_InternetZugang.rst
+share/apps/kppp/Rules/Germany/2.5min.rst
+share/apps/kppp/Rules/Germany/2.5s.rst
+share/apps/kppp/Rules/Germany/AddCom_by_Call.rst
+share/apps/kppp/Rules/Germany/Addcom.rst
+share/apps/kppp/Rules/Germany/Arcor_Internet_by_Call_easy.rst
+share/apps/kppp/Rules/Germany/CallOkaynet.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Basic.rst
+share/apps/kppp/Rules/Germany/Callino_Surf_Plus.rst
+share/apps/kppp/Rules/Germany/Callisa_City.rst
+share/apps/kppp/Rules/Germany/City_Activ_Plus_Option.rst
+share/apps/kppp/Rules/Germany/Cityweb.rst
+share/apps/kppp/Rules/Germany/CompuservePro.rst
+share/apps/kppp/Rules/Germany/E-Plus-Online_Jedermann.rst
+share/apps/kppp/Rules/Germany/Easynet_easy-call.rst
+share/apps/kppp/Rules/Germany/Freenet_Enterprise.rst
+share/apps/kppp/Rules/Germany/Freenet_Sorglos.rst
+share/apps/kppp/Rules/Germany/Freenet_StandardTarif.rst
+share/apps/kppp/Rules/Germany/Freenet_Super_CbC.rst
+share/apps/kppp/Rules/Germany/Freenet_special_call_by_call.rst
+share/apps/kppp/Rules/Germany/MSN.rst
+share/apps/kppp/Rules/Germany/Mobilcom_Freenet.rst
+share/apps/kppp/Rules/Germany/NGI_Call_By_Call.rst
+share/apps/kppp/Rules/Germany/Netcom_Kassel.rst
+share/apps/kppp/Rules/Germany/Nikoma.rst
+share/apps/kppp/Rules/Germany/Nikoma_Internet_by_Call.rst
+share/apps/kppp/Rules/Germany/Nikoma_Study_and_Surf.rst
+share/apps/kppp/Rules/Germany/Planet-Interkom_Internet_by_call.rst
+share/apps/kppp/Rules/Germany/Puretec.rst
+share/apps/kppp/Rules/Germany/Telekom_City_Select_5_30.rst
+share/apps/kppp/Rules/Germany/VR-Web.rst
+share/apps/kppp/Rules/Germany/expressnet.rst
+share/apps/kppp/Rules/Germany/knUUt-by-Call.rst
+share/apps/kppp/Rules/Germany/talkline_by_call.rst
+share/apps/kppp/Rules/Germany/vossnet_fun.rst
+share/apps/kppp/Rules/Germany/vossnet_fun_light.rst
+share/apps/kppp/Rules/Germany/vossnet_kompl.rst
+share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone1_in_euro.rst
+share/apps/kppp/Rules/Greece/Hellas_EPAK_Zone2_in_euro.rst
+share/apps/kppp/Rules/Greece/Hellas_EPAK_local_in_euro.rst
+share/apps/kppp/Rules/Greece/Hellas_analog_local_in_euro.rst
+share/apps/kppp/Rules/Greece/Hellas_digital_local_in_euro.rst
+share/apps/kppp/Rules/Hong_Kong/Hong_Kong_Telecom.rst
+share/apps/kppp/Rules/Hungary/Local.rst
+share/apps/kppp/Rules/Hungary/LocalTop_MATAV.rst
+share/apps/kppp/Rules/Hungary/Local_MATAV.rst
+share/apps/kppp/Rules/Hungary/PapaTel.rst
+share/apps/kppp/Rules/Iceland/Iceland_general.rst
+share/apps/kppp/Rules/India/BSNL_Local.rst
+share/apps/kppp/Rules/India/BSNL_Long_101_To_200.rst
+share/apps/kppp/Rules/India/BSNL_Medium_51_To_100.rst
+share/apps/kppp/Rules/India/Vsnl_local.rst
+share/apps/kppp/Rules/Indonesia/Lokal_1_Metropolitan.rst
+share/apps/kppp/Rules/Indonesia/Lokal_2_Metropolitan.rst
+share/apps/kppp/Rules/Indonesia/Lokal_non_metropolitan.rst
+share/apps/kppp/Rules/Ireland/Eircom_Internet.rst
+share/apps/kppp/Rules/Ireland/Eircom_Local.rst
+share/apps/kppp/Rules/Ireland/Eircom_National.rst
+share/apps/kppp/Rules/Ireland/Eircom_Special.rst
+share/apps/kppp/Rules/Israel/Bezeq_Interurban.rst
+share/apps/kppp/Rules/Israel/Bezeq_Local.rst
+share/apps/kppp/Rules/Italy/Atlanet.rst
+share/apps/kppp/Rules/Italy/Cheapnet.rst
+share/apps/kppp/Rules/Italy/Infostrada_Internet_SpZero.rst
+share/apps/kppp/Rules/Italy/Infostrada_Libero1055_Base.rst
+share/apps/kppp/Rules/Italy/Infostrada_Libero1055_SpZero.rst
+share/apps/kppp/Rules/Italy/Infostrada_Loc_Reg_Naz_SpZero.rst
+share/apps/kppp/Rules/Italy/Infostrada_Locali_Base.rst
+share/apps/kppp/Rules/Italy/Infostrada_Reg_Naz_Base.rst
+share/apps/kppp/Rules/Italy/Tele2_Altri_ISP.rst
+share/apps/kppp/Rules/Italy/Tele2_Internet_Tele2.rst
+share/apps/kppp/Rules/Italy/Telecom_Interurbane_Fino15Km.rst
+share/apps/kppp/Rules/Italy/Telecom_Interurbane_Oltre15Km.rst
+share/apps/kppp/Rules/Italy/Telecom_Locali.rst
+share/apps/kppp/Rules/Italy/Teleconomy24_Internet.rst
+share/apps/kppp/Rules/Italy/Teleconomy24_Nazionali.rst
+share/apps/kppp/Rules/Italy/Teleconomy_NoStop_Internet.rst
+share/apps/kppp/Rules/Italy/Wind_24ore_Internet_AltriISP.rst
+share/apps/kppp/Rules/Italy/Wind_24ore_Internet_InWind.rst
+share/apps/kppp/Rules/Italy/Wind_24ore_Interurbane.rst
+share/apps/kppp/Rules/Italy/Wind_24ore_Urbane.rst
+share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Internet_InWind.rst
+share/apps/kppp/Rules/Italy/Wind_Family+SuperLight_Urbane_Interurbane.rst
+share/apps/kppp/Rules/Italy/Wind_Family_Internet_AltriISP.rst
+share/apps/kppp/Rules/Italy/Wind_Family_Internet_InWind.rst
+share/apps/kppp/Rules/Italy/Wind_Family_Interurbane.rst
+share/apps/kppp/Rules/Italy/Wind_Family_Urbane.rst
+share/apps/kppp/Rules/Italy/Wind_Flat_Internet_AltriISP.rst
+share/apps/kppp/Rules/Italy/Wind_Flat_Internet_InWind.rst
+share/apps/kppp/Rules/Italy/Wind_Urbana_1088_Light.rst
+share/apps/kppp/Rules/Jamaica/CWJ_InterParish.rst
+share/apps/kppp/Rules/Jamaica/CWJ_Local.rst
+share/apps/kppp/Rules/Japan/NTT_Local.rst
+share/apps/kppp/Rules/Kazakhstan/Akparat_Sprint.rst
+share/apps/kppp/Rules/Luxembourg/Local.rst
+share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_interurban.rst
+share/apps/kppp/Rules/Macedonia/Macedonia_GenericISP_local.rst
+share/apps/kppp/Rules/Macedonia/Macedonia_MTnet.rst
+share/apps/kppp/Rules/Malaysia/TMNet_Jaring.rst
+share/apps/kppp/Rules/Malaysia/malaysia.rst
+share/apps/kppp/Rules/Netherlands/12Move.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Buiten_Regio_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBasis_Regio_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelBudget_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio.rst
+share/apps/kppp/Rules/Netherlands/BelPlus_Regio_Nummervoordeel.rst
+share/apps/kppp/Rules/Netherlands/Cistron
+share/apps/kppp/Rules/Netherlands/Freeler_Basis.rst
+share/apps/kppp/Rules/Netherlands/Freeler_Voordelig.rst
+share/apps/kppp/Rules/Netherlands/HetNet_Regelmatig_Surfen.rst
+share/apps/kppp/Rules/Netherlands/InterNLnet.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Spaarstand_Regio.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/OneTel_Toets_1658_Regio.rst
+share/apps/kppp/Rules/Netherlands/Planet_Internet.rst
+share/apps/kppp/Rules/Netherlands/Priority_Telecom_Nationaal.rst
+share/apps/kppp/Rules/Netherlands/Priority_Telecom_Regionaal.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Extra_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Extra_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Preselect_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Buiten_Regio.rst
+share/apps/kppp/Rules/Netherlands/Tele2_Toets_1609_Regio.rst
+share/apps/kppp/Rules/Netherlands/Wannadoo_Budget_Plus
+share/apps/kppp/Rules/Norway/Local_Area.rst
+share/apps/kppp/Rules/Norway/Long_Distance.rst
+share/apps/kppp/Rules/Norway/Netcom.rst
+share/apps/kppp/Rules/Poland/Internetia.rst
+share/apps/kppp/Rules/Poland/Netia_100km_Niebieska.rst
+share/apps/kppp/Rules/Poland/Netia_100km_Zielona.rst
+share/apps/kppp/Rules/Poland/Netia_Lokalne_Niebieska.rst
+share/apps/kppp/Rules/Poland/Netia_Lokalne_Zielona.rst
+share/apps/kppp/Rules/Poland/TPSA.rst
+share/apps/kppp/Rules/Poland/TP_100km.rst
+share/apps/kppp/Rules/Poland/TP_Lokalne.rst
+share/apps/kppp/Rules/Portugal/PT_Local.rst
+share/apps/kppp/Rules/Portugal/PT_Local_Ilhas.rst
+share/apps/kppp/Rules/Portugal/PT_Regional.rst
+share/apps/kppp/Rules/Portugal/PT_Regional_Ilhas.rst
+share/apps/kppp/Rules/Portugal/PT_YesNET.rst
+share/apps/kppp/Rules/Portugal/PT_YesNET_Ilhas.rst
+share/apps/kppp/Rules/Romania/Easynet.rst
+share/apps/kppp/Rules/Romania/RomTelecom_GSM.rst
+share/apps/kppp/Rules/Romania/Romtelecom_Acces_Special_Internet.rst
+share/apps/kppp/Rules/Romania/Romtelecom_Interjudetean.rst
+share/apps/kppp/Rules/Romania/Romtelecom_Local.rst
+share/apps/kppp/Rules/Romania/Zapp-Mobile.rst
+share/apps/kppp/Rules/Russia/TEMPLATE.ru
+share/apps/kppp/Rules/Russia/mtu-intel_standart.rst
+share/apps/kppp/Rules/Singapore/SingTel_Local.rst
+share/apps/kppp/Rules/Slovakia/Internetovy_tarif_019XY.rst
+share/apps/kppp/Rules/Slovakia/ST_medzimesto.rst
+share/apps/kppp/Rules/Slovakia/ST_mesto.rst
+share/apps/kppp/Rules/Slovenia/omrezje_0880.rst
+share/apps/kppp/Rules/Slovenia/omrezje_0889.rst
+share/apps/kppp/Rules/Slovenia/stacionarno_omrezje.rst
+share/apps/kppp/Rules/South_Africa/South_Africa_local.rst
+share/apps/kppp/Rules/South_Africa/South_Africa_long_distance.rst
+share/apps/kppp/Rules/South_Afrika/South_Afrika.rst
+share/apps/kppp/Rules/South_Afrika/South_Afrika_Justin.rst
+share/apps/kppp/Rules/Spain/Infovia.rst
+share/apps/kppp/Rules/Spain/Infovia_IVA.rst
+share/apps/kppp/Rules/Spain/Telefonica_Interprovincial.rst
+share/apps/kppp/Rules/Spain/Telefonica_Interprovincial_IVA.rst
+share/apps/kppp/Rules/Spain/Telefonica_Local.rst
+share/apps/kppp/Rules/Spain/Telefonica_Metropolitana.rst
+share/apps/kppp/Rules/Spain/Telefonica_Metropolitana_IVA.rst
+share/apps/kppp/Rules/Spain/Telefonica_Nacional.rst
+share/apps/kppp/Rules/Spain/Telefonica_Provincial.rst
+share/apps/kppp/Rules/Spain/Telefonica_Provincial_IVA.rst
+share/apps/kppp/Rules/Sweden/ACN.rst
+share/apps/kppp/Rules/Sweden/Abonnera_com.rst
+share/apps/kppp/Rules/Sweden/CNEAB-Route66.rst
+share/apps/kppp/Rules/Sweden/Crossnet-Affinity.rst
+share/apps/kppp/Rules/Sweden/Glocalnet.rst
+share/apps/kppp/Rules/Sweden/Gts.rst
+share/apps/kppp/Rules/Sweden/Home_se.rst
+share/apps/kppp/Rules/Sweden/Nemtel.rst
+share/apps/kppp/Rules/Sweden/Plusenergi.rst
+share/apps/kppp/Rules/Sweden/RSLCom.rst
+share/apps/kppp/Rules/Sweden/Rix_Telecom.rst
+share/apps/kppp/Rules/Sweden/Supertel.rst
+share/apps/kppp/Rules/Sweden/Svensk_Telekom.rst
+share/apps/kppp/Rules/Sweden/Tele1_Europe.rst
+share/apps/kppp/Rules/Sweden/Tele2.rst
+share/apps/kppp/Rules/Sweden/Tele8.rst
+share/apps/kppp/Rules/Sweden/Teleman.rst
+share/apps/kppp/Rules/Sweden/Telenordia.rst
+share/apps/kppp/Rules/Sweden/Telerian.rst
+share/apps/kppp/Rules/Sweden/Telia.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus1.rst
+share/apps/kppp/Rules/Sweden/Telia_Telebonus2.rst
+share/apps/kppp/Rules/Sweden/Telitel.rst
+share/apps/kppp/Rules/Sweden/Tiscali.rst
+share/apps/kppp/Rules/Sweden/Transnet.rst
+share/apps/kppp/Rules/Sweden/Universal_Telecom.rst
+share/apps/kppp/Rules/Sweden/Utfors.rst
+share/apps/kppp/Rules/Sweden/Vattenfall.rst
+share/apps/kppp/Rules/Switzerland/Sunrise_Freetime.rst
+share/apps/kppp/Rules/Switzerland/Sunrise_Local.rst
+share/apps/kppp/Rules/Switzerland/Sunrise_Select_Internet.rst
+share/apps/kppp/Rules/Switzerland/Swisscom_Local.rst
+share/apps/kppp/Rules/Switzerland/Swisscom_Remote.rst
+share/apps/kppp/Rules/Switzerland/Swisscom_Surf.rst
+share/apps/kppp/Rules/TEMPLATE
+share/apps/kppp/Rules/Turkey/Turk_Telekom_Internet.rst
+share/apps/kppp/Rules/Ukraine/IPTelecom_hourly.rst
+share/apps/kppp/Rules/Ukraine/NuVse_hourly.rst
+share/apps/kppp/Rules/Ukraine/TEMPLATE.uk
+share/apps/kppp/Rules/Ukraine/Utel_Unet.rst
+share/apps/kppp/Rules/United_Kingdom/BirminghamCable_Local.rst
+share/apps/kppp/Rules/United_Kingdom/BirminghamCable_National.rst
+share/apps/kppp/Rules/United_Kingdom/BirminghamCable_SameTelco.rst
+share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Local.rst
+share/apps/kppp/Rules/United_Kingdom/BritishTelecom_National.rst
+share/apps/kppp/Rules/United_Kingdom/BritishTelecom_Regional.rst
+share/apps/kppp/Rules/United_Kingdom/British_OneTel.rst
+share/apps/kppp/Rules/United_Kingdom/Connaught_Telecom.rst
+share/apps/kppp/Rules/Uruguay/Adinet_cIVA.rst
+share/apps/kppp/Rules/Yugoslavia/041_1xx_xxx.rst
+share/apps/kppp/Rules/Yugoslavia/041_2xx_xxx.rst
+share/apps/kppp/Rules/Yugoslavia/041_3xx_xxx.rst
+share/apps/kppp/Rules/Yugoslavia/041_4xx_xxx.rst
+share/apps/kppp/Rules/Yugoslavia/041_5xx_xxx.rst
+share/apps/kppp/Rules/Yugoslavia/041_9xx_xxx.rst
+share/apps/kppp/Rules/Yugoslavia/III_zona-preko_200km.rst
+share/apps/kppp/Rules/Yugoslavia/II_zona-do_200km.rst
+share/apps/kppp/Rules/Yugoslavia/I_zona-ista_mreza.rst
+share/apps/kppp/Rules/Yugoslavia/Lokalni_poziv.rst
+share/apps/kppp/pics/dock_both.png
+share/apps/kppp/pics/dock_left.png
+share/apps/kppp/pics/dock_none.png
+share/apps/kppp/pics/dock_right.png
+share/apps/kppp/pics/folder.png
+share/apps/kppp/pics/modemboth.png
+share/apps/kppp/pics/modemleft.png
+share/apps/kppp/pics/modemnone.png
+share/apps/kppp/pics/modemright.png
+share/apps/kppp/pics/phone.png
+share/apps/krdc/krdcui.rc
+share/apps/krdc/pics/pointcursor.png
+share/apps/krdc/pics/pointcursormask.png
+share/apps/krfb/krfb.notifyrc
+share/apps/remoteview/zeroconf.desktop
+share/config.kcfg/historyconfig.kcfg
+share/config.kcfg/kget.kcfg
+share/config.kcfg/kget_mirrorsearchfactory.kcfg
+share/config.kcfg/kget_multisegkiofactory.kcfg
+share/config.kcfg/kopeteappearancesettings.kcfg
+share/config.kcfg/kopetebehaviorsettings.kcfg
+share/config.kcfg/kopetestatussettings.kcfg
+share/config.kcfg/krdc.kcfg
+share/config.kcfg/latexconfig.kcfg
+share/config.kcfg/nowlisteningconfig.kcfg
+share/config.kcfg/urlpicpreview.kcfg
+share/config/kopeterc
+share/dbus-1/interfaces/org.kde.Kopete.xml
+share/dbus-1/interfaces/org.kde.kdnssd.xml
+share/dbus-1/interfaces/org.kde.kopete.Client.xml
+share/dbus-1/interfaces/org.kde.kopete.Statistics.xml
+share/dbus-1/interfaces/org.kde.kppp.xml
+share/doc/HTML/en/kget/common
+share/doc/HTML/en/kget/fileopen.png
+share/doc/HTML/en/kget/index.cache.bz2
+share/doc/HTML/en/kget/index.docbook
+share/doc/HTML/en/kget/kget1.png
+share/doc/HTML/en/kget/kget2.png
+share/doc/HTML/en/kget/kget3.png
+share/doc/HTML/en/kget/kget4.png
+share/doc/HTML/en/kget/kget5.png
+share/doc/HTML/en/knewsticker/about-icon.png
+share/doc/HTML/en/knewsticker/checknews-icon.png
+share/doc/HTML/en/knewsticker/common
+share/doc/HTML/en/knewsticker/contextmenu.png
+share/doc/HTML/en/knewsticker/help-icon.png
+share/doc/HTML/en/knewsticker/index.cache.bz2
+share/doc/HTML/en/knewsticker/index.docbook
+share/doc/HTML/en/knewsticker/kcmnewsticker-filters.png
+share/doc/HTML/en/knewsticker/kcmnewsticker-general.png
+share/doc/HTML/en/knewsticker/kcmnewsticker-newssitedialog.png
+share/doc/HTML/en/knewsticker/kcmnewsticker-newssources.png
+share/doc/HTML/en/knewsticker/kcmnewsticker-scrollerprefs.png
+share/doc/HTML/en/knewsticker/kcontrol-icon.png
+share/doc/HTML/en/knewsticker/knewsticker-childpanel.png
+share/doc/HTML/en/knewsticker/knewsticker-icon.png
+share/doc/HTML/en/knewsticker/knewsticker-kicker.png
+share/doc/HTML/en/knewsticker/knewsticker-ownwindow.png
+share/doc/HTML/en/knewsticker/newarticle-icon.png
+share/doc/HTML/en/knewsticker/newssite-icon.png
+share/doc/HTML/en/knewsticker/oldarticle-icon.png
+share/doc/HTML/en/knewsticker/preferences-icon.png
+share/doc/HTML/en/kopete/chatstyle.docbook
+share/doc/HTML/en/kopete/common
+share/doc/HTML/en/kopete/index.cache.bz2
+share/doc/HTML/en/kopete/index.docbook
+share/doc/HTML/en/kopete/menus.docbook
+share/doc/HTML/en/kopete/otr-auth-1.png
+share/doc/HTML/en/kopete/otr-auth-2.png
+share/doc/HTML/en/kopete/otr-auth-3.png
+share/doc/HTML/en/kopete/otr-auth-4.png
+share/doc/HTML/en/kopete/otr-auth-5.png
+share/doc/HTML/en/kopete/otr-auth-6.png
+share/doc/HTML/en/kopete/otr-auth-7.png
+share/doc/HTML/en/kopete/pipes.docbook
+share/doc/HTML/en/kppp/accounting.docbook
+share/doc/HTML/en/kppp/callback.docbook
+share/doc/HTML/en/kppp/chap.docbook
+share/doc/HTML/en/kppp/common
+share/doc/HTML/en/kppp/costsgraphs.png
+share/doc/HTML/en/kppp/dialog-setup.docbook
+share/doc/HTML/en/kppp/getting-online.docbook
+share/doc/HTML/en/kppp/global-settings.docbook
+share/doc/HTML/en/kppp/hayes.docbook
+share/doc/HTML/en/kppp/index.cache.bz2
+share/doc/HTML/en/kppp/index.docbook
+share/doc/HTML/en/kppp/kppp-account-accounting-tab.png
+share/doc/HTML/en/kppp/kppp-account-dial-tab.png
+share/doc/HTML/en/kppp/kppp-account-dns-tab.png
+share/doc/HTML/en/kppp/kppp-account-execute-tab.png
+share/doc/HTML/en/kppp/kppp-account-gateway-tab.png
+share/doc/HTML/en/kppp/kppp-account-ip-tab.png
+share/doc/HTML/en/kppp/kppp-account-login-script-tab.png
+share/doc/HTML/en/kppp/kppp-config.png
+share/doc/HTML/en/kppp/kppp-device-tab.png
+share/doc/HTML/en/kppp/kppp-dialler-tab.png
+share/doc/HTML/en/kppp/kppp-faq.docbook
+share/doc/HTML/en/kppp/kppp-graph-tab.png
+share/doc/HTML/en/kppp/kppp-misc-tab.png
+share/doc/HTML/en/kppp/kppp-modem-tab.png
+share/doc/HTML/en/kppp/kppp-wizard.png
+share/doc/HTML/en/kppp/security.docbook
+share/doc/HTML/en/kppp/tricks.docbook
+share/doc/HTML/en/kppp/wizard.docbook
+share/doc/HTML/en/krdc/address_input.png
+share/doc/HTML/en/krdc/bookmarks_menu.png
+share/doc/HTML/en/krdc/common
+share/doc/HTML/en/krdc/fullscreen_button.png
+share/doc/HTML/en/krdc/host_preferences.png
+share/doc/HTML/en/krdc/index.cache.bz2
+share/doc/HTML/en/krdc/index.docbook
+share/doc/HTML/en/krdc/krdc_mainwindow.png
+share/doc/HTML/en/krdc/password_entry.png
+share/doc/HTML/en/krdc/rdp_preferences.png
+share/doc/HTML/en/krdc/vnc_host_configuration.png
+share/doc/HTML/en/krdc/vnc_preferences.png
+share/doc/HTML/en/krdc/windowmode_button.png
+share/doc/HTML/en/krfb/common
+share/doc/HTML/en/krfb/configuration_access.png
+share/doc/HTML/en/krfb/configuration_network.png
+share/doc/HTML/en/krfb/configuration_session.png
+share/doc/HTML/en/krfb/connection.png
+share/doc/HTML/en/krfb/email_invitation.png
+share/doc/HTML/en/krfb/index.cache.bz2
+share/doc/HTML/en/krfb/index.docbook
+share/doc/HTML/en/krfb/invitation_management.png
+share/doc/HTML/en/krfb/personal_invitation.png
+share/doc/HTML/en/krfb/screenshot.png
+share/icons/hicolor/128x128/apps/kget.png
+share/icons/hicolor/128x128/apps/kopete.png
+share/icons/hicolor/128x128/apps/kppp.png
+share/icons/hicolor/16x16/apps/kcmsambaconf.png
+share/icons/hicolor/16x16/apps/kget.png
+share/icons/hicolor/16x16/apps/knewsticker.png
+share/icons/hicolor/16x16/apps/kopete.png
+share/icons/hicolor/16x16/apps/kppp.png
+share/icons/hicolor/22x22/apps/kget.png
+share/icons/hicolor/22x22/apps/kopete.png
+share/icons/hicolor/22x22/apps/kppp.png
+share/icons/hicolor/32x32/apps/kget.png
+share/icons/hicolor/32x32/apps/knewsticker.png
+share/icons/hicolor/32x32/apps/kopete.png
+share/icons/hicolor/32x32/apps/kppp.png
+share/icons/hicolor/48x48/apps/kget.png
+share/icons/hicolor/48x48/apps/knewsticker.png
+share/icons/hicolor/48x48/apps/kopete.png
+share/icons/hicolor/48x48/apps/kppp.png
+share/icons/hicolor/64x64/apps/kget.png
+share/icons/hicolor/64x64/apps/kopete.png
+share/icons/hicolor/64x64/apps/kppp.png
+share/icons/hicolor/scalable/apps/kget.svgz
+share/icons/hicolor/scalable/apps/kopete.svgz
+share/icons/oxygen/128x128/actions/voicecall.png
+share/icons/oxygen/128x128/actions/webcamreceive.png
+share/icons/oxygen/128x128/actions/webcamsend.png
+share/icons/oxygen/16x16/actions/account_offline_overlay.png
+share/icons/oxygen/16x16/actions/contact_away_overlay.png
+share/icons/oxygen/16x16/actions/contact_busy_overlay.png
+share/icons/oxygen/16x16/actions/contact_food_overlay.png
+share/icons/oxygen/16x16/actions/contact_invisible_overlay.png
+share/icons/oxygen/16x16/actions/contact_phone_overlay.png
+share/icons/oxygen/16x16/actions/contact_xa_overlay.png
+share/icons/oxygen/16x16/actions/emoticon.png
+share/icons/oxygen/16x16/actions/im-status-message-edit.png
+share/icons/oxygen/16x16/actions/metacontact_unknown.png
+share/icons/oxygen/16x16/actions/status_unknown.png
+share/icons/oxygen/16x16/actions/status_unknown_overlay.png
+share/icons/oxygen/16x16/actions/view-user-offline-kopete.png
+share/icons/oxygen/16x16/actions/voicecall.png
+share/icons/oxygen/16x16/actions/webcamreceive.png
+share/icons/oxygen/16x16/actions/webcamsend.png
+share/icons/oxygen/16x16/mimetypes/kopete_emoticons.png
+share/icons/oxygen/22x22/actions/account_offline_overlay.png
+share/icons/oxygen/22x22/actions/im-status-message-edit.png
+share/icons/oxygen/22x22/actions/view-user-offline-kopete.png
+share/icons/oxygen/22x22/actions/voicecall.png
+share/icons/oxygen/22x22/actions/webcamreceive.png
+share/icons/oxygen/22x22/actions/webcamsend.png
+share/icons/oxygen/22x22/apps/kopete_all_away.png
+share/icons/oxygen/22x22/apps/kopete_offline.png
+share/icons/oxygen/22x22/apps/kopete_some_away.png
+share/icons/oxygen/22x22/apps/kopete_some_online.png
+share/icons/oxygen/22x22/mimetypes/kopete_emoticons.png
+share/icons/oxygen/22x22/status/object-locked-finished.png
+share/icons/oxygen/22x22/status/object-locked-unverified.png
+share/icons/oxygen/22x22/status/object-locked-verified.png
+share/icons/oxygen/32x32/actions/account_offline_overlay.png
+share/icons/oxygen/32x32/actions/im-status-message-edit.png
+share/icons/oxygen/32x32/actions/metacontact_unknown.png
+share/icons/oxygen/32x32/actions/newmessage.mng
+share/icons/oxygen/32x32/actions/view-user-offline-kopete.png
+share/icons/oxygen/32x32/actions/voicecall.png
+share/icons/oxygen/32x32/actions/webcamreceive.png
+share/icons/oxygen/32x32/actions/webcamsend.png
+share/icons/oxygen/48x48/actions/im-status-message-edit.png
+share/icons/oxygen/48x48/actions/view-user-offline-kopete.png
+share/icons/oxygen/48x48/actions/voicecall.png
+share/icons/oxygen/48x48/actions/webcamreceive.png
+share/icons/oxygen/48x48/actions/webcamsend.png
+share/icons/oxygen/48x48/actions/mail-encrypt.png
+share/icons/oxygen/64x64/actions/voicecall.png
+share/icons/oxygen/64x64/actions/webcamreceive.png
+share/icons/oxygen/64x64/actions/webcamsend.png
+share/icons/oxygen/scalable/actions/account_offline_overlay.svgz
+share/icons/oxygen/scalable/actions/im-status-message-edit.svgz
+share/icons/oxygen/scalable/actions/view-user-offline-kopete.svgz
+share/icons/oxygen/scalable/actions/voicecall.svgz
+share/icons/oxygen/scalable/actions/webcamreceive.svgz
+share/icons/oxygen/scalable/actions/webcamsend.svgz
+share/icons/oxygen/scalable/actions/mail-encrypt.svgz
+share/icons/oxygen/scalable/status/object-locked-finished.svgz
+share/icons/oxygen/scalable/status/object-locked-unverified.svgz
+share/icons/oxygen/scalable/status/object-locked-verified.svgz
+share/kde4/services/ServiceMenus/kget_download.desktop
+share/kde4/services/ServiceMenus/smb2rdc.desktop
+share/kde4/services/aim.protocol
+share/kde4/services/chatwindow.desktop
+share/kde4/services/emailwindow.desktop
+share/kde4/services/fileshare.desktop
+share/kde4/services/fileshare_propsdlgplugin.desktop
+share/kde4/services/kcmsambaconf.desktop
+share/kde4/services/kopete_jabber.desktop
+share/kde4/services/xmpp.protocol
+share/kde4/services/kopete_groupwise.desktop
+share/kde4/services/kconfiguredialog/kopete_otr_config.desktop
+share/kde4/services/kopete_otr.desktop
+share/kde4/services/kconfiguredialog/kopete_addbookmarks_config.desktop
+share/kde4/services/kconfiguredialog/kopete_alias_config.desktop
+share/kde4/services/kconfiguredialog/kopete_autoreplace_config.desktop
+share/kde4/services/kconfiguredialog/kopete_highlight_config.desktop
+share/kde4/services/kconfiguredialog/kopete_history_config.desktop
+share/kde4/services/kconfiguredialog/kopete_latex_config.desktop
+share/kde4/services/kconfiguredialog/kopete_nowlistening_config.desktop
+share/kde4/services/kconfiguredialog/kopete_pipes_config.desktop
+share/kde4/services/kconfiguredialog/kopete_privacy_config.desktop
+share/kde4/services/kconfiguredialog/kopete_texteffect_config.desktop
+share/kde4/services/kconfiguredialog/kopete_translator_config.desktop
+share/kde4/services/kconfiguredialog/kopete_urlpicpreview_config.desktop
+share/kde4/services/kconfiguredialog/kopete_webpresence_config.desktop
+share/kde4/services/kded/dnssdwatcher.desktop
+share/kde4/services/kget_bittorrentfactory.desktop
+share/kde4/services/kget_kiofactory.desktop
+share/kde4/services/kget_metalinkfactory.desktop
+share/kde4/services/kget_mirrorsearchfactory.desktop
+share/kde4/services/kget_multisegkiofactory.desktop
+share/kde4/services/kopete_accountconfig.desktop
+share/kde4/services/kopete_addbookmarks.desktop
+share/kde4/services/kopete_aim.desktop
+share/kde4/services/kopete_alias.desktop
+share/kde4/services/kopete_appearanceconfig.desktop
+share/kde4/services/kopete_autoreplace.desktop
+share/kde4/services/kopete_avdeviceconfig.desktop
+share/kde4/services/kopete_behaviorconfig.desktop
+share/kde4/services/kopete_chatwindowconfig.desktop
+share/kde4/services/kopete_contactnotes.desktop
+share/kde4/services/kopete_gadu.desktop
+share/kde4/services/kopete_highlight.desktop
+share/kde4/services/kopete_history.desktop
+share/kde4/services/kopete_icq.desktop
+share/kde4/services/kopete_latex.desktop
+share/kde4/services/kopete_msn.desktop
+share/kde4/services/kopete_nowlistening.desktop
+share/kde4/services/kopete_pipes.desktop
+share/kde4/services/kopete_pluginconfig.desktop
+share/kde4/services/kopete_privacy.desktop
+share/kde4/services/kopete_qq.desktop
+share/kde4/services/kopete_sms.desktop
+share/kde4/services/kopete_statistics.desktop
+share/kde4/services/kopete_statusconfig.desktop
+share/kde4/services/kopete_testbed.desktop
+share/kde4/services/kopete_texteffect.desktop
+share/kde4/services/kopete_translator.desktop
+share/kde4/services/kopete_urlpicpreview.desktop
+share/kde4/services/kopete_webpresence.desktop
+share/kde4/services/kopete_wp.desktop
+share/kde4/services/kopete_yahoo.desktop
+share/kde4/services/plasma-engine-kget.desktop
+share/kde4/services/plasma-kget-default.desktop
+share/kde4/services/plasma-knewsticker-default.desktop
+share/kde4/services/rdp.protocol
+share/kde4/services/vnc.protocol
+share/kde4/services/zeroconf.protocol
+share/kde4/servicetypes/kget_plugin.desktop
+share/kde4/servicetypes/kopeteplugin.desktop
+share/kde4/servicetypes/kopeteprotocol.desktop
+share/kde4/servicetypes/kopeteui.desktop
+share/sounds/Kopete_Event.ogg
+share/sounds/Kopete_Received.ogg
+share/sounds/Kopete_Sent.ogg
+share/sounds/Kopete_User_is_Online.ogg
+ at dirrmtry share/sounds
+ at dirrmtry share/kde4/servicetypes
+ at dirrmtry share/kde4/services/kded
+ at dirrmtry share/kde4/services/kconfiguredialog
+ at dirrmtry share/kde4/services/ServiceMenus
+ at dirrmtry share/kde4/services
+ at dirrmtry share/kde4
+ at dirrmtry share/icons/oxygen/scalable/actions
+ at dirrmtry share/icons/oxygen/scalable
+ at dirrmtry share/icons/oxygen/64x64/actions
+ at dirrmtry share/icons/oxygen/64x64
+ at dirrmtry share/icons/oxygen/48x48/actions
+ at dirrmtry share/icons/oxygen/48x48
+ at dirrmtry share/icons/oxygen/32x32/actions
+ at dirrmtry share/icons/oxygen/32x32
+ at dirrmtry share/icons/oxygen/22x22/mimetypes
+ at dirrmtry share/icons/oxygen/22x22/apps
+ at dirrmtry share/icons/oxygen/22x22/actions
+ at dirrmtry share/icons/oxygen/22x22
+ at dirrmtry share/icons/oxygen/16x16/mimetypes
+ at dirrmtry share/icons/oxygen/16x16/actions
+ at dirrmtry share/icons/oxygen/16x16
+ at dirrmtry share/icons/oxygen/128x128/actions
+ at dirrmtry share/icons/oxygen/128x128
+ at dirrmtry share/icons/oxygen
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrm share/doc/HTML/en/krfb
+ at dirrm share/doc/HTML/en/krdc
+ at dirrm share/doc/HTML/en/kppp
+ at dirrm share/doc/HTML/en/kopete
+ at dirrm share/doc/HTML/en/knewsticker
+ at dirrm share/doc/HTML/en/kget
+ at dirrmtry share/doc/HTML/en
+ at dirrmtry share/doc/HTML
+ at dirrmtry share/dbus-1/interfaces
+ at dirrmtry share/dbus-1
+ at dirrmtry share/config.kcfg
+ at dirrmtry share/config
+ at dirrm share/apps/remoteview
+ at dirrm share/apps/krfb
+ at dirrm share/apps/krdc/pics
+ at dirrm share/apps/krdc
+ at dirrm share/apps/kppp/pics
+ at dirrm share/apps/kppp/Rules/Yugoslavia
+ at dirrm share/apps/kppp/Rules/Uruguay
+ at dirrm share/apps/kppp/Rules/United_Kingdom
+ at dirrm share/apps/kppp/Rules/Ukraine
+ at dirrm share/apps/kppp/Rules/Turkey
+ at dirrm share/apps/kppp/Rules/Switzerland
+ at dirrm share/apps/kppp/Rules/Sweden
+ at dirrm share/apps/kppp/Rules/Spain
+ at dirrm share/apps/kppp/Rules/South_Afrika
+ at dirrm share/apps/kppp/Rules/South_Africa
+ at dirrm share/apps/kppp/Rules/Slovenia
+ at dirrm share/apps/kppp/Rules/Slovakia
+ at dirrm share/apps/kppp/Rules/Singapore
+ at dirrm share/apps/kppp/Rules/Russia
+ at dirrm share/apps/kppp/Rules/Romania
+ at dirrm share/apps/kppp/Rules/Portugal
+ at dirrm share/apps/kppp/Rules/Poland
+ at dirrm share/apps/kppp/Rules/Norway
+ at dirrm share/apps/kppp/Rules/Netherlands
+ at dirrm share/apps/kppp/Rules/Malaysia
+ at dirrm share/apps/kppp/Rules/Macedonia
+ at dirrm share/apps/kppp/Rules/Luxembourg
+ at dirrm share/apps/kppp/Rules/Kazakhstan
+ at dirrm share/apps/kppp/Rules/Japan
+ at dirrm share/apps/kppp/Rules/Jamaica
+ at dirrm share/apps/kppp/Rules/Italy
+ at dirrm share/apps/kppp/Rules/Israel
+ at dirrm share/apps/kppp/Rules/Ireland
+ at dirrm share/apps/kppp/Rules/Indonesia
+ at dirrm share/apps/kppp/Rules/India
+ at dirrm share/apps/kppp/Rules/Iceland
+ at dirrm share/apps/kppp/Rules/Hungary
+ at dirrm share/apps/kppp/Rules/Hong_Kong
+ at dirrm share/apps/kppp/Rules/Greece
+ at dirrm share/apps/kppp/Rules/Germany
+ at dirrm share/apps/kppp/Rules/France
+ at dirrm share/apps/kppp/Rules/Finland
+ at dirrm share/apps/kppp/Rules/Estonia
+ at dirrm share/apps/kppp/Rules/Denmark
+ at dirrm share/apps/kppp/Rules/Czechia
+ at dirrm share/apps/kppp/Rules/Croatia
+ at dirrm share/apps/kppp/Rules/Brasil
+ at dirrm share/apps/kppp/Rules/Bosnia_and_Herzegovina
+ at dirrm share/apps/kppp/Rules/Belgium
+ at dirrm share/apps/kppp/Rules/Bangladesh
+ at dirrm share/apps/kppp/Rules/Austria/Standard
+ at dirrm share/apps/kppp/Rules/Austria/Minimum
+ at dirrm share/apps/kppp/Rules/Austria/Business_2
+ at dirrm share/apps/kppp/Rules/Austria/Business_1
+ at dirrm share/apps/kppp/Rules/Austria
+ at dirrm share/apps/kppp/Rules/Australia
+ at dirrm share/apps/kppp/Rules/Argentina
+ at dirrm share/apps/kppp/Rules
+ at dirrm share/apps/kppp/Provider/Yugoslavia
+ at dirrm share/apps/kppp/Provider/United_Kingdom
+ at dirrm share/apps/kppp/Provider/Ukraine
+ at dirrm share/apps/kppp/Provider/Taiwan
+ at dirrm share/apps/kppp/Provider/Switzerland
+ at dirrm share/apps/kppp/Provider/Sweden
+ at dirrm share/apps/kppp/Provider/Slovenia
+ at dirrm share/apps/kppp/Provider/Portugal
+ at dirrm share/apps/kppp/Provider/Norway
+ at dirrm share/apps/kppp/Provider/NewZealand
+ at dirrm share/apps/kppp/Provider/Netherlands
+ at dirrm share/apps/kppp/Provider/Irland
+ at dirrm share/apps/kppp/Provider/Germany
+ at dirrm share/apps/kppp/Provider/France
+ at dirrm share/apps/kppp/Provider/Denmark
+ at dirrm share/apps/kppp/Provider/Czech_Republic
+ at dirrm share/apps/kppp/Provider/Belarus
+ at dirrm share/apps/kppp/Provider/Austria
+ at dirrm share/apps/kppp/Provider
+ at dirrm share/apps/kppp
+ at dirrm share/apps/kopeterichtexteditpart
+ at dirrm share/apps/kopete_yahoo
+ at dirrm share/apps/kopete_translator
+ at dirrm share/apps/kopete_statistics
+ at dirrm share/apps/kopete_privacy
+ at dirrm share/apps/kopete_msn
+ at dirrm share/apps/kopete_latex
+ at dirrm share/apps/kopete_history
+ at dirrm share/apps/kopete_contactnotes
+ at dirrm share/apps/kopete/webpresence
+ at dirrm share/apps/kopete_groupwise
+ at dirrm share/apps/kopete_jabber
+ at dirrm share/apps/kopete_otr
+ at dirrm share/apps/kopete/styles/Retropete/Contents/Resources/Outgoing
+ at dirrm share/apps/kopete/styles/Retropete/Contents/Resources/Incoming
+ at dirrm share/apps/kopete/styles/Retropete/Contents/Resources
+ at dirrm share/apps/kopete/styles/Retropete/Contents
+ at dirrm share/apps/kopete/styles/Retropete
+ at dirrm share/apps/kopete/styles/Kopete/Contents/Resources/images
+ at dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Variants
+ at dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Outgoing
+ at dirrm share/apps/kopete/styles/Kopete/Contents/Resources/Incoming
+ at dirrm share/apps/kopete/styles/Kopete/Contents/Resources
+ at dirrm share/apps/kopete/styles/Kopete/Contents
+ at dirrm share/apps/kopete/styles/Kopete
+ at dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Variants/konqui
+ at dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Variants
+ at dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Outgoing
+ at dirrm share/apps/kopete/styles/Konqi/Contents/Resources/Incoming
+ at dirrm share/apps/kopete/styles/Konqi/Contents/Resources
+ at dirrm share/apps/kopete/styles/Konqi/Contents
+ at dirrm share/apps/kopete/styles/Konqi
+ at dirrm share/apps/kopete/styles/Hacker/Contents/Resources/images
+ at dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Variants
+ at dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Outgoing
+ at dirrm share/apps/kopete/styles/Hacker/Contents/Resources/Incoming
+ at dirrm share/apps/kopete/styles/Hacker/Contents/Resources
+ at dirrm share/apps/kopete/styles/Hacker/Contents
+ at dirrm share/apps/kopete/styles/Hacker
+ at dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Variants
+ at dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Outgoing
+ at dirrm share/apps/kopete/styles/Gaim/Contents/Resources/Incoming
+ at dirrm share/apps/kopete/styles/Gaim/Contents/Resources
+ at dirrm share/apps/kopete/styles/Gaim/Contents
+ at dirrm share/apps/kopete/styles/Gaim
+ at dirrm share/apps/kopete/styles/Clear/Contents/Resources/images
+ at dirrm share/apps/kopete/styles/Clear/Contents/Resources/Variants
+ at dirrm share/apps/kopete/styles/Clear/Contents/Resources/Outgoing
+ at dirrm share/apps/kopete/styles/Clear/Contents/Resources/Incoming
+ at dirrm share/apps/kopete/styles/Clear/Contents/Resources
+ at dirrm share/apps/kopete/styles/Clear/Contents
+ at dirrm share/apps/kopete/styles/Clear
+ at dirrm share/apps/kopete/styles/Clean/Contents/Resources/images
+ at dirrm share/apps/kopete/styles/Clean/Contents/Resources/Outgoing
+ at dirrm share/apps/kopete/styles/Clean/Contents/Resources/Incoming
+ at dirrm share/apps/kopete/styles/Clean/Contents/Resources
+ at dirrm share/apps/kopete/styles/Clean/Contents
+ at dirrm share/apps/kopete/styles/Clean
+ at dirrm share/apps/kopete/styles
+ at dirrm share/apps/kopete/icons/oxygen/64x64/apps
+ at dirrm share/apps/kopete/icons/oxygen/64x64/actions
+ at dirrm share/apps/kopete/icons/oxygen/64x64
+ at dirrm share/apps/kopete/icons/oxygen/48x48/apps
+ at dirrm share/apps/kopete/icons/oxygen/48x48/actions
+ at dirrm share/apps/kopete/icons/oxygen/48x48
+ at dirrm share/apps/kopete/icons/oxygen/32x32/apps
+ at dirrm share/apps/kopete/icons/oxygen/32x32/actions
+ at dirrm share/apps/kopete/icons/oxygen/32x32
+ at dirrm share/apps/kopete/icons/oxygen/22x22/apps
+ at dirrm share/apps/kopete/icons/oxygen/22x22/actions
+ at dirrm share/apps/kopete/icons/oxygen/22x22
+ at dirrm share/apps/kopete/icons/oxygen/16x16/apps
+ at dirrm share/apps/kopete/icons/oxygen/16x16/actions
+ at dirrm share/apps/kopete/icons/oxygen/16x16
+ at dirrm share/apps/kopete/icons/oxygen/128x128/apps
+ at dirrm share/apps/kopete/icons/oxygen/128x128
+ at dirrm share/apps/kopete/icons/oxygen
+ at dirrm share/apps/kopete/icons/hicolor/32x32/apps
+ at dirrm share/apps/kopete/icons/hicolor/32x32
+ at dirrm share/apps/kopete/icons/hicolor/16x16/apps
+ at dirrm share/apps/kopete/icons/hicolor/16x16/actions
+ at dirrm share/apps/kopete/icons/hicolor/16x16
+ at dirrm share/apps/kopete/icons/hicolor
+ at dirrm share/apps/kopete/icons/crystalsvg/64x64/actions
+ at dirrm share/apps/kopete/icons/crystalsvg/64x64
+ at dirrm share/apps/kopete/icons/crystalsvg/48x48/actions
+ at dirrm share/apps/kopete/icons/crystalsvg/48x48
+ at dirrm share/apps/kopete/icons/crystalsvg/32x32/actions
+ at dirrm share/apps/kopete/icons/crystalsvg/32x32
+ at dirrm share/apps/kopete/icons/crystalsvg/22x22/actions
+ at dirrm share/apps/kopete/icons/crystalsvg/22x22
+ at dirrm share/apps/kopete/icons/crystalsvg/16x16/actions
+ at dirrm share/apps/kopete/icons/crystalsvg/16x16
+ at dirrm share/apps/kopete/icons/crystalsvg
+ at dirrm share/apps/kopete/icons
+ at dirrm share/apps/kopete
+ at dirrmtry share/apps/khtml/kpartplugins
+ at dirrmtry share/apps/khtml
+ at dirrm share/apps/kget/www
+ at dirrm share/apps/kget/pics
+ at dirrm share/apps/kget
+ at dirrmtry share/apps/kconf_update
+ at dirrmtry share/apps/desktoptheme/default/widgets
+ at dirrmtry share/apps/desktoptheme/default
+ at dirrmtry share/apps/desktoptheme
+ at dirrmtry share/applications/kde4
+ at dirrmtry share/applications
+ at dirrm include/kopete/ui
+ at dirrm include/kopete
--- /dev/null
+++ net/kdenetwork4/Makefile
@@ -0,0 +1,36 @@
+#
+# $MidnightBSD: mports/net/kdenetwork4/Makefile,v 1.1 2009/01/04 04:31:18 ctriv Exp $
+
+PORTNAME=	kdenetwork
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	net kde ipv6
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	KDE Network applications
+LICENSE=	gpl2
+
+LIB_DEPENDS=	slp:${PORTSDIR}/net/openslp \
+		idn:${PORTSDIR}/dns/libidn \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		qca.2:${PORTSDIR}/devel/qca \
+		otr.4:${PORTSDIR}/security/libotr \
+		vncserver.0:${PORTSDIR}/net/libvncserver
+RUN_DEPENDS=	qca-ossl>=2.0.0.b3:${PORTSDIR}/security/qca-ossl
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_BZIP2=	yes
+USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+USE_SQLITE=	yes
+QT_COMPONENTS=	corelib opengl moc rcc uic dbus qt3support gui network porting uic3 xml
+USE_OPENSSL=	yes
+
+post-extract:
+	${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ net/kdenetwork4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdenetwork-4.1.3.tar.bz2) = 0a560e1c117049735542a89692480679
+SHA256 (KDE/kdenetwork-4.1.3.tar.bz2) = c23662be3a3802a8a6a9f67ceff98cd5a901041de304eb18649254a33a547f85
+SIZE (KDE/kdenetwork-4.1.3.tar.bz2) = 7385927

From ctriv at midnightbsd.org  Sat Jan  3 23:32:10 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 23:32:10 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add kdenetwork4
Message-ID: <200901040432.n044WAYh077122@stargazer.midnightbsd.org>

Log Message:
-----------
add kdenetwork4

Modified Files:
--------------
    mports/net:
        Makefile (r1.93 -> r1.94)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net/Makefile,v
retrieving revision 1.93
retrieving revision 1.94
diff -L net/Makefile -L net/Makefile -u -r1.93 -r1.94
--- net/Makefile
+++ net/Makefile
@@ -32,6 +32,7 @@
     SUBDIR += iwi-firmware
     SUBDIR += jags
     SUBDIR += kdenetwork3
+    SUBDIR += kdenetwork4
     SUBDIR += ldap2dns
     SUBDIR += ldapdiff
     SUBDIR += libdnet

From ctriv at midnightbsd.org  Sun Jan  4 01:02:09 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 01:02:09 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: audio/flac: Update to 1.2.1
Message-ID: <200901040602.n04629QL085519@stargazer.midnightbsd.org>

Log Message:
-----------
Update to 1.2.1

Modified Files:
--------------
    mports/audio/flac:
        Makefile (r1.5 -> r1.6)
        distinfo (r1.2 -> r1.3)
        pkg-descr (r1.1 -> r1.2)
        pkg-plist (r1.1 -> r1.2)
    mports/audio/flac/files:
        patch-Makefile.in (r1.1 -> r1.2)
        patch-configure (r1.1 -> r1.2)
        patch-man_flac.1 (r1.1 -> r1.2)
        patch-src_libFLAC_Makefile.in (r1.1 -> r1.2)

Removed Files:
-------------
    mports/audio/flac/files:
        patch-doc_Makefile.in
        patch-doc_html_Makefile.in
        patch-doc_html_images_Makefile.in
        patch-doc_html_ru_Makefile.in
        patch-src_libFLAC++_metadata.cpp
        patch-src_libFLAC_bitbuffer.c
        patch-src_libFLAC_cpu.c
        patch-src_libFLAC_file__decoder.c
        patch-src_libFLAC_file__encoder.c
        patch-src_libFLAC_format.c
        patch-src_libFLAC_include_private_md5.h
        patch-src_libFLAC_md5.c
        patch-src_libFLAC_memory.c
        patch-src_libFLAC_metadata__iterators.c
        patch-src_libFLAC_metadata__object.c
        patch-src_libFLAC_stream__decoder.c
        patch-src_libFLAC_stream__encoder.c
        patch-src_libOggFLAC_file__decoder.c
        patch-src_libOggFLAC_file__encoder.c
        patch-src_libOggFLAC_ogg__helper.c
        patch-src_metaflac_operations.c
        patch-src_metaflac_options.c
        patch-src_metaflac_utils.c
        patch-src_plugin__common_charset.c
        patch-src_plugin__common_tags.c
        patch-src_share_utf8_charset.c
        patch-src_share_utf8_iconvert.c
        patch-src_share_utf8_utf8.c

-------------- next part --------------
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/audio/flac/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/flac/pkg-descr -L audio/flac/pkg-descr -u -r1.1 -r1.2
--- audio/flac/pkg-descr
+++ audio/flac/pkg-descr
@@ -2,10 +2,8 @@
 
 FLAC is comprised of
 * libFLAC, a library which implements reference encoders and
-  decoders, and a metadata interface
+  decoders for native FLAC and Ogg FLAC, and a metadata interface
 * libFLAC++, a C++ object wrapper library around libFLAC
-* libOggFLAC and libOggFLAC++, which provide encoders and
-  decoders for FLAC streams in an Ogg container
 * flac, a command-line program for encoding and decoding files
 * metaflac, a command-line program for viewing and editing FLAC
   metadata
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/audio/flac/pkg-plist,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/flac/pkg-plist -L audio/flac/pkg-plist -u -r1.1 -r1.2
--- audio/flac/pkg-plist
+++ audio/flac/pkg-plist
@@ -1,4 +1,4 @@
- at comment $FreeBSD: ports/audio/flac/pkg-plist,v 1.13 2006/02/23 10:34:27 ade Exp $
+ at comment $FreeBSD: ports/audio/flac/pkg-plist,v 1.14 2008/04/07 20:37:14 naddy Exp $
 bin/flac
 bin/metaflac
 include/FLAC++/all.h
@@ -10,218 +10,161 @@
 include/FLAC/assert.h
 include/FLAC/callback.h
 include/FLAC/export.h
-include/FLAC/file_decoder.h
-include/FLAC/file_encoder.h
 include/FLAC/format.h
 include/FLAC/metadata.h
 include/FLAC/ordinals.h
-include/FLAC/seekable_stream_decoder.h
-include/FLAC/seekable_stream_encoder.h
 include/FLAC/stream_decoder.h
 include/FLAC/stream_encoder.h
-include/OggFLAC++/all.h
-include/OggFLAC++/decoder.h
-include/OggFLAC++/encoder.h
-include/OggFLAC++/export.h
-include/OggFLAC/all.h
-include/OggFLAC/export.h
-include/OggFLAC/file_decoder.h
-include/OggFLAC/file_encoder.h
-include/OggFLAC/seekable_stream_decoder.h
-include/OggFLAC/seekable_stream_encoder.h
-include/OggFLAC/stream_decoder.h
-include/OggFLAC/stream_encoder.h
 lib/libFLAC++.a
 lib/libFLAC++.la
 lib/libFLAC++.so
-lib/libFLAC++.so.5
+lib/libFLAC++.so.8
 lib/libFLAC.a
 lib/libFLAC.la
 lib/libFLAC.so
-lib/libFLAC.so.7
-lib/libOggFLAC++.a
-lib/libOggFLAC++.la
-lib/libOggFLAC++.so
-lib/libOggFLAC++.so.2
-lib/libOggFLAC.a
-lib/libOggFLAC.la
-lib/libOggFLAC.so
-lib/libOggFLAC.so.3
+lib/libFLAC.so.10
+libdata/pkgconfig/flac++.pc
+libdata/pkgconfig/flac.pc
 share/aclocal/libFLAC++.m4
 share/aclocal/libFLAC.m4
-share/aclocal/libOggFLAC++.m4
-share/aclocal/libOggFLAC.m4
 %%PORTDOCS%%%%DOCSDIR%%/FLAC.tag
+%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2all_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/+_2export_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/+_2metadata_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC++_2export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2file__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2file__encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2seekable__stream__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2seekable__stream__encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/FLAC_2stream__encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC++_2export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2all_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2export_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2file__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2file__encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2seekable__stream__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2seekable__stream__encoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__decoder_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/OggFLAC_2stream__encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/all_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/annotated.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/assert_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/callback_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1SeekableStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1SeekableStream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1File.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream.png
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Decoder_1_1Stream_1_1State.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1SeekableStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1SeekableStream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1File.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream.png
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Encoder_1_1Stream_1_1State.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Application.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Chain_1_1Status.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1CueSheet_1_1Track.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Iterator.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Padding.png
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Picture.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Prototype.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SeekTable.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1SimpleIterator_1_1Status.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1StreamInfo.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1Unknown.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment.png
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classFLAC_1_1Metadata_1_1VorbisComment_1_1Entry.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1File-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1SeekableStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Decoder_1_1Stream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1File-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1File.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1SeekableStream.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/classOggFLAC_1_1Encoder_1_1Stream.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/classes.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000000.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000001.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dir_000002.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/dirs.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.gif
-%%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/file__decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/doxygen.png
+%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/encoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/export_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/files.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/format_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/functions.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/functions_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/globals.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x66.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_0x67.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_defs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_enum.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_eval.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_func.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_type.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/globals_vars.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__callbacks.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__file__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__file__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__export.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__format.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__level2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__metadata__object.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__seekable__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__seekable__stream__encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flac__stream__encoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__decoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__file__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__file__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__export.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level1.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__level2.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__metadata__object.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__seekable__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__seekable__stream__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__flacpp__stream__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__file__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__seekable__stream__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflac__stream__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__file__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__file__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__seekable__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__seekable__stream__encoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__decoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/group__oggflacpp__stream__encoder.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__2__to__1__1__3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__3__to__1__1__4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/group__porting__1__1__4__to__1__2__0.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/hierarchy.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/index.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h-source.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/metadata_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/modules.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/ordinals_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/seekable__stream__decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__decoder_8h.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h-source.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/stream__encoder_8h.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRice.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____EntropyCodingMethod__PartitionedRiceContents.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileDecoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileDecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileEncoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FileEncoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Frame.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameFooter-members.html
@@ -230,10 +173,6 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____FrameHeader.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____IOCallbacks.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamDecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamEncoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____SeekableStreamEncoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamDecoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamEncoder-members.html
@@ -250,6 +189,8 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__CueSheet__Track.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Padding.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture-members.html
+%%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__Picture.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekPoint.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____StreamMetadata__SeekTable-members.html
@@ -272,30 +213,78 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__LPC.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim-members.html
 %%PORTDOCS%%%%DOCSDIR%%/html/api/structFLAC____Subframe__Verbatim.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____FileEncoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____FileEncoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____SeekableStreamEncoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____SeekableStreamEncoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamDecoder.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder-members.html
-%%PORTDOCS%%%%DOCSDIR%%/html/api/structOggFLAC____StreamEncoder.html
 %%PORTDOCS%%%%DOCSDIR%%/html/changelog.html
 %%PORTDOCS%%%%DOCSDIR%%/html/comparison.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__chopin_prelude_24.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__dream_theater_600.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__eddie_warner_titus.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__fanfare_de_l_eventail_de_jeanne.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__gloria_estefan_conga.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__hand_in_my_pocket.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__l_sub_raga_sivapriya.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__laetatus_sum.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__mummified_in_barbed_wire.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__prokofiev_pcon3_3.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__ravel_sq4_4.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__scarlatti_k42.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__tool_forty_six_and_2.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison__white_room.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpudectime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_cpuenctime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procdectime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_procenctime.html
+%%PORTDOCS%%%%DOCSDIR%%/html/comparison_all_ratio.html
 %%PORTDOCS%%%%DOCSDIR%%/html/developers.html
 %%PORTDOCS%%%%DOCSDIR%%/html/documentation.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_bugs.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_example_code.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_format_overview.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tasks.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_flac.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_metaflac.html
+%%PORTDOCS%%%%DOCSDIR%%/html/documentation_tools_plugins.html
 %%PORTDOCS%%%%DOCSDIR%%/html/download.html
 %%PORTDOCS%%%%DOCSDIR%%/html/faq.html
 %%PORTDOCS%%%%DOCSDIR%%/html/favicon.ico
 %%PORTDOCS%%%%DOCSDIR%%/html/features.html
+%%PORTDOCS%%%%DOCSDIR%%/html/flac.css
 %%PORTDOCS%%%%DOCSDIR%%/html/format.html
-%%PORTDOCS%%%%DOCSDIR%%/html/goals.html
 %%PORTDOCS%%%%DOCSDIR%%/html/id.html
 %%PORTDOCS%%%%DOCSDIR%%/html/images/1x1.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/images/cafebug.gif
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Blackbird_Front_low3_325x87.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MS300frontsmall_270x108.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/MediaBox_Frt_170x325.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/SB_Hero_Black_325x182.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Sooloos-ControlOne_325x328.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/Z500_front_325x94.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/a2_01_325x252.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/arcus_325x135.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/bmp-1430_325x241.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/cs505_front_lrg_325x113.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/enus_3-4lft-hires_product_eva8000_325x127.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/escient_ProductLine_325x163.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/hifidelio_bl_front_Z_RGB_325x163.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/i-station-mini-dx_325x237.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/iwod-g10_325x257.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/knc_hr-2800_325x209.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/mediaready_prodmain_MRMCa_325x232.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/meizu_m6_325x206.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/musica_artwork_325x90.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/neodigits_x5000_325x124.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/onda-vx737_325x240.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/request_n_front_325x103.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/rio_karma_279x254.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/sonos_family_RGB_325x200.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/teclast-tl29_325x244.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/transporter_hero_grey_325x208.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/tvix-4000_325x204.jpg
+%%PORTDOCS%%%%DOCSDIR%%/html/images/hw/vibez_nofm_combi_black_b_325x220.jpg
 %%PORTDOCS%%%%DOCSDIR%%/html/images/logo100.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/images/logo130.gif
 %%PORTDOCS%%%%DOCSDIR%%/html/index.html
+%%PORTDOCS%%%%DOCSDIR%%/html/itunes.html
 %%PORTDOCS%%%%DOCSDIR%%/html/license.html
 %%PORTDOCS%%%%DOCSDIR%%/html/links.html
 %%PORTDOCS%%%%DOCSDIR%%/html/news.html
@@ -313,11 +302,10 @@
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/links.html
 %%PORTDOCS%%%%DOCSDIR%%/html/ru/news.html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/ru
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images/hw
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/images
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html/api
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/html
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
- at dirrm include/OggFLAC++
- at dirrm include/OggFLAC
 @dirrm include/FLAC++
 @dirrm include/FLAC
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/audio/flac/Makefile,v
retrieving revision 1.5
retrieving revision 1.6
diff -L audio/flac/Makefile -L audio/flac/Makefile -u -r1.5 -r1.6
--- audio/flac/Makefile
+++ audio/flac/Makefile
@@ -1,20 +1,12 @@
-# New ports collection makefile for:	flac
-# Date created:		Mar 18, 2001
-# Whom:			Ying-Chieh Liao 
 #
 # $MidnightBSD$
-# $FreeBSD: ports/audio/flac/Makefile,v 1.38 2006/05/03 05:14:16 edwin Exp $
 #
 
 PORTNAME=	flac
-PORTVERSION=	1.1.2
-PORTREVISION=	2
+PORTVERSION=	1.2.1
 CATEGORIES=	audio
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:sf/} \
-		${MASTER_SITE_FREEBSD_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	${PORTNAME}/:sf naddy/:local
-DISTFILES=	${EXTRACT_ONLY}:sf flac-alloc.h:local
-EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports at MidnightBSD.org
 COMMENT=	Free lossless audio codec
@@ -23,19 +15,26 @@
 LIB_DEPENDS=	ogg.5:${PORTSDIR}/audio/libogg
 
 USE_AUTOTOOLS=	libtool:15
-USE_ICONV=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=	--target=${ARCH}-unknown-freebsd6.0
 CONFIGURE_ARGS=	--enable-sse \
-		--with-libiconv-prefix="${LOCALBASE}" \
-		--with-ogg="${LOCALBASE}"
-CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include" \
-		ac_cv_path_XMMS_CONFIG=no
+		--with-ogg="${LOCALBASE}" \
+		--disable-thorough-tests \
+		--disable-xmms-plugin
+CONFIGURE_ENV=	CPPFLAGS="-I${WRKSRC}/include"
+
+.if !defined(WITHOUT_ICONV)
+USE_ICONV=	yes
+CONFIGURE_ARGS+=--with-libiconv-prefix="${LOCALBASE}"
+.else
+CONFIGURE_ARGS+=--without-libiconv-prefix
+.endif
 
+MAKE_ARGS=	pkgconfigdir="${PREFIX}/libdata/pkgconfig"
+MAKE_ENV=	MAKEOBJDIR=/nonexistent		# ignore ${WRKSRC}/obj
 .if defined(NOPORTDOCS)
-MAKE_ENV=	DOC=""
+MAKE_ENV+=	DOC=""
 .else
-MAKE_ENV=	DOC=doc
+MAKE_ENV+=	DOC=doc
 .endif
 
 USE_LDCONFIG=	yes
@@ -44,20 +43,17 @@
 .include 
 
 .if ${ARCH} == "i386"
-BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
+BUILD_DEPENDS+=	nasm:${PORTSDIR}/devel/nasm
 .endif
 
-post-extract:
-	@${CP} ${DISTDIR}/flac-alloc.h ${WRKSRC}/include/share/alloc.h
-
-# "obj" is magic to our make(1)
-post-configure:
-	@${RM} -rf ${WRKSRC}/obj
+pre-patch:
+	@${REINPLACE_CMD} 's:^docdir = $$(datadir)/doc/$$(PACKAGE)-$$(VERSION):docdir = $$(datadir)/doc/$$(PACKAGE):' \
+		`find ${WRKSRC}/doc -name Makefile.in`
 
 post-build:
 	${REINPLACE_CMD} 's:%%PREFIX%%:${PREFIX}:' ${WRKSRC}/man/flac.1
 
-test: build
-	@cd ${WRKSRC}; ${MAKE} check
+regression-test: build
+	@cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} check
 
 .include 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/audio/flac/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L audio/flac/distinfo -L audio/flac/distinfo -u -r1.2 -r1.3
--- audio/flac/distinfo
+++ audio/flac/distinfo
@@ -1,6 +1,3 @@
-MD5 (flac-1.1.2.tar.gz) = 2bfc127cdda02834d0491ab531a20960
-SHA256 (flac-1.1.2.tar.gz) = ce4f7d11b3c04a7368c916ca4abc284dd0c0256f461dfb7f07df1ab445e7a5c0
-SIZE (flac-1.1.2.tar.gz) = 1516235
-MD5 (flac-alloc.h) = 08891390039e2aee9bd4335f784467db
-SHA256 (flac-alloc.h) = da40afc663e5b3fe6dccd1a0f1c218b7ec02d3699d72b41d6978696896d7df98
-SIZE (flac-alloc.h) = 5697
+MD5 (flac-1.2.1.tar.gz) = 153c8b15a54da428d1f0fadc756c22c7
+SHA256 (flac-1.2.1.tar.gz) = 9635a44bceb478bbf2ee8a785cf6986fba525afb5fad1fd4bba73cf71f2d3edf
+SIZE (flac-1.2.1.tar.gz) = 2009217
--- audio/flac/files/patch-src_libFLAC_stream__decoder.c
+++ /dev/null
@@ -1,121 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_stream__decoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/stream_decoder.c.orig
-+++ src/libFLAC/stream_decoder.c
-@@ -46,6 +46,7 @@
- #ifdef HAVE_CONFIG_H
- #include 
- #endif
-+#include "share/alloc.h"
- 
- #ifdef max
- #undef max
-@@ -214,7 +215,7 @@
- 	}
- 
- 	decoder->private_->metadata_filter_ids_capacity = 16;
--	if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)malloc((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8) * decoder->private_->metadata_filter_ids_capacity))) {
-+	if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_malloc_mul_2op_((FLAC__STREAM_METADATA_APPLICATION_ID_LEN/8), /*times*/decoder->private_->metadata_filter_ids_capacity))) {
- 		FLAC__bitbuffer_delete(decoder->private_->input);
- 		free(decoder->private_);
- 		free(decoder->protected_);
-@@ -455,7 +456,7 @@
- 	FLAC__ASSERT(0 != decoder->private_->metadata_filter_ids);
- 
- 	if(decoder->private_->metadata_filter_ids_count == decoder->private_->metadata_filter_ids_capacity) {
--		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)realloc(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity * 2)))
-+		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2)))
- 			return decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 		decoder->private_->metadata_filter_ids_capacity *= 2;
- 	}
-@@ -512,7 +513,7 @@
- 	FLAC__ASSERT(0 != decoder->private_->metadata_filter_ids);
- 
- 	if(decoder->private_->metadata_filter_ids_count == decoder->private_->metadata_filter_ids_capacity) {
--		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)realloc(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity * 2)))
-+		if(0 == (decoder->private_->metadata_filter_ids = (FLAC__byte*)safe_realloc_mul_2op_(decoder->private_->metadata_filter_ids, decoder->private_->metadata_filter_ids_capacity, /*times*/2)))
- 			return decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 		decoder->private_->metadata_filter_ids_capacity *= 2;
- 	}
-@@ -804,7 +805,7 @@
- 		 * (at negative indices) for alignment purposes; we use 4
- 		 * to keep the data well-aligned.
- 		 */
--		tmp = (FLAC__int32*)malloc(sizeof(FLAC__int32)*(size+4));
-+		tmp = (FLAC__int32*)safe_malloc_mul_2op_(sizeof(FLAC__int32), /*times*/(size+4));
- 		if(tmp == 0) {
- 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 			return false;
-@@ -967,7 +968,7 @@
- 				case FLAC__METADATA_TYPE_APPLICATION:
- 					/* remember, we read the ID already */
- 					if(real_length > 0) {
--						if(0 == (block.data.application.data = (FLAC__byte*)malloc(real_length))) {
-+						if(0 == (block.data.application.data = (FLAC__byte*)safe_malloc_(real_length))) {
- 							decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 							return false;
- 						}
-@@ -991,7 +992,7 @@
- 					break;
- 				default:
- 					if(real_length > 0) {
--						if(0 == (block.data.unknown.data = (FLAC__byte*)malloc(real_length))) {
-+						if(0 == (block.data.unknown.data = (FLAC__byte*)safe_malloc_(real_length))) {
- 							decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 							return false;
- 						}
-@@ -1132,7 +1133,7 @@
- 	decoder->private_->seek_table.data.seek_table.num_points = length / FLAC__STREAM_METADATA_SEEKPOINT_LENGTH;
- 
- 	/* use realloc since we may pass through here several times (e.g. after seeking) */
--	if(0 == (decoder->private_->seek_table.data.seek_table.points = (FLAC__StreamMetadata_SeekPoint*)realloc(decoder->private_->seek_table.data.seek_table.points, decoder->private_->seek_table.data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint)))) {
-+	if(0 == (decoder->private_->seek_table.data.seek_table.points = (FLAC__StreamMetadata_SeekPoint*)safe_realloc_mul_2op_(decoder->private_->seek_table.data.seek_table.points, decoder->private_->seek_table.data.seek_table.num_points, /*times*/sizeof(FLAC__StreamMetadata_SeekPoint)))) {
- 		decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 		return false;
- 	}
-@@ -1171,7 +1172,7 @@
- 	if(!FLAC__bitbuffer_read_raw_uint32_little_endian(decoder->private_->input, &obj->vendor_string.length, read_callback_, decoder))
- 		return false; /* the read_callback_ sets the state for us */
- 	if(obj->vendor_string.length > 0) {
--		if(0 == (obj->vendor_string.entry = (FLAC__byte*)malloc(obj->vendor_string.length+1))) {
-+		if(0 == (obj->vendor_string.entry = (FLAC__byte*)safe_malloc_add_2op_(obj->vendor_string.length, /*+*/1))) {
- 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 			return false;
- 		}
-@@ -1189,7 +1190,7 @@
- 
- 	/* read comments */
- 	if(obj->num_comments > 0) {
--		if(0 == (obj->comments = (FLAC__StreamMetadata_VorbisComment_Entry*)malloc(obj->num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
-+		if(0 == (obj->comments = (FLAC__StreamMetadata_VorbisComment_Entry*)safe_malloc_mul_2op_(obj->num_comments, /*times*/sizeof(FLAC__StreamMetadata_VorbisComment_Entry)))) {
- 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 			return false;
- 		}
-@@ -1198,7 +1199,7 @@
- 			if(!FLAC__bitbuffer_read_raw_uint32_little_endian(decoder->private_->input, &obj->comments[i].length, read_callback_, decoder))
- 				return false; /* the read_callback_ sets the state for us */
- 			if(obj->comments[i].length > 0) {
--				if(0 == (obj->comments[i].entry = (FLAC__byte*)malloc(obj->comments[i].length+1))) {
-+				if(0 == (obj->comments[i].entry = (FLAC__byte*)safe_malloc_add_2op_(obj->comments[i].length, /*+*/1))) {
- 					decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 					return false;
- 				}
-@@ -1244,7 +1245,7 @@
- 	obj->num_tracks = x;
- 
- 	if(obj->num_tracks > 0) {
--		if(0 == (obj->tracks = (FLAC__StreamMetadata_CueSheet_Track*)calloc(obj->num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)))) {
-+		if(0 == (obj->tracks = (FLAC__StreamMetadata_CueSheet_Track*)safe_calloc_(obj->num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track)))) {
- 			decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 			return false;
- 		}
-@@ -1277,7 +1278,7 @@
- 			track->num_indices = (FLAC__byte)x;
- 
- 			if(track->num_indices > 0) {
--				if(0 == (track->indices = (FLAC__StreamMetadata_CueSheet_Index*)calloc(track->num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)))) {
-+				if(0 == (track->indices = (FLAC__StreamMetadata_CueSheet_Index*)safe_calloc_(track->num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index)))) {
- 					decoder->protected_->state = FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR;
- 					return false;
- 				}
Index: patch-man_flac.1
===================================================================
RCS file: /home/cvs/mports/audio/flac/files/patch-man_flac.1,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/flac/files/patch-man_flac.1 -L audio/flac/files/patch-man_flac.1 -u -r1.1 -r1.2
--- audio/flac/files/patch-man_flac.1
+++ audio/flac/files/patch-man_flac.1
@@ -1,15 +1,14 @@
 
-$FreeBSD: ports/audio/flac/files/patch-man_flac.1,v 1.2 2005/03/16 14:49:23 naddy Exp $
+$FreeBSD: ports/audio/flac/files/patch-man_flac.1,v 1.3 2008/04/07 20:37:14 naddy Exp $
 
 --- man/flac.1.orig
 +++ man/flac.1
-@@ -397,8 +397,7 @@
+@@ -325,7 +325,7 @@
  .PP
- The programs are documented fully by HTML format
- documentation, available in
--\fI/usr/share/doc/flac/html\fR on
--Debian GNU/Linux systems.
-+\fI%%PREFIX%%/share/doc/flac/html\fR.
+ metaflac(1).
+ .PP
+-The programs are documented fully by HTML format documentation, available in \fI/usr/share/doc/flac/html\fR on Debian GNU/Linux systems.
++The programs are documented fully by HTML format documentation, available in \fI%%PREFIX%%/share/doc/flac/html\fR.
  .SH "AUTHOR"
  .PP
- This manual page was written by Matt Zimmerman  for
+ This manual page was written by Matt Zimmerman  for the Debian GNU/Linux system (but may be used by others).
--- audio/flac/files/patch-doc_html_ru_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_html_ru_Makefile.in,v 1.2 2005/03/16 14:49:23 naddy Exp $
-
---- doc/html/ru/Makefile.in.orig
-+++ doc/html/ru/Makefile.in
-@@ -226,7 +226,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/ru
-+docdir = $(datadir)/doc/$(PACKAGE)/html/ru
- doc_DATA = \
- 	authors.html \
- 	comparison.html \
--- audio/flac/files/patch-doc_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_Makefile.in,v 1.3 2005/03/16 14:49:23 naddy Exp $
-
---- doc/Makefile.in.orig
-+++ doc/Makefile.in
-@@ -236,7 +236,7 @@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
- SUBDIRS = . html
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)
-+docdir = $(datadir)/doc/$(PACKAGE)
- doc_DATA = \
- 	FLAC.tag
- 
--- audio/flac/files/patch-src_libFLAC_include_private_md5.h
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_include_private_md5.h,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/include/private/md5.h.orig
-+++ src/libFLAC/include/private/md5.h
-@@ -41,7 +41,7 @@
- 	FLAC__uint32 bytes[2];
- 	FLAC__uint32 in[16];
- 	FLAC__byte *internal_buf;
--	unsigned capacity;
-+	size_t capacity;
- };
- 
- FLAC_API void FLAC__MD5Init(struct FLAC__MD5Context *context);
--- audio/flac/files/patch-src_metaflac_operations.c
+++ /dev/null
@@ -1,24 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_metaflac_operations.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/metaflac/operations.c.orig
-+++ src/metaflac/operations.c
-@@ -21,6 +21,7 @@
- #include "utils.h"
- #include "FLAC/assert.h"
- #include "FLAC/metadata.h"
-+#include "share/alloc.h"
- #include "share/grabbag.h"
- #include 
- #include 
-@@ -430,8 +431,8 @@
- 	}
- 
- 	if(
--		0 == (title_gains = (float*)malloc(sizeof(float) * num_files)) ||
--		0 == (title_peaks = (float*)malloc(sizeof(float) * num_files))
-+		0 == (title_gains = (float*)safe_malloc_mul_2op_(sizeof(float), /*times*/num_files)) ||
-+		0 == (title_peaks = (float*)safe_malloc_mul_2op_(sizeof(float), /*times*/num_files))
- 	)
- 		die("out of memory allocating space for title gains/peaks");
- 
--- audio/flac/files/patch-src_libFLAC_stream__encoder.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_stream__encoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/stream_encoder.c.orig
-+++ src/libFLAC/stream_encoder.c
-@@ -50,6 +50,7 @@
- #ifdef HAVE_CONFIG_H
- #include 
- #endif
-+#include "share/alloc.h"
- 
- #ifdef min
- #undef min
-@@ -836,7 +837,7 @@
- 		 */
- 		encoder->private_->verify.input_fifo.size = encoder->protected_->blocksize;
- 		for(i = 0; i < encoder->protected_->channels; i++) {
--			if(0 == (encoder->private_->verify.input_fifo.data[i] = (FLAC__int32*)malloc(sizeof(FLAC__int32) * encoder->private_->verify.input_fifo.size)))
-+			if(0 == (encoder->private_->verify.input_fifo.data[i] = (FLAC__int32*)safe_malloc_mul_2op_(sizeof(FLAC__int32), /*times*/encoder->private_->verify.input_fifo.size)))
- 				return encoder->protected_->state = FLAC__STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
- 		}
- 		encoder->private_->verify.input_fifo.tail = 0;
--- audio/flac/files/patch-src_libOggFLAC_file__decoder.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libOggFLAC_file__decoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libOggFLAC/file_decoder.c.orig
-+++ src/libOggFLAC/file_decoder.c
-@@ -43,6 +43,7 @@
- #include "FLAC/assert.h"
- #include "protected/file_decoder.h"
- #include "protected/seekable_stream_decoder.h"
-+#include "share/alloc.h"
- 
- /***********************************************************************
-  *
-@@ -248,7 +249,7 @@
- 		decoder->private_->filename = 0;
- 	}
- 	if(0 != strcmp(value, "-")) {
--		if(0 == (decoder->private_->filename = (char*)malloc(strlen(value)+1))) {
-+		if(0 == (decoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
- 			decoder->protected_->state = OggFLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR;
- 			return false;
- 		}
Index: patch-src_libFLAC_Makefile.in
===================================================================
RCS file: /home/cvs/mports/audio/flac/files/patch-src_libFLAC_Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/flac/files/patch-src_libFLAC_Makefile.in -L audio/flac/files/patch-src_libFLAC_Makefile.in -u -r1.1 -r1.2
--- audio/flac/files/patch-src_libFLAC_Makefile.in
+++ audio/flac/files/patch-src_libFLAC_Makefile.in
@@ -1,13 +1,13 @@
 
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_Makefile.in,v 1.1 2007/03/27 15:05:59 naddy Exp $
+$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_Makefile.in,v 1.2 2008/04/07 20:37:14 naddy Exp $
 
 --- src/libFLAC/Makefile.in.orig
 +++ src/libFLAC/Makefile.in
-@@ -304,7 +304,6 @@
- @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ia32/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/gas/libFLAC-asm.la
- @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at libFLAC_la_LIBADD = ppc/as/libFLAC-asm.la
-- at FLaC__CPU_PPC_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
- SUBDIRS = $(ARCH_SUBDIRS) include .
- m4datadir = $(datadir)/aclocal
- m4data_DATA = libFLAC.m4
+@@ -249,7 +249,6 @@
+ @FLaC__CPU_IA32_TRUE@@FLaC__HAS_NASM_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LIBADD = ia32/libFLAC-asm.la
+ @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LIBADD = ppc/as/libFLAC-asm.la
+ @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LIBADD = ppc/gas/libFLAC-asm.la
+- at FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LDFLAGS = "-Wl,-read_only_relocs,warning"
+ @FLaC__CPU_PPC_TRUE@@FLaC__HAS_AS__TEMPORARILY_DISABLED_FALSE@@FLaC__HAS_GAS__TEMPORARILY_DISABLED_TRUE@@FLaC__NO_ASM_FALSE at LOCAL_EXTRA_LDFLAGS = ""
+ 
+ libFLAC_la_LIBADD = $(LOCAL_EXTRA_LIBADD) @OGG_LIBS@
--- audio/flac/files/patch-src_libOggFLAC_file__encoder.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libOggFLAC_file__encoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libOggFLAC/file_encoder.c.orig
-+++ src/libOggFLAC/file_encoder.c
-@@ -35,6 +35,7 @@
- #include "FLAC/assert.h"
- #include "OggFLAC/seekable_stream_encoder.h"
- #include "protected/file_encoder.h"
-+#include "share/alloc.h"
- 
- #ifdef max
- #undef max
-@@ -450,7 +451,7 @@
- 		free(encoder->private_->filename);
- 		encoder->private_->filename = 0;
- 	}
--	if(0 == (encoder->private_->filename = (char*)malloc(strlen(value)+1))) {
-+	if(0 == (encoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
- 		encoder->protected_->state = OggFLAC__FILE_ENCODER_MEMORY_ALLOCATION_ERROR;
- 		return false;
- 	}
--- audio/flac/files/patch-src_metaflac_options.c
+++ /dev/null
@@ -1,66 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_metaflac_options.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/metaflac/options.c.orig
-+++ src/metaflac/options.c
-@@ -20,6 +20,7 @@
- #include "usage.h"
- #include "utils.h"
- #include "FLAC/assert.h"
-+#include "share/alloc.h"
- #include 
- #include 
- #include 
-@@ -183,7 +184,7 @@
- 
- 	if(options->num_files > 0) {
- 		unsigned i = 0;
--		if(0 == (options->filenames = (char**)malloc(sizeof(char*) * options->num_files)))
-+		if(0 == (options->filenames = (char**)safe_malloc_mul_2op_(sizeof(char*), /*times*/options->num_files)))
- 			die("out of memory allocating space for file names list");
- 		while(share__optind < argc)
- 			options->filenames[i++] = local_strdup(argv[share__optind++]);
-@@ -661,8 +662,10 @@
- 	}
- 	if(options->ops.capacity <= options->ops.num_operations) {
- 		unsigned original_capacity = options->ops.capacity;
--		options->ops.capacity *= 4;
--		if(0 == (options->ops.operations = (Operation*)realloc(options->ops.operations, sizeof(Operation) * options->ops.capacity)))
-+		if(options->ops.capacity > SIZE_MAX / 2) /* overflow check */
-+			die("out of memory allocating space for option list");
-+		options->ops.capacity *= 2;
-+		if(0 == (options->ops.operations = (Operation*)safe_realloc_mul_2op_(options->ops.operations, sizeof(Operation), /*times*/options->ops.capacity)))
- 			die("out of memory allocating space for option list");
- 		memset(options->ops.operations + original_capacity, 0, sizeof(Operation) * (options->ops.capacity - original_capacity));
- 	}
-@@ -680,8 +683,10 @@
- 	}
- 	if(options->args.capacity <= options->args.num_arguments) {
- 		unsigned original_capacity = options->args.capacity;
--		options->args.capacity *= 4;
--		if(0 == (options->args.arguments = (Argument*)realloc(options->args.arguments, sizeof(Argument) * options->args.capacity)))
-+		if(options->args.capacity > SIZE_MAX / 2) /* overflow check */
-+			die("out of memory allocating space for option list");
-+		options->args.capacity *= 2;
-+		if(0 == (options->args.arguments = (Argument*)safe_realloc_mul_2op_(options->args.arguments, sizeof(Argument), /*times*/options->args.capacity)))
- 			die("out of memory allocating space for option list");
- 		memset(options->args.arguments + original_capacity, 0, sizeof(Argument) * (options->args.capacity - original_capacity));
- 	}
-@@ -897,7 +902,7 @@
- 
- 	/* make space */
- 	FLAC__ASSERT(out->num_entries > 0);
--	if(0 == (out->entries = (unsigned*)malloc(sizeof(unsigned) * out->num_entries)))
-+	if(0 == (out->entries = (unsigned*)safe_malloc_mul_2op_(sizeof(unsigned), /*times*/out->num_entries)))
- 		die("out of memory allocating space for option list");
- 
- 	/* load 'em up */
-@@ -936,7 +941,7 @@
- 
- 	/* make space */
- 	FLAC__ASSERT(out->num_entries > 0);
--	if(0 == (out->entries = (Argument_BlockTypeEntry*)malloc(sizeof(Argument_BlockTypeEntry) * out->num_entries)))
-+	if(0 == (out->entries = (Argument_BlockTypeEntry*)safe_malloc_mul_2op_(sizeof(Argument_BlockTypeEntry), /*times*/out->num_entries)))
- 		die("out of memory allocating space for option list");
- 
- 	/* load 'em up */
--- audio/flac/files/patch-src_libFLAC_md5.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_md5.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/md5.c.orig
-+++ src/libFLAC/md5.c
-@@ -31,6 +31,7 @@
- #ifdef HAVE_CONFIG_H
- #include 
- #endif
-+#include "share/alloc.h"
- 
- #ifndef FLaC__INLINE
- #define FLaC__INLINE
-@@ -230,13 +231,19 @@
- 	unsigned channel, sample, a_byte;
- 	FLAC__int32 a_word;
- 	FLAC__byte *buf_;
--	const unsigned bytes_needed = channels * samples * bytes_per_sample;
-+	const size_t bytes_needed = (size_t)channels * (size_t)samples * (size_t)bytes_per_sample;
-+
-+	/* overflow check */
-+	if((size_t)channels > SIZE_MAX / (size_t)bytes_per_sample)
-+		return false;
-+	if((size_t)channels * (size_t)bytes_per_sample > SIZE_MAX / (size_t)samples)
-+		return false;
- 
- 	if(ctx->capacity < bytes_needed) {
- 		FLAC__byte *tmp = (FLAC__byte*)realloc(ctx->internal_buf, bytes_needed);
- 		if(0 == tmp) {
- 			free(ctx->internal_buf);
--			if(0 == (ctx->internal_buf = (FLAC__byte*)malloc(bytes_needed)))
-+			if(0 == (ctx->internal_buf = (FLAC__byte*)safe_malloc_(bytes_needed)))
- 				return false;
- 		}
- 		ctx->internal_buf = tmp;
--- audio/flac/files/patch-doc_html_images_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_html_images_Makefile.in,v 1.2 2005/03/16 14:49:23 naddy Exp $
-
---- doc/html/images/Makefile.in.orig
-+++ doc/html/images/Makefile.in
-@@ -226,7 +226,7 @@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html/images
-+docdir = $(datadir)/doc/$(PACKAGE)/html/images
- doc_DATA = \
- 	1x1.gif \
- 	cafebug.gif \
--- audio/flac/files/patch-src_libFLAC_metadata__iterators.c
+++ /dev/null
@@ -1,67 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_metadata__iterators.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/metadata_iterators.c.orig
-+++ src/libFLAC/metadata_iterators.c
-@@ -48,6 +48,7 @@
- 
- #include "FLAC/assert.h"
- #include "FLAC/file_decoder.h"
-+#include "share/alloc.h"
- 
- #ifdef max
- #undef max
-@@ -1928,7 +1929,7 @@
- 		block->data = 0;
- 	}
- 	else {
--		if(0 == (block->data = (FLAC__byte*)malloc(block_length)))
-+		if(0 == (block->data = (FLAC__byte*)safe_malloc_(block_length)))
- 			return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
- 
- 		if(read_cb(block->data, 1, block_length, handle) != block_length)
-@@ -1949,7 +1950,7 @@
- 
- 	if(block->num_points == 0)
- 		block->points = 0;
--	else if(0 == (block->points = (FLAC__StreamMetadata_SeekPoint*)malloc(block->num_points * sizeof(FLAC__StreamMetadata_SeekPoint))))
-+	else if(0 == (block->points = (FLAC__StreamMetadata_SeekPoint*)safe_malloc_mul_2op_(block->num_points, /*times*/ sizeof(FLAC__StreamMetadata_SeekPoint))))
- 		return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
- 
- 	for(i = 0; i < block->num_points; i++) {
-@@ -1982,7 +1983,7 @@
- 		entry->entry = 0;
- 	}
- 	else {
--		if(0 == (entry->entry = (FLAC__byte*)malloc(entry->length+1)))
-+		if(0 == (entry->entry = (FLAC__byte*)safe_malloc_add_2op_(entry->length, /*+*/1)))
- 			return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
- 
- 		if(read_cb(entry->entry, 1, entry->length, handle) != entry->length)
-@@ -2145,7 +2146,7 @@
- 		block->data = 0;
- 	}
- 	else {
--		if(0 == (block->data = (FLAC__byte*)malloc(block_length)))
-+		if(0 == (block->data = (FLAC__byte*)safe_malloc_(block_length)))
- 			return FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
- 
- 		if(read_cb(block->data, 1, block_length, handle) != block_length)
-@@ -2812,7 +2813,7 @@
- {
- 	static const char *tempfile_suffix = ".metadata_edit";
- 	if(0 == tempfile_path_prefix) {
--		if(0 == (*tempfilename = (char*)malloc(strlen(filename) + strlen(tempfile_suffix) + 1))) {
-+		if(0 == (*tempfilename = (char*)safe_malloc_add_3op_(strlen(filename), /*+*/strlen(tempfile_suffix), /*+*/1))) {
- 			*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
- 			return false;
- 		}
-@@ -2826,7 +2827,7 @@
- 		else
- 			p++;
- 
--		if(0 == (*tempfilename = (char*)malloc(strlen(tempfile_path_prefix) + 1 + strlen(p) + strlen(tempfile_suffix) + 1))) {
-+		if(0 == (*tempfilename = (char*)safe_malloc_add_4op_(strlen(tempfile_path_prefix), /*+*/strlen(p), /*+*/strlen(tempfile_suffix), /*+*/2))) {
- 			*status = FLAC__METADATA_SIMPLE_ITERATOR_STATUS_MEMORY_ALLOCATION_ERROR;
- 			return false;
- 		}
Index: patch-configure
===================================================================
RCS file: /home/cvs/mports/audio/flac/files/patch-configure,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/flac/files/patch-configure -L audio/flac/files/patch-configure -u -r1.1 -r1.2
--- audio/flac/files/patch-configure
+++ audio/flac/files/patch-configure
@@ -1,17 +1,14 @@
 
-$FreeBSD: ports/audio/flac/files/patch-configure,v 1.7 2005/03/16 14:49:23 naddy Exp $
+$FreeBSD: ports/audio/flac/files/patch-configure,v 1.8 2008/04/07 20:37:14 naddy Exp $
 
 --- configure.orig
 +++ configure
-@@ -10541,9 +10541,9 @@
- if test x$debug = xtrue; then
- 	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -g -O0 -DDEBUG"
- else
--	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O2 -DNDEBUG"
-+	OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -DNDEBUG"
- 	if test x$GCC = xyes; then
--		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -O3 -fomit-frame-pointer -funroll-loops -finline-functions -Wall -W -Winline -DFLaC__INLINE=__inline__"
-+		OUR_CFLAGS_HEAD="$OUR_CFLAGS_HEAD -Wall -W -DFLaC__INLINE=__inline__"
+@@ -23490,7 +23490,7 @@
+ 	CPPFLAGS="-DNDEBUG $CPPFLAGS"
+ 	if test "x$GCC" = xyes; then
+ 		CPPFLAGS="-DFLaC__INLINE=__inline__ $CPPFLAGS"
+-		CFLAGS="-O3 -funroll-loops -finline-functions -Wall -W -Winline $CFLAGS"
++		CFLAGS="-Wall -W $CFLAGS"
  	fi
  fi
- CFLAGS="$OUR_CFLAGS_HEAD $CFLAGS"
+ 
--- audio/flac/files/patch-src_share_utf8_utf8.c
+++ /dev/null
@@ -1,72 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_share_utf8_utf8.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
-
---- src/share/utf8/utf8.c.orig
-+++ src/share/utf8/utf8.c
-@@ -28,6 +28,7 @@
- #include 
- #endif
- 
-+#include "share/alloc.h"
- #include "utf8.h"
- #include "charset.h"
- 
-@@ -57,10 +58,13 @@
-         } else {
-             size += 3;
-         }
-+        if(size+n < size) /* overflow check */
-+            return NULL;
-+        size += n;
-         c = unicode[index++];
-     }	
- 
--    out = malloc(size + 1);
-+    out = safe_malloc_add_2op_(size, /*+*/1);
-     if (out == NULL)
-         return NULL;
-     index = 0;
-@@ -101,11 +105,15 @@
-         } else {
-             index += 1;
-         }
-+        if(size + 1 == 0) /* overflow check */
-+            return NULL;
-         size += 1;
-         c = utf8[index++];
-     }	
- 
--    out = malloc((size + 1) * sizeof(wchar_t));
-+    if(size + 1 == 0) /* overflow check */
-+        return NULL;
-+    out = safe_malloc_mul_2op_((size + 1), /*times*/sizeof(wchar_t));
-     if (out == NULL)
-         return NULL;
-     index = 0;
-@@ -147,7 +155,7 @@
- 		return -1;
- 	}
- 
--	unicode = calloc(wchars + 1, sizeof(unsigned short));
-+	unicode = safe_calloc_(wchars + 1, sizeof(unsigned short));
- 	if(unicode == NULL) 
- 	{
- 		fprintf(stderr, "Out of memory processing string to UTF8\n");
-@@ -197,7 +205,7 @@
-         return -1;
-     }
- 
--    *to = calloc(chars + 1, sizeof(unsigned char));
-+    *to = safe_calloc_(chars + 1, sizeof(unsigned char));
-     if(*to == NULL) 
-     {
-         fprintf(stderr, "Out of memory processing string to local charset\n");
-@@ -285,7 +293,7 @@
-   if (ret != -1)
-     return ret;
- 
--  s = malloc(fromlen + 1);
-+  s = safe_malloc_add_2op_(fromlen, /*+*/1);
-   if (!s)
-     return -1;
-   strcpy(s, from);
--- audio/flac/files/patch-src_libFLAC_cpu.c
+++ /dev/null
@@ -1,32 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_cpu.c,v 1.2 2005/03/16 14:49:23 naddy Exp $
-
---- src/libFLAC/cpu.c.orig
-+++ src/libFLAC/cpu.c
-@@ -37,6 +37,11 @@
- #include 
- #endif
- 
-+#ifdef __FreeBSD__
-+#include 
-+#include 
-+#endif
-+
- #if defined FLAC__CPU_PPC
- #if !defined FLAC__NO_ASM
- #if defined FLAC__SYS_DARWIN
-@@ -95,6 +100,14 @@
- 
- #ifndef FLAC__SSE_OS
- 		info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = false;
-+#elif defined(__FreeBSD__)
-+		/* on FreeBSD we can double-check via sysctl whether the OS supports SSE */
-+		{
-+			int sse;
-+			size_t len = sizeof(sse);
-+			if (sysctlbyname("hw.instruction_sse", &sse, &len, NULL, 0) || !sse)
-+				info->data.ia32.fxsr = info->data.ia32.sse = info->data.ia32.sse2 = false;
-+		}
- #endif
- 
- #ifdef FLAC__USE_3DNOW
--- audio/flac/files/patch-src_plugin__common_charset.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_plugin__common_charset.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
-
---- src/plugin_common/charset.c.orig
-+++ src/plugin_common/charset.c
-@@ -83,6 +83,8 @@
- 	/* Due to a GLIBC bug, round outbuf_size up to a multiple of 4 */
- 	/* + 1 for nul in case len == 1 */
- 	outsize = ((length + 3) & ~3) + 1;
-+	if(outsize < length) /* overflow check */
-+		return NULL;
- 	out = (char*)malloc(outsize);
- 	outleft = outsize - 1;
- 	outptr = out;
-@@ -95,6 +97,10 @@
- 		{
- 			case E2BIG:
- 				used = outptr - out;
-+				if((outsize - 1) * 2 + 1 <= outsize) { /* overflow check */
-+					free(out);
-+					return NULL;
-+				}
- 				outsize = (outsize - 1) * 2 + 1;
- 				out = realloc(out, outsize);
- 				outptr = out + used;
--- audio/flac/files/patch-src_libFLAC++_metadata.cpp
+++ /dev/null
@@ -1,66 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC++_metadata.cpp,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC++/metadata.cpp.orig
-+++ src/libFLAC++/metadata.cpp
-@@ -33,6 +33,7 @@
- #include "FLAC/assert.h"
- #include  // for malloc(), free()
- #include  // for memcpy() etc.
-+#include "share/alloc.h"
- 
- #ifdef _MSC_VER
- // warning C4800: 'int' : forcing to bool 'true' or 'false' (performance warning)
-@@ -568,7 +569,7 @@
- 
- 			clear_entry();
- 
--			if(0 == (entry_.entry = (FLAC__byte*)malloc(field_length+1))) {
-+			if(0 == (entry_.entry = (FLAC__byte*)safe_malloc_add_2op_(field_length, /*+*/1))) {
- 				is_valid_ = false;
- 			}
- 			else {
-@@ -617,7 +618,7 @@
- 
- 			clear_field_value();
- 
--			if(0 == (field_value_ = (char *)malloc(field_value_length+1))) {
-+			if(0 == (field_value_ = (char *)safe_malloc_add_2op_(field_value_length, /*+*/1))) {
- 				is_valid_ = false;
- 			}
- 			else {
-@@ -707,7 +708,7 @@
- 		{
- 			clear_entry();
- 
--			if(0 == (entry_.entry = (FLAC__byte*)malloc(field_name_length_ + 1 + field_value_length_ + 1))) {
-+			if(0 == (entry_.entry = (FLAC__byte*)safe_malloc_add_4op_(field_name_length_, /*+*/1, /*+*/field_value_length_, /*+*/1))) {
- 				is_valid_ = false;
- 			}
- 			else {
-@@ -733,7 +734,7 @@
- 				p = (const char *)entry_.entry + entry_.length;
- 
- 			field_name_length_ = p - (const char *)entry_.entry;
--			if(0 == (field_name_ = (char *)malloc(field_name_length_ + 1))) { // +1 for the trailing \0
-+			if(0 == (field_name_ = (char *)safe_malloc_add_2op_(field_name_length_, /*+*/1))) { // +1 for the trailing \0
- 				is_valid_ = false;
- 				return;
- 			}
-@@ -742,14 +743,14 @@
- 
- 			if(entry_.length - field_name_length_ == 0) {
- 				field_value_length_ = 0;
--				if(0 == (field_value_ = (char *)malloc(0))) {
-+				if(0 == (field_value_ = (char *)safe_malloc_(0))) {
- 					is_valid_ = false;
- 					return;
- 				}
- 			}
- 			else {
- 				field_value_length_ = entry_.length - field_name_length_ - 1;
--				if(0 == (field_value_ = (char *)malloc(field_value_length_ + 1))) { // +1 for the trailing \0
-+				if(0 == (field_value_ = (char *)safe_malloc_add_2op_(field_value_length_, /*+*/1))) { // +1 for the trailing \0
- 					is_valid_ = false;
- 					return;
- 				}
--- audio/flac/files/patch-doc_html_Makefile.in
+++ /dev/null
@@ -1,35 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-doc_html_Makefile.in,v 1.2 2005/03/16 14:49:23 naddy Exp $
-
---- doc/html/Makefile.in.orig
-+++ doc/html/Makefile.in
-@@ -236,7 +236,7 @@
- target_alias = @target_alias@
- AUTOMAKE_OPTIONS = foreign
- SUBDIRS = ru images
--docdir = $(datadir)/doc/$(PACKAGE)-$(VERSION)/html
-+docdir = $(datadir)/doc/$(PACKAGE)/html
- doc_DATA = \
- 	changelog.html \
- 	comparison.html \
-@@ -577,13 +577,13 @@
- 
- # The install targets don't copy whole directories so we have to
- # handle 'api/' specially:
-- at FLaC__HAS_DOXYGEN_TRUE@install-data-local:
-- at FLaC__HAS_DOXYGEN_TRUE@	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
-- at FLaC__HAS_DOXYGEN_TRUE@	(cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
-- at FLaC__HAS_DOXYGEN_TRUE@uninstall-local:
-- at FLaC__HAS_DOXYGEN_TRUE@	rm -rf $(DESTDIR)$(docdir)/api
-- at FLaC__HAS_DOXYGEN_TRUE@maintainer-clean-local:
-- at FLaC__HAS_DOXYGEN_TRUE@	rm -rf api
-+install-data-local:
-+	$(mkinstalldirs) $(DESTDIR)$(docdir)/api
-+	(cd api && $(INSTALL_DATA) * $(DESTDIR)$(docdir)/api)
-+uninstall-local:
-+	rm -rf $(DESTDIR)$(docdir)/api
-+maintainer-clean-local:
-+	rm -rf api
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
--- audio/flac/files/patch-src_libFLAC_memory.c
+++ /dev/null
@@ -1,76 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_memory.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/memory.c.orig
-+++ src/libFLAC/memory.c
-@@ -35,6 +35,7 @@
- #ifdef HAVE_CONFIG_H
- #include 
- #endif
-+#include "share/alloc.h"
- 
- void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
- {
-@@ -44,10 +45,10 @@
- 
- #ifdef FLAC__ALIGN_MALLOC_DATA
- 	/* align on 32-byte (256-bit) boundary */
--	x = malloc(bytes+31);
-+	x = safe_malloc_add_2op_(bytes, /*+*/31);
- 	*aligned_address = (void*)(((unsigned)x + 31) & -32);
- #else
--	x = malloc(bytes);
-+	x = safe_malloc_(bytes);
- 	*aligned_address = x;
- #endif
- 	return x;
-@@ -66,6 +67,9 @@
- 	FLAC__ASSERT(0 != aligned_pointer);
- 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- 
-+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
-+		return false;
-+
- 	pu = (FLAC__int32*)FLAC__memory_alloc_aligned(sizeof(FLAC__int32) * elements, &u.pv);
- 	if(0 == pu) {
- 		return false;
-@@ -92,6 +96,9 @@
- 	FLAC__ASSERT(0 != aligned_pointer);
- 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- 
-+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
-+		return false;
-+
- 	pu = (FLAC__uint32*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint32) * elements, &u.pv);
- 	if(0 == pu) {
- 		return false;
-@@ -118,6 +125,9 @@
- 	FLAC__ASSERT(0 != aligned_pointer);
- 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- 
-+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
-+		return false;
-+
- 	pu = (FLAC__uint64*)FLAC__memory_alloc_aligned(sizeof(FLAC__uint64) * elements, &u.pv);
- 	if(0 == pu) {
- 		return false;
-@@ -144,6 +154,9 @@
- 	FLAC__ASSERT(0 != aligned_pointer);
- 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
- 
-+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
-+		return false;
-+
- 	pu = (unsigned*)FLAC__memory_alloc_aligned(sizeof(unsigned) * elements, &u.pv);
- 	if(0 == pu) {
- 		return false;
-@@ -171,6 +184,9 @@
- 	FLAC__ASSERT(0 != unaligned_pointer);
- 	FLAC__ASSERT(0 != aligned_pointer);
- 	FLAC__ASSERT(unaligned_pointer != aligned_pointer);
-+
-+	if((size_t)elements > SIZE_MAX / sizeof(*pu)) /* overflow check */
-+		return false;
- 
- 	pu = (FLAC__real*)FLAC__memory_alloc_aligned(sizeof(FLAC__real) * elements, &u.pv);
- 	if(0 == pu) {
Index: patch-Makefile.in
===================================================================
RCS file: /home/cvs/mports/audio/flac/files/patch-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L audio/flac/files/patch-Makefile.in -L audio/flac/files/patch-Makefile.in -u -r1.1 -r1.2
--- audio/flac/files/patch-Makefile.in
+++ audio/flac/files/patch-Makefile.in
@@ -1,14 +1,14 @@
 
-$FreeBSD: ports/audio/flac/files/patch-Makefile.in,v 1.3 2005/03/16 14:49:23 naddy Exp $
+$FreeBSD: ports/audio/flac/files/patch-Makefile.in,v 1.4 2008/04/07 20:37:14 naddy Exp $
 
 --- Makefile.in.orig
 +++ Makefile.in
-@@ -258,7 +258,7 @@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
--SUBDIRS = doc include man src test build flac.pbproj obj
-+SUBDIRS = $(DOC) include man src test build flac.pbproj
+@@ -234,7 +234,7 @@
+ 
+ AUTOMAKE_OPTIONS = foreign 1.7
+ 
+-SUBDIRS = doc include m4 man src examples test build obj
++SUBDIRS = $(DOC) include m4 man src test build
+ 
  DISTCLEANFILES = libtool-disable-static
- EXTRA_DIST = \
- 	COPYING.FDL \
+ 
--- audio/flac/files/patch-src_libFLAC_metadata__object.c
+++ /dev/null
@@ -1,176 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_metadata__object.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/metadata_object.c.orig
-+++ src/libFLAC/metadata_object.c
-@@ -35,6 +35,7 @@
- #include "private/metadata.h"
- 
- #include "FLAC/assert.h"
-+#include "share/alloc.h"
- 
- 
- /****************************************************************************
-@@ -47,7 +48,7 @@
- {
- 	if(bytes > 0 && 0 != from) {
- 		FLAC__byte *x;
--		if(0 == (x = (FLAC__byte*)malloc(bytes)))
-+		if(0 == (x = (FLAC__byte*)safe_malloc_(bytes)))
- 			return false;
- 		memcpy(x, from, bytes);
- 		*to = x;
-@@ -62,7 +63,7 @@
- 
- static FLAC__bool ensure_null_terminated_(FLAC__byte **entry, unsigned length)
- {
--	FLAC__byte *x = (FLAC__byte*)realloc(*entry, length+1);
-+	FLAC__byte *x = (FLAC__byte*)safe_realloc_add_2op_(*entry, length, /*+*/1);
- 	if(0 != x) {
- 		x[length] = '\0';
- 		*entry = x;
-@@ -82,7 +83,7 @@
- 	else {
- 		FLAC__byte *x;
- 		FLAC__ASSERT(from->length > 0);
--		if(0 == (x = (FLAC__byte*)malloc(from->length+1)))
-+		if(0 == (x = (FLAC__byte*)safe_malloc_add_2op_(from->length, /*+*/1)))
- 			return false;
- 		memcpy(x, from->entry, from->length);
- 		x[from->length] = '\0';
-@@ -100,7 +101,7 @@
- 	else {
- 		FLAC__StreamMetadata_CueSheet_Index *x;
- 		FLAC__ASSERT(from->num_indices > 0);
--		if(0 == (x = (FLAC__StreamMetadata_CueSheet_Index*)malloc(from->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index))))
-+		if(0 == (x = (FLAC__StreamMetadata_CueSheet_Index*)safe_malloc_mul_2op_(from->num_indices, /*times*/sizeof(FLAC__StreamMetadata_CueSheet_Index))))
- 			return false;
- 		memcpy(x, from->indices, from->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index));
- 		to->indices = x;
-@@ -122,7 +123,7 @@
- 
- 	FLAC__ASSERT(num_points > 0);
- 
--	object_array = (FLAC__StreamMetadata_SeekPoint*)malloc(num_points * sizeof(FLAC__StreamMetadata_SeekPoint));
-+	object_array = (FLAC__StreamMetadata_SeekPoint*)safe_malloc_mul_2op_(num_points, /*times*/sizeof(FLAC__StreamMetadata_SeekPoint));
- 
- 	if(0 != object_array) {
- 		unsigned i;
-@@ -155,7 +156,7 @@
- {
- 	FLAC__ASSERT(num_comments > 0);
- 
--	return (FLAC__StreamMetadata_VorbisComment_Entry*)calloc(num_comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
-+	return (FLAC__StreamMetadata_VorbisComment_Entry*)safe_calloc_(num_comments, sizeof(FLAC__StreamMetadata_VorbisComment_Entry));
- }
- 
- static void vorbiscomment_entry_array_delete_(FLAC__StreamMetadata_VorbisComment_Entry *object_array, unsigned num_comments)
-@@ -294,14 +295,14 @@
- {
- 	FLAC__ASSERT(num_indices > 0);
- 
--	return (FLAC__StreamMetadata_CueSheet_Index*)calloc(num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index));
-+	return (FLAC__StreamMetadata_CueSheet_Index*)safe_calloc_(num_indices, sizeof(FLAC__StreamMetadata_CueSheet_Index));
- }
- 
- static FLAC__StreamMetadata_CueSheet_Track *cuesheet_track_array_new_(unsigned num_tracks)
- {
- 	FLAC__ASSERT(num_tracks > 0);
- 
--	return (FLAC__StreamMetadata_CueSheet_Track*)calloc(num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track));
-+	return (FLAC__StreamMetadata_CueSheet_Track*)safe_calloc_(num_tracks, sizeof(FLAC__StreamMetadata_CueSheet_Track));
- }
- 
- static void cuesheet_track_array_delete_(FLAC__StreamMetadata_CueSheet_Track *object_array, unsigned num_tracks)
-@@ -462,6 +463,10 @@
- 				break;
- 			case FLAC__METADATA_TYPE_SEEKTABLE:
- 				to->data.seek_table.num_points = object->data.seek_table.num_points;
-+				if(to->data.seek_table.num_points > SIZE_MAX / sizeof(FLAC__StreamMetadata_SeekPoint)) { /* overflow check */
-+					FLAC__metadata_object_delete(to);
-+					return 0;
-+				}
- 				if(!copy_bytes_((FLAC__byte**)&to->data.seek_table.points, (FLAC__byte*)object->data.seek_table.points, object->data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint))) {
- 					FLAC__metadata_object_delete(to);
- 					return 0;
-@@ -788,8 +793,12 @@
- 			return false;
- 	}
- 	else {
--		const unsigned old_size = object->data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
--		const unsigned new_size = new_num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
-+		const size_t old_size = object->data.seek_table.num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
-+		const size_t new_size = new_num_points * sizeof(FLAC__StreamMetadata_SeekPoint);
-+
-+		/* overflow check */
-+		if((size_t)new_num_points > SIZE_MAX / sizeof(FLAC__StreamMetadata_SeekPoint))
-+			return false;
- 
- 		FLAC__ASSERT(object->data.seek_table.num_points > 0);
- 
-@@ -982,8 +991,12 @@
- 			return false;
- 	}
- 	else {
--		const unsigned old_size = object->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
--		const unsigned new_size = new_num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
-+		const size_t old_size = object->data.vorbis_comment.num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
-+		const size_t new_size = new_num_comments * sizeof(FLAC__StreamMetadata_VorbisComment_Entry);
-+
-+		/* overflow check */
-+		if((size_t)new_num_comments > SIZE_MAX / sizeof(FLAC__StreamMetadata_VorbisComment_Entry))
-+			return false;
- 
- 		FLAC__ASSERT(object->data.vorbis_comment.num_comments > 0);
- 
-@@ -1131,7 +1144,7 @@
- 		const size_t nn = strlen(field_name);
- 		const size_t nv = strlen(field_value);
- 		entry->length = nn + 1 /*=*/ + nv;
--		if(0 == (entry->entry = (FLAC__byte*)malloc(entry->length+1)))
-+		if(0 == (entry->entry = (FLAC__byte*)safe_malloc_add_2op_(entry->length, /*+*/1)))
- 			return false;
- 		memcpy(entry->entry, field_name, nn);
- 		entry->entry[nn] = '=';
-@@ -1158,9 +1171,9 @@
- 		FLAC__ASSERT(0 != eq);
- 		if(0 == eq)
- 			return false; /* double protection */
--		if(0 == (*field_name = (char*)malloc(nn+1)))
-+		if(0 == (*field_name = (char*)safe_malloc_add_2op_(nn, /*+*/1)))
- 			return false;
--		if(0 == (*field_value = (char*)malloc(nv+1))) {
-+		if(0 == (*field_value = (char*)safe_malloc_add_2op_(nv, /*+*/1))) {
- 			free(*field_name);
- 			return false;
- 		}
-@@ -1290,8 +1303,12 @@
- 			return false;
- 	}
- 	else {
--		const unsigned old_size = track->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
--		const unsigned new_size = new_num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
-+		const size_t old_size = track->num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
-+		const size_t new_size = new_num_indices * sizeof(FLAC__StreamMetadata_CueSheet_Index);
-+
-+		/* overflow check */
-+		if((size_t)new_num_indices > SIZE_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Index))
-+			return false;
- 
- 		FLAC__ASSERT(track->num_indices > 0);
- 
-@@ -1374,8 +1391,12 @@
- 			return false;
- 	}
- 	else {
--		const unsigned old_size = object->data.cue_sheet.num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
--		const unsigned new_size = new_num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
-+		const size_t old_size = object->data.cue_sheet.num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
-+		const size_t new_size = new_num_tracks * sizeof(FLAC__StreamMetadata_CueSheet_Track);
-+
-+		/* overflow check */
-+		if((size_t)new_num_tracks > SIZE_MAX / sizeof(FLAC__StreamMetadata_CueSheet_Track))
-+			return false;
- 
- 		FLAC__ASSERT(object->data.cue_sheet.num_tracks > 0);
- 
--- audio/flac/files/patch-src_share_utf8_iconvert.c
+++ /dev/null
@@ -1,49 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_share_utf8_iconvert.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
-
---- src/share/utf8/iconvert.c.orig
-+++ src/share/utf8/iconvert.c
-@@ -27,6 +27,7 @@
- #include 
- #include 
- #include 
-+#include "share/alloc.h"
- 
- /*
-  * Convert data from one encoding to another. Return:
-@@ -79,7 +80,7 @@
-      * This is deliberately not a config option as people often
-      * change their iconv library without rebuilding applications.
-      */
--    tocode1 = (char *)malloc(strlen(tocode) + 11);
-+    tocode1 = (char *)safe_malloc_add_2op_(strlen(tocode), /*+*/11);
-     if (!tocode1)
-       goto fail;
- 
-@@ -117,6 +118,8 @@
-       break;
-     if (obl < 6) {
-       /* Enlarge the buffer */
-+      if(utflen*2 < utflen) /* overflow check */
-+        goto fail;
-       utflen *= 2;
-       newbuf = (char *)realloc(utfbuf, utflen);
-       if (!newbuf)
-@@ -143,7 +146,7 @@
-       iconv_close(cd1);
-       return ret;
-     }
--    newbuf = (char *)realloc(utfbuf, (ob - utfbuf) + 1);
-+    newbuf = (char *)safe_realloc_add_2op_(utfbuf, (ob - utfbuf), /*+*/1);
-     if (!newbuf)
-       goto fail;
-     ob = (ob - utfbuf) + newbuf;
-@@ -194,7 +197,7 @@
-   outlen += ob - tbuf;
- 
-   /* Convert from UTF-8 for real */
--  outbuf = (char *)malloc(outlen + 1);
-+  outbuf = (char *)safe_malloc_add_2op_(outlen, /*+*/1);
-   if (!outbuf)
-     goto fail;
-   ib = utfbuf;
--- audio/flac/files/patch-src_libFLAC_file__decoder.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_file__decoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/file_decoder.c.orig
-+++ src/libFLAC/file_decoder.c
-@@ -43,6 +43,7 @@
- #include "FLAC/assert.h"
- #include "protected/file_decoder.h"
- #include "protected/seekable_stream_decoder.h"
-+#include "share/alloc.h"
- 
- /***********************************************************************
-  *
-@@ -248,7 +249,7 @@
- 		decoder->private_->filename = 0;
- 	}
- 	if(0 != strcmp(value, "-")) {
--		if(0 == (decoder->private_->filename = (char*)malloc(strlen(value)+1))) {
-+		if(0 == (decoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
- 			decoder->protected_->state = FLAC__FILE_DECODER_MEMORY_ALLOCATION_ERROR;
- 			return false;
- 		}
--- audio/flac/files/patch-src_libFLAC_bitbuffer.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_bitbuffer.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/bitbuffer.c.orig
-+++ src/libFLAC/bitbuffer.c
-@@ -35,6 +35,7 @@
- #include "private/bitmath.h"
- #include "private/crc.h"
- #include "FLAC/assert.h"
-+#include "share/alloc.h"
- 
- /*
-  * Along the way you will see two versions of some functions, selected
-@@ -193,7 +194,7 @@
- 	if(bb->capacity == new_capacity)
- 		return true;
- 
--	new_buffer = (FLAC__blurb*)calloc(new_capacity, sizeof(FLAC__blurb));
-+	new_buffer = (FLAC__blurb*)safe_calloc_(new_capacity, sizeof(FLAC__blurb));
- 	if(new_buffer == 0)
- 		return false;
- 	memcpy(new_buffer, bb->buffer, sizeof(FLAC__blurb)*min(bb->blurbs+(bb->bits?1:0), new_capacity));
-@@ -425,7 +426,7 @@
- {
- 	if(bb->buffer == 0) {
- 		bb->capacity = FLAC__BITBUFFER_DEFAULT_CAPACITY;
--		bb->buffer = (FLAC__blurb*)calloc(bb->capacity, sizeof(FLAC__blurb));
-+		bb->buffer = (FLAC__blurb*)safe_calloc_(bb->capacity, sizeof(FLAC__blurb));
- 		if(bb->buffer == 0)
- 			return false;
- 	}
--- audio/flac/files/patch-src_share_utf8_charset.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_share_utf8_charset.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
-
---- src/share/utf8/charset.c.orig
-+++ src/share/utf8/charset.c
-@@ -35,6 +35,7 @@
- 
- #include 
- 
-+#include "share/alloc.h"
- #include "charset.h"
- 
- #include "charmaps.h"
-@@ -492,7 +493,7 @@
-   if (!charset1 || !charset2 )
-     return -1;
- 
--  tobuf = (char *)malloc(fromlen * charset2->max + 1);
-+  tobuf = (char *)safe_malloc_mul2add_(fromlen, /*times*/charset2->max, /*+*/1);
-   if (!tobuf)
-     return -2;
- 
--- audio/flac/files/patch-src_plugin__common_tags.c
+++ /dev/null
@@ -1,59 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_plugin__common_tags.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
-
---- src/plugin_common/tags.c.orig
-+++ src/plugin_common/tags.c
-@@ -23,6 +23,7 @@
- #include "tags.h"
- #include "FLAC/assert.h"
- #include "FLAC/metadata.h"
-+#include "share/alloc.h"
- 
- 
- static __inline unsigned local__wide_strlen(const FLAC__uint16 *s)
-@@ -82,7 +83,7 @@
- 	}
- 
- 	/* allocate */
--	out = (FLAC__uint16*)malloc(chars * sizeof(FLAC__uint16));
-+	out = (FLAC__uint16*)safe_malloc_mul_2op_(chars, /*times*/sizeof(FLAC__uint16));
- 	if (0 == out) {
- 		FLAC__ASSERT(0);
- 		return 0;
-@@ -130,19 +131,23 @@
- static char *local__convert_ucs2_to_utf8(const FLAC__uint16 *src, unsigned length)
- {
- 	char *out;
--	unsigned len = 0;
-+	unsigned len = 0, n;
- 
- 	FLAC__ASSERT(0 != src);
- 
- 	/* calculate length */
- 	{
- 		unsigned i;
--		for (i = 0; i < length; i++)
--			len += local__ucs2len(src[i]);
-+		for (i = 0; i < length; i++) {
-+			n += local__ucs2len(src[i]);
-+			if(len + n < len) /* overflow check */
-+				return 0;
-+			len += n;
-+		}
- 	}
- 
- 	/* allocate */
--	out = (char*)malloc(len * sizeof(char));
-+	out = (char*)safe_malloc_mul_2op_(len, /*times*/sizeof(char));
- 	if (0 == out)
- 		return 0;
- 
-@@ -265,7 +270,7 @@
- 		const size_t value_len = strlen(value);
- 		const size_t separator_len = strlen(separator);
- 		FLAC__byte *new_entry;
--		if(0 == (new_entry = (FLAC__byte*)realloc(entry->entry, entry->length + value_len + separator_len + 1)))
-+		if(0 == (new_entry = (FLAC__byte*)safe_realloc_add_4op_(entry->entry, entry->length, /*+*/value_len, /*+*/separator_len, /*+*/1)))
- 			return false;
- 		memcpy(new_entry+entry->length, separator, separator_len);
- 		entry->length += separator_len;
--- audio/flac/files/patch-src_libFLAC_format.c
+++ /dev/null
@@ -1,25 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_format.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/format.c.orig
-+++ src/libFLAC/format.c
-@@ -38,6 +38,7 @@
- #ifdef HAVE_CONFIG_H
- #include 
- #endif
-+#include "share/alloc.h"
- 
- #ifdef min
- #undef min
-@@ -463,9 +464,9 @@
- 	FLAC__ASSERT(object->capacity_by_order > 0 || (0 == object->parameters && 0 == object->raw_bits));
- 
- 	if(object->capacity_by_order < max_partition_order) {
--		if(0 == (object->parameters = (unsigned*)realloc(object->parameters, sizeof(unsigned)*(1 << max_partition_order))))
-+		if(0 == (object->parameters = (unsigned*)safe_realloc_mul_2op_(object->parameters, sizeof(unsigned), /*times*/(1 << max_partition_order))))
- 			return false;
--		if(0 == (object->raw_bits = (unsigned*)realloc(object->raw_bits, sizeof(unsigned)*(1 << max_partition_order))))
-+		if(0 == (object->raw_bits = (unsigned*)safe_realloc_mul_2op_(object->raw_bits, sizeof(unsigned), /*times*/(1 << max_partition_order))))
- 			return false;
- 		object->capacity_by_order = max_partition_order;
- 	}
--- audio/flac/files/patch-src_libFLAC_file__encoder.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libFLAC_file__encoder.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libFLAC/file_encoder.c.orig
-+++ src/libFLAC/file_encoder.c
-@@ -34,6 +34,7 @@
- #include  /* for strlen(), strcpy() */
- #include "FLAC/assert.h"
- #include "protected/file_encoder.h"
-+#include "share/alloc.h"
- 
- #ifdef max
- #undef max
-@@ -436,7 +437,7 @@
- 		free(encoder->private_->filename);
- 		encoder->private_->filename = 0;
- 	}
--	if(0 == (encoder->private_->filename = (char*)malloc(strlen(value)+1))) {
-+	if(0 == (encoder->private_->filename = (char*)safe_malloc_add_2op_(strlen(value), /*+*/1))) {
- 		encoder->protected_->state = FLAC__FILE_ENCODER_MEMORY_ALLOCATION_ERROR;
- 		return false;
- 	}
--- audio/flac/files/patch-src_libOggFLAC_ogg__helper.c
+++ /dev/null
@@ -1,31 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_libOggFLAC_ogg__helper.c,v 1.1 2007/11/13 14:28:28 naddy Exp $
-
---- src/libOggFLAC/ogg_helper.c.orig
-+++ src/libOggFLAC/ogg_helper.c
-@@ -34,6 +34,7 @@
- #include "FLAC/assert.h"
- #include "private/ogg_helper.h"
- #include "protected/seekable_stream_encoder.h"
-+#include "share/alloc.h"
- 
- 
- static FLAC__bool full_read_(OggFLAC__SeekableStreamEncoder *encoder, FLAC__byte *buffer, unsigned bytes, OggFLAC__SeekableStreamEncoderReadCallback read_callback, void *client_data)
-@@ -102,7 +103,7 @@
- 	}
- 
- 	/* allocate space for the page header */
--	if(0 == (page->header = (unsigned char *)malloc(OGG_MAX_HEADER_LEN))) {
-+	if(0 == (page->header = (unsigned char *)safe_malloc_(OGG_MAX_HEADER_LEN))) {
- 		encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
- 		return false;
- 	}
-@@ -144,7 +145,7 @@
- 	}
- 
- 	/* allocate space for the page body */
--	if(0 == (page->body = (unsigned char *)malloc(page->body_len))) {
-+	if(0 == (page->body = (unsigned char *)safe_malloc_(page->body_len))) {
- 		encoder->protected_->state = OggFLAC__SEEKABLE_STREAM_ENCODER_MEMORY_ALLOCATION_ERROR;
- 		return false;
- 	}
--- audio/flac/files/patch-src_metaflac_utils.c
+++ /dev/null
@@ -1,22 +0,0 @@
-
-$FreeBSD: ports/audio/flac/files/patch-src_metaflac_utils.c,v 1.1 2007/11/13 14:28:29 naddy Exp $
-
---- src/metaflac/utils.c.orig
-+++ src/metaflac/utils.c
-@@ -18,6 +18,7 @@
- 
- #include "utils.h"
- #include "FLAC/assert.h"
-+#include "share/alloc.h"
- #include "share/utf8.h"
- #include 
- #include 
-@@ -64,7 +65,7 @@
- 	if(nsource == 0)
- 		return;
- 
--	*dest = (char*)realloc(*dest, ndest + nsource + 1);
-+	*dest = (char*)safe_realloc_add_3op_(*dest, ndest, /*+*/nsource, /*+*/1);
- 	if(0 == *dest)
- 		die("out of memory growing string");
- 	strcpy((*dest)+ndest, source);

From laffer1 at midnightbsd.org  Sun Jan  4 03:08:28 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 03:08:28 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: mports/deskutils: Add java just journal
	client.
Message-ID: <200901040808.n0488S62098443@stargazer.midnightbsd.org>

Log Message:
-----------
Add java just journal client.

Modified Files:
--------------
    mports/deskutils:
        Makefile (r1.36 -> r1.37)

Added Files:
-----------
    mports/deskutils/javajj:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
    mports/deskutils/javajj/files:
        javajj.sh.in (r1.1)

-------------- next part --------------
--- /dev/null
+++ deskutils/javajj/pkg-descr
@@ -0,0 +1,7 @@
+javajj - A graphical client for posting JustJournal entries
+
+javajj is a Java client for JustJournal that allows you to
+post blog entries from a graphical app without the need for a web
+browser.
+
+WWW: http://www.justjournal.com/
--- /dev/null
+++ deskutils/javajj/Makefile
@@ -0,0 +1,32 @@
+# New ports collection makefile for:    javajj
+# Date created:		January 3, 2008
+# Whom:			Lucas Holt
+#
+# $MidnightBSD: mports/deskutils/javajj/Makefile,v 1.1 2009/01/04 08:08:25 laffer1 Exp $
+
+PORTNAME=	javajj
+PORTVERSION=	1.0
+CATEGORIES=	deskutils java
+MASTER_SITES=	http://www.justjournal.com/software/
+DISTFILES=	justjournal-${PORTVERSION}${EXTRACT_SUFX}
+
+MAINTAINER=	luke at MidnightBSD.org
+COMMENT=	Just Journal for Java blogging app
+LICENSE=	unknown
+
+USE_BZIP2=	yes
+USE_JAVA=	yes
+JAVA_VERSION=	1.4+
+USE_ANT=	yes
+
+WRKSRC=		${WRKDIR}/justjournal-${PORTVERSION}/java_jjclient
+
+SUB_FILES=	${PORTNAME}.sh
+PLIST_FILES+=	bin/${PORTNAME}
+PLIST_FILES+=	%%JAVAJARDIR%%/javajj.jar
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_DATA} ${WRKSRC}/dist/javajj.jar ${JAVAJARDIR}/
+
+.include 
--- /dev/null
+++ deskutils/javajj/distinfo
@@ -0,0 +1,3 @@
+MD5 (justjournal-1.0.tar.bz2) = 9483c2cd01f69e2c99273a7aa24c66b3
+SHA256 (justjournal-1.0.tar.bz2) = 2e0c3ce17d5a4db6cad379c223c8d3bb8bb0c00e5caccf3066e165e26c0336b0
+SIZE (justjournal-1.0.tar.bz2) = 11847501
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/deskutils/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -L deskutils/Makefile -L deskutils/Makefile -u -r1.36 -r1.37
--- deskutils/Makefile
+++ deskutils/Makefile
@@ -26,6 +26,7 @@
     SUBDIR += gucharmap
     SUBDIR += gworkspace
     SUBDIR += hot-babe
+    SUBDIR += javajj
     SUBDIR += jjclient
     SUBDIR += jlj
     SUBDIR += kbirthday
--- /dev/null
+++ deskutils/javajj/files/javajj.sh.in
@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# $MidnightBSD: mports/deskutils/javajj/files/javajj.sh.in,v 1.1 2009/01/04 08:08:25 laffer1 Exp $
+
+export J2SE_PREEMPTCLOSE=1
+export JAVA_VERSION="1.4+"
+
+cd "%%JAVAJARDIR%%" && exec "%%LOCALBASE%%/bin/java" -jar javajj.jar "$@"

From ctriv at midnightbsd.org  Sat Jan  3 19:25:22 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sat, 3 Jan 2009 19:25:22 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: print/ghostscript-gpl: Update to 8.63.
Message-ID: <200901040025.n040PMAs053197@stargazer.midnightbsd.org>

Log Message:
-----------
Update to 8.63.

Modified Files:
--------------
    mports/print/ghostscript-gpl:
        Makefile (r1.8 -> r1.9)
        distinfo (r1.2 -> r1.3)
        pkg-descr (r1.1 -> r1.2)
        pkg-plist (r1.2 -> r1.3)
    mports/print/ghostscript-gpl/files:
        patch-epag__gdevepag.c (r1.1 -> r1.2)
        patch-src:fapi_ft.c (r1.2 -> r1.3)
        patch-src:unix-gcc.mak (r1.2 -> r1.3)
        patch-src__gdevperm.c (r1.1 -> r1.2)

Added Files:
-----------
    mports/print/ghostscript-gpl:
        Makefile.drivers (r1.1)
    mports/print/ghostscript-gpl/files:
        Makefile.dmprt (r1.1)
        Makefile.epag (r1.1)
        Makefile.pcl3 (r1.1)
        patch-contrib__japanese__dmp_site.ps (r1.1)
        patch-contrib__japanese__gdevdmpr.c (r1.1)
        patch-lib-FAPIcidfmap (r1.1)
        patch-lib-FAPIconfig (r1.1)
        patch-lib-cidfmap (r1.1)
        patch-src-Makefile.in (r1.1)
        patch-src-contrib.mak (r1.1)
        patch-src-gdevl256.c (r1.1)
        patch-src-gdevvglb.c (r1.1)
        patch-src-unixinst.mak (r1.1)
        patch-src__devs.mak (r1.1)
        patch-src__zicc.c (r1.1)
        pkg-message.in (r1.1)

Removed Files:
-------------
    mports/print/ghostscript-gpl:
        Makefile.inc
    mports/print/ghostscript-gpl/files:
        bjc250.contrib.mak
        cdj850.contrib.mak
        dj970.contrib.mak
        gdevhl12-hl1250.mak
        lex7000.contrib.mak
        lx5000.contrib.mak
        lxm3200.contrib.mak
        patch-alps:gdevalps.mak
        patch-alps__gdevalps.c
        patch-bjc250:src:gdevbjc_.c
        patch-bjc250:src:gdevbjc_.h
        patch-bjc250:src:gdevbjca.c
        patch-eplaser:gdevescv.c
        patch-eplaser:gdevesmv.c
        patch-gdev10v:gdev10v.mak
        patch-gdev10v__gdev10v.c
        patch-lex7000__src__gdevlx7.c
        patch-lib::cidfmap
        patch-lib:gs_init.ps
        patch-lib__ps2epsi.CAN-2004-0967
        patch-lib__pv.sh.CAN-2004-0967
        patch-lips:gdevl4r.c
        patch-lips:gdevl4v.c
        patch-lips:gdevlips.c
        patch-lips:gdevlips.h
        patch-lips:gdevlips.mak
        patch-lips:gdevlprn.h
        patch-lips__gdevespg.c
        patch-lips__gdevlprn.c
        patch-lips__gdevnpdl.c
        patch-lips__gdevrpdl.c
        patch-lxm3200:gdevlx32.c
        patch-md2k:gdevmd2k.c
        patch-md2k:gdevmd2k.mak
        patch-mjc:gdevmjc.c
        patch-mjc:gdevmjc.mak
        patch-pcl3__eprn__gdeveprn.c
        patch-pcl3_eprn_eprnrend.c
        patch-src-dmp_site.ps
        patch-src-dviprlib.c
        patch-src-dviprlib.h
        patch-src-gdevdmpr.c
        patch-src-gdevdmpr.mak
        patch-src-gdevijs.c
        patch-src:cpca_gdevl4v.c
        patch-src:gdevcd8.c
        patch-src:gdevdj9.c
        patch-src:gdevgdi.c
        patch-src:gdevhl12.c
        patch-src:gdevl256.c
        patch-src:gdevlbp8.c
        patch-src:gdevlx50.c
        patch-src:gdevvglb.c
        patch-src:smartgdi-contrib.mak
        patch-src__unix-dll.mak
        patch-src_cpca_mk_cmd.c
        stc740ih.upp
        stc740p.upp
        stc740pl.upp

-------------- next part --------------
--- print/ghostscript-gpl/Makefile.inc
+++ /dev/null
@@ -1,5 +0,0 @@
-# $MidnightBSD: mports/print/ghostscript-gpl/Makefile.inc,v 1.5 2009/01/03 20:49:03 ctriv Exp $
-
-GS_VERSION=	8.56
-GS_REVISION=	2
-GS_EPOCH=	0
Index: pkg-descr
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/pkg-descr,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/ghostscript-gpl/pkg-descr -L print/ghostscript-gpl/pkg-descr -u -r1.1 -r1.2
--- print/ghostscript-gpl/pkg-descr
+++ print/ghostscript-gpl/pkg-descr
@@ -2,9 +2,9 @@
 all common and most esoteric platforms and supports many different printers
 and some displays.
 
-Versions entitled "GPL Ghostscript" are distributed with the GNU General
-Public License, which allows free use, and free copying and redistribution
-under certain conditions (including, in some cases, commercial distribution).
+This is distributed with the GNU General Public License, which allows
+free use, and free copying and redistribution under certain conditions
+(including, in some cases, commercial distribution).
 
 This port includes add-on packages (not part of the official gs release)
 	o HP8XX driver for HP DeskJet 880C/882C/895C         
--- /dev/null
+++ print/ghostscript-gpl/Makefile.drivers
@@ -0,0 +1,336 @@
+# $FreeBSD: ports/print/ghostscript8/Makefile.drivers,v 1.4 2008/06/20 18:12:06 hrs Exp $
+
+OPTIONS_GS_DEFAULT_ON=	on
+OPTIONS_GS_DEFAULT_OFF=	off
+
+.if !defined(WITHOUT_X11)
+OPTIONS_X11_DEFAULT=	on
+.else
+OPTIONS_X11_DEFAULT=	off
+.endif
+
+.if !defined(WITH_SVGALIB)
+OPTIONS_SVGALIB_DEFAULT=	off
+.else
+OPTIONS_SVGALIB_DEFAULT=	on
+.endif
+
+.if !defined(WITHOUT_ICONV)
+OPTIONS_ICONV_DEFAULT=	on
+.else
+OPTIONS_ICONV_DEFAULT=	off
+.endif
+
+.if make(makesum)
+OPTIONS_X11_DEFAULT=	on
+OPTIONS_SVGALIB_DEFAULT=on
+OPTIONS_ICONV_DEFAULT=	on
+OPTIONS_GS_DEFAULT_ON=	on
+OPTIONS_GS_DEFAULT_OFF=	on
+.endif
+
+OPTIONS_X11= \
+GS_x11		"D: X Window System version 11, release >=4"	${OPTIONS_X11_DEFAULT} \
+GS_x11alpha	"D: X Window System masquer. alpha capability"	${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk	"D: X Window System masquer. 1bit/plane CMYK"	${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk2	"D: X Window System 2-bit-per-plane CMYK"	${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk4	"D: X Window System 4-bit-per-plane CMYK"	${OPTIONS_X11_DEFAULT} \
+GS_x11cmyk8	"D: X Window System 8-bit-per-plane CMYK"	${OPTIONS_X11_DEFAULT} \
+GS_x11gray2	"D: X Window System 2-bit gray-scale"	${OPTIONS_X11_DEFAULT} \
+GS_x11gray4	"D: X Window System 4-bit gray-scale"	${OPTIONS_X11_DEFAULT} \
+GS_x11mono	"D: X Window System masquer. black-and-white"	${OPTIONS_X11_DEFAULT} \
+GS_x11rg16x	"D: X Window System G5/B5/R6 pixel layout"	${OPTIONS_X11_DEFAULT} \
+GS_x11rg32x	"D: X Window System G11/B10/R11 pixel layout"	${OPTIONS_X11_DEFAULT}
+
+OPTIONS_SVGALIB= \
+GS_lvga256	"D: SVGAlib, 256-color VGA modes"	${OPTIONS_SVGALIB_DEFAULT} \
+GS_vgalib	"D: SVGAlib, 16-color VGA modes"	${OPTIONS_SVGALIB_DEFAULT}
+
+OPTIONS_ICONV= \
+GS_oprp		"D: OpenPrinting Raster driver interface"	${OPTIONS_ICONV_DEFAULT} \
+GS_opvp		"D: OpenPrinting Vecter driver interface"	${OPTIONS_ICONV_DEFAULT}
+
+OPTIONS+=	${OPTIONS_X11}
+OPTIONS+=	${OPTIONS_SVGALIB}
+OPTIONS+=	${OPTIONS_ICONV}
+
+OPTIONS+=	\
+GS_display	"D: display device for GS shared library"	${OPTIONS_GS_DEFAULT_ON} \
+GS_md2k		"D: ALPS MD-2000/2010/4000/1300/1500/5000"	${OPTIONS_GS_DEFAULT_ON} \
+GS_md5k		"D: ALPS MD-5000 Eco Mode"	${OPTIONS_GS_DEFAULT_ON} \
+GS_md50Mono	"D: ALPS MD-5000 Monochrome"	${OPTIONS_GS_DEFAULT_ON} \
+GS_md50Eco	"D: ALPS MD-5000 Eco Mode"	${OPTIONS_GS_DEFAULT_ON} \
+GS_md1xMono	"D: ALPS MD-1x00 Monochrome"	${OPTIONS_GS_DEFAULT_ON} \
+GS_appledmp	"D: Apple Dot Matrix Printer/Imagewriter"	${OPTIONS_GS_DEFAULT_ON} \
+GS_iwhi		"D: Apple Imagewriter, high-resolution mode"	${OPTIONS_GS_DEFAULT_ON} \
+GS_iwlo		"D: Apple Imagewriter, low-resolution mode"	${OPTIONS_GS_DEFAULT_ON} \
+GS_iwlq		"D: Apple Imagewriter LQ in 320x216dpi mode"	${OPTIONS_GS_DEFAULT_ON} \
+GS_hl7x0	"D: Brother HL-720/730/760(=PCL), MFC6550MC"	${OPTIONS_GS_DEFAULT_ON} \
+GS_hl1240	"D: Brother HL-1030/1240"	${OPTIONS_GS_DEFAULT_ON} \
+GS_hl1250	"D: Brother HL-1050/1070/1250/1270N"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bj10e	"D: Canon BJ-10e"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bj10v	"D: Canon BJ-10v"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bj10vh	"D: Canon BJ-10v, high-mergin"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bj200	"D: Canon BJ-200/BJC-240(mono)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bjc600	"D: Canon BJC-600/4xxx/70, StyleWriter 2x00"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bjc800	"D: Canon BJC-240/800"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bjccmyk	"D: Canon BJC-210/240/250/265/1000"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bjccolor	"D: Canon BJC-210/240/250/265/1000 truecolor"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bjcgray	"D: Canon BJC-210/240/250/265/1000 grayscale"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bjcmono	"D: Canon BJC-210/240/250/265/1000 monochrome"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lbp8		"D: Canon LBP-8II"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lbp310	"D: Canon LBP-310"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lbp320	"D: Canon LBP-320 Pro/LBP-350"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lips2p	"D: Canon LIPS II+"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lips3	"D: Canon LIPS III"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lips4	"D: Canon LIPS IV"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bjc880j	"D: Canon LIPS IVc, BJC-680J/880J"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lips4v	"D: Canon LIPS IV, vector output mode"	${OPTIONS_GS_DEFAULT_ON} \
+GS_m8510	"D: C.Itoh M8510 printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_coslw2p	"D: CoStar LabelWriter II II/Plus"	${OPTIONS_GS_DEFAULT_ON} \
+GS_coslwxl	"D: CoStar LabelWriter XL"	${OPTIONS_GS_DEFAULT_ON} \
+GS_uniprint	"D: Configurable ESC/P,ESC/P2,HP-RTL/PCL,P2X"	${OPTIONS_GS_DEFAULT_ON} \
+GS_dmprt	"D: Configurable dot matrix printer driver"	${OPTIONS_GS_DEFAULT_ON} \
+GS_dl2100	"D: DEC DL2100"	${OPTIONS_GS_DEFAULT_ON} \
+GS_la50		"D: DEC LA50"	${OPTIONS_GS_DEFAULT_ON} \
+GS_la70		"D: DEC LA70"	${OPTIONS_GS_DEFAULT_ON} \
+GS_la75		"D: DEC LA75"	${OPTIONS_GS_DEFAULT_ON} \
+GS_la75plus	"D: DEC LA75+"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ln03		"D: DEC LN03"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lj250	"D: DEC LJ250 Companion color printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_declj250	"D: DEC LJ250 driver (alternate)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ap3250	"D: Epson ActionPrinter 3250"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epson	"D: Epson dot matrix, 9/24-pin"	${OPTIONS_GS_DEFAULT_ON} \
+GS_eps9mid	"D: Epson 9-pin, interleaved lines, medium res"	${OPTIONS_GS_DEFAULT_ON} \
+GS_eps9high	"D: Epson 9-pin, interleaved lines, triple res"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8000	"D: Epson LP-8000 line printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epag		"D: Epson ESC/Page laser printer (generic)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_escpage	"D: Epson ESC/Page laser printer (generic)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2000	"D: Epson LP-2000/3000/7000/7000G laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_alc8600	"D: Epson AL-C8600 color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_alc8500	"D: Epson AL-C8500 color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_alc2000	"D: Epson AL-C2000 color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_alc4000	"D: Epson AL-C4000 color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_alc1900	"D: Epson AL-C1900 color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_alc4100	"D: Epson AL-C4100 color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9800c	"D: Epson LP-9800C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9000c	"D: Epson LP-9000C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9500c	"D: Epson LP-9500C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8800c	"D: Epson LP-8800C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8300c	"D: Epson LP-8300C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8500c	"D: Epson LP-8500C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp3000c	"D: Epson LP-3000C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8200c	"D: Epson LP-8200C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8000c	"D: Epson LP-8000C color laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl6100	"D: Epson EPL-6100 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl5900	"D: Epson EPL-5900 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl5800	"D: Epson EPL-5800 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2050	"D: Epson EPL-N2050 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2050p	"D: Epson EPL-N2050+ laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2120	"D: Epson EPL-N2120 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2500	"D: Epson EPL-N2500 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epl2750	"D: Epson EPL-N2750 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9000b	"D: Epson LP-9000B laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2500	"D: Epson LP-2500 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9100	"D: Epson LP-9100(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp7900	"D: Epson LP-7900(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp7500	"D: Epson LP-7500(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2400	"D: Epson LP-2400 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2200	"D: Epson LP-2200 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9400	"D: Epson LP-9400(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8900	"D: Epson LP-8900(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8700	"D: Epson LP-8700(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8100	"D: Epson LP-8100(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp7700	"D: Epson LP-7700(R) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8600f	"D: Epson LP-8600FX(N) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8400f	"D: Epson LP-8400FX(N) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8300f	"D: Epson LP-8300F laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp1900	"D: Epson LP-1900(N) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9600s	"D: Epson LP-9600S laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9300	"D: Epson LP-9300 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp9600	"D: Epson LP-9600 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp8600	"D: Epson LP-8600FX(N) laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp1800	"D: Epson LP-1800 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lq850	"D: Epson LQ-850 (360x360, emul on Canon BJ300)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epsonc	"D: Epson LQ-2550, Fujitsu 3400/2400/1200 color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mj700v2c	"D: Epson MachJet series, CMYK"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mj500c	"D: Epson MachJet MJ-500C 360dpi, CMY/mono"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mj6000c	"D: Epson MachJet MJ-830C/930C/6000C"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mj8000c	"D: Epson MachJet MJ-8000C"	${OPTIONS_GS_DEFAULT_ON} \
+GS_st800	"D: Epson Stylus 800 printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_stcolor	"D: Epson Stylus Color and II/IIs/1500"	${OPTIONS_GS_DEFAULT_ON} \
+GS_photoex	"D: Epson Stylus Color Photo/Photo EX/Photo 700"	${OPTIONS_GS_DEFAULT_ON} \
+GS_fmlbp	"D: Fujitsu contrib2xx Page Printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_fmpr		"D: Fujitsu contrib"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lp2563	"D: HP 2563B line printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_dnj650c	"D: HP DesignJet 650C"	${OPTIONS_GS_DEFAULT_ON} \
+GS_deskjet	"D: HP DeskJet and DeskJet Plus"	${OPTIONS_GS_DEFAULT_ON} \
+GS_djet500	"D: HP DeskJet 500 (for DeskJet 600 use -r600)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdeskjet	"D: HP DeskJet 500C (1b/px)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_djet500c	"D: HP DeskJet 500C (alternative)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdjcolor	"D: HP DeskJet 500C/540C (24b/px)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdjmono	"D: HP DeskJet 500/510/520/540C (mono)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj500	"D: HP DeskJet 500/540C (same as cdjcolor)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj550	"D: HP DeskJet 550C/560C/660C/660Cse"	${OPTIONS_GS_DEFAULT_ON} \
+GS_dj505j	"D: HP DeskJet 505J"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj670	"D: HP DeskJet 670/690"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj850	"D: HP DeskJet 850/855/870/1100"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj880	"D: HP DeskJet 880"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj890	"D: HP DeskJet 890"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj1600	"D: HP DeskJet 1600"	${OPTIONS_GS_DEFAULT_ON} \
+GS_chp2200	"D: HP Business Inkjet 2200"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cdj970	"D: HP DeskJet 970CXi"	${OPTIONS_GS_DEFAULT_ON} \
+GS_laserjet	"D: HP LaserJet"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ljetplus	"D: HP LaserJet Plus"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet2p	"D: HP LaserJet IId/IIp/III* (TIFF compression)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet3	"D: HP LaserJet III* (Delta Row compression)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet3d	"D: HP LaserJet IIID (duplex capability)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet4	"D: HP LaserJet 4/5L/5P (not real LJ5), 600dpi"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet4d	"D: HP LaserJet 4 (duplex + 600dpi)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lj4dith	"D: HP LaserJet 4 (Floyd-Steinberg dithering)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ljet4pjl	"D: HP LaserJet 4V/4LJ Pro"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lj4dithp	"D: HP LaserJet 4V/4LJ Pro (dithering)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cljet5	"D: HP LaserJet 5/5M Color (new)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cljet5c	"D: HP LaserJet 5/5M Color Simple"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cljet5pr	"D: HP LaserJet 5/5M Color (old)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lj5mono	"D: HP LaserJet 5/6 (PCL5/PCL XL), bitmap"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lj5gray	"D: HP LaserJet 5/6 gray-scale bitmap"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pj		"D: HP PaintJet XL driver"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pjetxl	"D: HP PaintJet XL driver (alternate)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pjxl		"D: HP PaintJet XL color printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_paintjet	"D: HP PaintJet color printer (alternate)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pjxl300	"D: HP PaintJet XL300, DeskJet 1200C, CopyJet"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pxlmono	"D: HP PCL XL mono (LaserJet 5/6 family)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pxlcolor	"D: HP PCL XL color (Color LaserJet 4500/5000)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pcl3		"D: HP PCL 3+ (generic)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ijs		"D: HP Inkjet and other raster devices"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ibmpro	"D: IBM 9-pin Proprinter"	${OPTIONS_GS_DEFAULT_ON} \
+GS_jetp3852	"D: IBM Jetprinter ink-jet color (Model \#3852)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_imagen	"D: Imagen ImPress printers"	${OPTIONS_GS_DEFAULT_ON} \
+GS_fs600	"D: Kyocera FS-600 (600 dpi)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lxm5700m	"D: Lexmark 5700 monotone"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lxm3200	"D: Lexmark 3200/Z12/Z22/Z31/Z32"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lx5000	"D: Lexmark 5000/Z51/Z82"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lex2050	"D: Lexmark 2050"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lex3200	"D: Lexmark 3200"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lex5700	"D: Lexmark 5700"	${OPTIONS_GS_DEFAULT_ON} \
+GS_lex7000	"D: Lexmark 7000"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cp50		"D: Mitsubishi CP50 color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pr1000	"D: NEC PC-PR 1000"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pr1000_4	"D: NEC PC-PR 1000/4"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pr150	"D: NEC PC-PR 150"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pr201	"D: NEC PC-PR 201"	${OPTIONS_GS_DEFAULT_ON} \
+GS_picty180	"D: NEC PICTY 180 (PC-PR101J/180)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_necp6	"D: NEC PinWriter P6/P6+/P60 (360x360)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_npdl		"D: NEC Printer Description Language"	${OPTIONS_GS_DEFAULT_ON} \
+GS_oce9050	"D: OCE 9050 printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_oki182	"D: Okidata MicroLine 182"	${OPTIONS_GS_DEFAULT_ON} \
+GS_okiibm	"D: Okidata MicroLine IBM-compatible printers"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ml600	"D: Okidata Microline 600CL/620CL"	${OPTIONS_GS_DEFAULT_ON} \
+GS_oki4w	"D: Okidata OkiPage 4w+"	${OPTIONS_GS_DEFAULT_ON} \
+GS_atx23	"D: Practical Automation ATX-23"	${OPTIONS_GS_DEFAULT_ON} \
+GS_atx24	"D: Practical Automation ATX-24"	${OPTIONS_GS_DEFAULT_ON} \
+GS_atx38	"D: Practical Automation ATX-38"	${OPTIONS_GS_DEFAULT_ON} \
+GS_r4081	"D: Ricoh 4081 laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_rpdl		"D: Ricoh Printer Description Language"	${OPTIONS_GS_DEFAULT_ON} \
+GS_gdi		"D: Samsung SmartGDI laser printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_jj100	"D: Star JJ-100"	${OPTIONS_GS_DEFAULT_ON} \
+GS_sj48		"D: StarJet 48 inkjet printer"	${OPTIONS_GS_DEFAULT_ON} \
+GS_t4693d2	"D: Tektronix 4693d color, 2b/RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_t4693d4	"D: Tektronix 4693d color, 4b/RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_t4693d8	"D: Tektronix 4693d color, 8b/RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tek4696	"D: Tektronix 4695/4696 inkjet plotter"	${OPTIONS_GS_DEFAULT_ON} \
+GS_xes		"D: Xerox XES (2700, 3700, 4045, etc.)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpmono	"D: BMP Monochrome"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpgray	"D: BMP 8-bit gray"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp16	"D: BMP 4-bit EGA/VGA"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp256	"D: BMP 8-bit 256-color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp16m	"D: BMP 24-bit"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmp32b	"D: BMP 32-bit pseudo-.BMP"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpsep1	"D: BMP Separated 1-bit CMYK"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bmpsep8	"D: BMP Separated 8-bit CMYK"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ccr		"D: CalComp Raster format"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cgmmono	"D: CGM Monochrome -- LOW LEVEL OUTPUT ONLY"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cgm8		"D: CGM 8-bit 256-color -- DITTO"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cgm24	"D: CGM 24-bit color -- DITTO"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cif		"D: CIF file format for VLSI"	${OPTIONS_GS_DEFAULT_ON} \
+GS_dfaxhigh	"D: DigiBoard, DigiFAX (high res)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_dfaxlow	"D: DigiFAX (normal res)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_xcf		"D: Gimp XCF, RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_xcfcmyk	"D: Gimp XCF, CMYK"	${OPTIONS_GS_DEFAULT_ON} \
+GS_faxg3	"D: Group 3 FAX (EOL + no header/EOD)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_faxg32d	"D: Group 3 2-D FAX (EOL + no header/EOD)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_faxg4	"D: Group 4 FAX (EOL + no header/EOD)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_miff24	"D: ImageMagick MIFF, 24-bit direct color, RLE"	${OPTIONS_GS_DEFAULT_ON} \
+GS_inferno	"D: Inferno bitmaps"	${OPTIONS_GS_DEFAULT_ON} \
+GS_jpeg		"D: JPEG format, RGB output"	${OPTIONS_GS_DEFAULT_ON} \
+GS_jpeggray	"D: JPEG format, gray output"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mag16	"D: MAG format, 16-color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mag256	"D: MAG format, 256-color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrmono	"D: MGR devices 1-bit monochrome"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrgray2	"D: MGR devices 2-bit gray scale"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrgray4	"D: MGR devices 4-bit gray scale"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mgrgray8	"D: MGR devices 8-bit gray scale"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mgr4		"D: MGR devices 4-bit (VGA) color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_mgr8		"D: MGR devices 8-bit color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pcxmono	"D: PCX, 1-bit monochrome"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pcxgray	"D: PCX, 8-bit gray scale"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pcx16	"D: PCX, 4-bit planar EGA/VGA color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pcx256	"D: PCX, 8-bit chunky color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pcx24b	"D: PCX, 24-bit color 3x8-bit planes"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pcxcmyk	"D: PCX, 4-bit chunky CMYK color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pdfwrite	"D: Portable Document Format"	${OPTIONS_GS_DEFAULT_ON} \
+GS_psdrgb	"D: PhotoShop PSD, RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_psdcmyk	"D: PhotoShop PSD, CMYK"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bit		"D: Plain bits, monochrome"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bitrgb	"D: Plain bits, RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bitcmyk	"D: Plain bits, CMYK"	${OPTIONS_GS_DEFAULT_ON} \
+GS_plan9bm	"D: Plan 9 bitmap format"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pam		"D: Portable Arbitrary Map file"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pbm		"D: Portable Bitmap, plain"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pbmraw	"D: Portable Bitmap, raw"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pgm		"D: Portable Graymap, plain"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pgmraw	"D: Portable Graymap, raw"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pgnm		"D: Portable Graymap, plain (PBM opt)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pgnmraw	"D: Portable Graymap, raw (PBM opt)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pnm		"D: Portable Pixmap, plain RGB (PGM/PBM opt)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pnmraw	"D: Portable Pixmap, raw RGB (PGM/PBM opt)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ppm		"D: Portable Pixmap, plain RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ppmraw	"D: Portable Pixmap, raw RGB"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pkm		"D: Portable inKmap, plain (4b CMYK=>RGB)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pkmraw	"D: Portable inKmap, raw (4b CMYK=>RGB)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pksm		"D: Portable Separated map, plain (4b CMYK=>4p)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pksmraw	"D: Portable Separated map, raw (4b CMYK=>4p)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pngmono	"D: PNG (Portable Network Graphics) Mono"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pnggray	"D: PNG 8-bit Gray"	${OPTIONS_GS_DEFAULT_ON} \
+GS_png16	"D: PNG 4-bit Color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_png256	"D: PNG 8-bit Color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_png16m	"D: PNG 24-bit Color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pngalpha	"D: PNG 32-bit RGBA Color"	${OPTIONS_GS_DEFAULT_ON} \
+GS_psmono	"D: PostScript (Level 1) monochrome image"	${OPTIONS_GS_DEFAULT_ON} \
+GS_psgray	"D: PostScript (Level 1) 8-bit gray image"	${OPTIONS_GS_DEFAULT_ON} \
+GS_psrgb	"D: PostScript (Level 2) 24-bit color image"	${OPTIONS_GS_DEFAULT_ON} \
+GS_pswrite	"D: PostScript (like PostScript Distiller)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_ps2write	"D: PostScript (Level 2) output"	${OPTIONS_GS_DEFAULT_ON} \
+GS_epswrite	"D: Encapsulated PostScript"	${OPTIONS_GS_DEFAULT_ON} \
+GS_cfax		"D: SFF format for CAPI FAX interface"	${OPTIONS_GS_DEFAULT_ON} \
+GS_sgirgb	"D: SGI RGB pixmap format"	${OPTIONS_GS_DEFAULT_ON} \
+GS_sunhmono	"D: Harlequin variant of 1-bit Sun raster file"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffcrle	"D: TIFF CCITT RLE 1 dim (G3 FAX with no EOL)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffg3	"D: TIFF Group 3 FAX (with EOL)"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffg32d	"D: TIFF Group 3 2-D FAX"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffg4	"D: TIFF Group 4 FAX"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffgray	"D: TIFF 8-bit gray, no compress"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiff12nc	"D: TIFF 12-bit RGB, no compress"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiff24nc	"D: TIFF 24-bit RGB, no compress, NeXT format"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiff32nc	"D: TIFF 32-bit CMYK"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffsep	"D: TIFF gray + CMYK composite"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tifflzw	"D: TIFF LZW,      tag = 5,     mono"	${OPTIONS_GS_DEFAULT_ON} \
+GS_tiffpack	"D: TIFF PackBits, tag = 32773, mono"	${OPTIONS_GS_DEFAULT_ON} \
+GS_bbox		"D: Bounding box output"	${OPTIONS_GS_DEFAULT_ON} \
+GS_devicen	"D: DeviceN process color model device"	${OPTIONS_GS_DEFAULT_ON} \
+GS_perm		"D: DeviceN which permutes color components"	${OPTIONS_GS_DEFAULT_ON} \
+GS_spotcmyk	"D: DeviceN with CMYK and spot color support"	${OPTIONS_GS_DEFAULT_ON} \
+GS_imdi		"D: IMDI color converting device"	${OPTIONS_GS_DEFAULT_ON} \
+GS_wtsimdi	"D: WTS halftoning device"	${OPTIONS_GS_DEFAULT_ON} \
+GS_wtscmyk	"D: WTS halftoning CMYK device"	${OPTIONS_GS_DEFAULT_ON}
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/pkg-plist,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/pkg-plist -L print/ghostscript-gpl/pkg-plist -u -r1.2 -r1.3
--- print/ghostscript-gpl/pkg-plist
+++ print/ghostscript-gpl/pkg-plist
@@ -1,22 +1,22 @@
- at comment $FreeBSD: ports/print/ghostscript-gpl/pkg-plist,v 1.41 2007/03/27 19:59:20 rafan Exp $
+ at comment $FreeBSD: ports/print/ghostscript8/pkg-plist,v 1.50 2008/11/02 15:42:28 hrs Exp $
 bin/bdftops
 bin/dumphint
 bin/dvipdf
 bin/eps2eps
-bin/ert
+%%GS_dmprt%%bin/ert
 bin/fixmswrd.pl
 bin/font2c
 bin/gs
 bin/gsbj
-%%SHLIB%%bin/gsc
+bin/gsc
 bin/gsdj
 bin/gsdj500
 bin/gslj
 bin/gslp
 bin/gsnd
-%%SHLIB%%bin/gsx
+bin/gsx
 bin/lprsetup.sh
-bin/pcl3opts
+%%GS_pcl3%%bin/pcl3opts
 bin/pdf2dsc
 bin/pdf2ps
 bin/pdfopt
@@ -35,35 +35,13 @@
 bin/pv.sh
 bin/unix-lpr.sh
 bin/wftopfa
-%%SHLIB%%include/ghostscript/iapi.h
-%%SHLIB%%include/ghostscript/ierrors.h
-%%SHLIB%%lib/libgs.so
-%%SHLIB%%lib/libgs.so.%%SHLIB_VER%%
-%%SHLIB%%lib/libgs.so.%%GS_VERSION%%
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/alps/README.gdevalps
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/bj10v/gdev10v.jis
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/dmprt/gdevdmpr.sj
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ChangeLog
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/ert.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gdevepag.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/gsepagif.sh
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/epag/psprint
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/eplaser/readme-eplaser-705.euc
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/gdi/README
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lips/Gdevlips.htm
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/README
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/RELEASE_NOTES
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/lxm3200/Z12-Z31-QuickSetup
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/md2k/README.jis
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/MJ700V2C.FAQ
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mjc
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.mje
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/README.noz
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/mjc/cpem.doc
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/NEWS
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/gs-pcl3.html
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/how-to-report.txt
-%%PORTDOCS%%%%DOCSDIR%%/%%GS_VERSION%%/pcl3/pcl3opts.html
+include/ghostscript/gdevdsp.h
+include/ghostscript/iapi.h
+include/ghostscript/ierrors.h
+ at dirrm include/ghostscript
+lib/libgs.so
+lib/libgs.so.%%SHLIB_VER%%
+lib/libgs.so.%%GS_VERSION%%
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-EUC-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/78-H
@@ -282,11 +260,19 @@
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF32-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS-UTF8-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF16-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF32-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJIS2004-UTF8-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-HW-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISPro-UTF8-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX0213-UTF32-V
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-H
+%%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniJISX02132004-UTF32-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-H
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UCS2-V
 %%DATADIR%%/%%GS_VERSION%%/Resource/CMap/UniKS-UTF16-H
@@ -309,6 +295,41 @@
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/StandardEncoding
 %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding/Unicode
 %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding/Wingdings
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-BoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Ital
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/CenturySchL-Roma
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/Dingbats
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-BoldObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-Regu
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusMonL-ReguObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-Medi
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-MediItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-Regu
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusRomNo9L-ReguItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldCond
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldCondItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-BoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-Regu
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguCond
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguCondItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/NimbusSanL-ReguItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/StandardSymL
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-DemiBold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-DemiBoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-Ligh
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWBookmanL-LighItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWChanceryL-MediItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-Book
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-BookObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-Demi
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWGothicL-DemiObli
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Bold
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-BoldItal
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Ital
+%%DATADIR%%/%%GS_VERSION%%/Resource/Font/URWPalladioL-Roma
 %%DATADIR%%/%%GS_VERSION%%/doc/API.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/C-style.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Changes.htm
@@ -337,7 +358,6 @@
 %%DATADIR%%/%%GS_VERSION%%/doc/Issues.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Language.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Lib.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/Maintain.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Make.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/News.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Projects.htm
@@ -349,7 +369,6 @@
 %%DATADIR%%/%%GS_VERSION%%/doc/Readme.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Release.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Source.htm
-%%DATADIR%%/%%GS_VERSION%%/doc/Testing.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Unix-lpr.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Use.htm
 %%DATADIR%%/%%GS_VERSION%%/doc/Xfonts.htm
@@ -368,11 +387,32 @@
 %%DATADIR%%/%%GS_VERSION%%/examples/tiger.eps
 %%DATADIR%%/%%GS_VERSION%%/examples/vasarely.ps
 %%DATADIR%%/%%GS_VERSION%%/examples/waterfal.ps
+%%FAPI%%%%DATADIR%%/%%GS_VERSION%%/lib/FAPIcidfmap
+%%FAPI%%%%DATADIR%%/%%GS_VERSION%%/lib/FAPIconfig
+%%FAPI%%%%DATADIR%%/%%GS_VERSION%%/lib/FAPIfontmap
 %%DATADIR%%/%%GS_VERSION%%/lib/FCOfontmap-PCLPS2
 %%DATADIR%%/%%GS_VERSION%%/lib/Fontmap
 %%DATADIR%%/%%GS_VERSION%%/lib/Fontmap.GS
 %%DATADIR%%/%%GS_VERSION%%/lib/PDFA_def.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/PDFX_def.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/PM760p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/PM760pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/PM820p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/PM820pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc670p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc670pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc680p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc680pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc740p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc740pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc760p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc760pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc777p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stc777pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp720p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp720pl.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp870p.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/Stp870pl.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/acctest.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/addxchar.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/align.ps
@@ -384,6 +424,8 @@
 %%DATADIR%%/%%GS_VERSION%%/lib/bj8pa06n.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/bj8pp12f.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/bj8ts06n.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/bjc6000a1.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/bjc6000b1.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/bjc610a0.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/bjc610a1.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/bjc610a2.upp
@@ -512,9 +554,9 @@
 %%DATADIR%%/%%GS_VERSION%%/lib/landscap.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/level1.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/lines.ps
-%%DATADIR%%/%%GS_VERSION%%/lib/lqx70ch.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cl.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cm.upp
+%%GS_dmprt%%%%DATADIR%%/%%GS_VERSION%%/lib/lqx70ch.upp
+%%GS_dmprt%%%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cl.upp
+%%GS_dmprt%%%%DATADIR%%/%%GS_VERSION%%/lib/lqx70cm.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/markhint.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/markpath.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/mkcidfm.ps
@@ -525,6 +567,7 @@
 %%DATADIR%%/%%GS_VERSION%%/lib/pcharstr.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/pdf2dsc.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/pdf_base.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/pdf_cslayer.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/pdf_draw.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/pdf_font.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/pdf_main.ps
@@ -551,8 +594,12 @@
 %%DATADIR%%/%%GS_VERSION%%/lib/ras4.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/ras8m.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/rollconv.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/s400a1.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/s400b1.upp
+%%DATADIR%%/%%GS_VERSION%%/lib/sharp.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/showchar.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/showpage.ps
+%%DATADIR%%/%%GS_VERSION%%/lib/sipixa6.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/st640ih.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/st640ihg.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/st640p.upp
@@ -575,8 +622,6 @@
 %%DATADIR%%/%%GS_VERSION%%/lib/stc600pl.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/stc640p.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/stc740ih.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc740p.upp
-%%DATADIR%%/%%GS_VERSION%%/lib/stc740pl.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/stc800ih.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/stc800p.upp
 %%DATADIR%%/%%GS_VERSION%%/lib/stc800pl.upp
@@ -605,27 +650,23 @@
 %%DATADIR%%/%%GS_VERSION%%/lib/wrfont.ps
 %%DATADIR%%/%%GS_VERSION%%/lib/xlatmap
 %%DATADIR%%/%%GS_VERSION%%/lib/zeroline.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/BUGS
-%%DATADIR%%/%%GS_VERSION%%/pcl3/NEWS
-%%DATADIR%%/%%GS_VERSION%%/pcl3/README
-%%DATADIR%%/%%GS_VERSION%%/pcl3/calign.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/dumppdd.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/example.mcf
-%%DATADIR%%/%%GS_VERSION%%/pcl3/if-pcl3
-%%DATADIR%%/%%GS_VERSION%%/pcl3/levels-test.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
-%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
- at exec ln -s -f %D/share/fonts/CIDFont %%CIDFONTDIR%%/CIDFont
- at unexec rm -f %%CIDFONTDIR%%/CIDFont
-%%SHLIB%%@dirrm include/ghostscript
- at dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/calign.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/dumppdd.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/example.mcf
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/if-pcl3
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/levels-test.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-A4Rotated.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Env10Rotated.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-EnvDLRotated.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-Letter.ps
+%%GS_pcl3%%%%DATADIR%%/%%GS_VERSION%%/pcl3/margins-LetterRotated.ps
+%%CIDFONTDIR%%/CIDFont
+%%GS_pcl3%%@dirrm %%DATADIR%%/%%GS_VERSION%%/pcl3
 @dirrm %%DATADIR%%/%%GS_VERSION%%/lib
 @dirrm %%DATADIR%%/%%GS_VERSION%%/examples
 @dirrm %%DATADIR%%/%%GS_VERSION%%/doc
+ at dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Font
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Encoding
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/Decoding
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource/ColorSpace
@@ -633,16 +674,3 @@
 @dirrm %%DATADIR%%/%%GS_VERSION%%/Resource
 @dirrmtry %%DATADIR%%/%%GS_VERSION%%
 @dirrmtry %%DATADIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/pcl3
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/mjc
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/md2k
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lxm3200
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/lips
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/gdi
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/eplaser
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/epag
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/dmprt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/bj10v
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%/alps
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/%%GS_VERSION%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L print/ghostscript-gpl/Makefile -L print/ghostscript-gpl/Makefile -u -r1.8 -r1.9
--- print/ghostscript-gpl/Makefile
+++ print/ghostscript-gpl/Makefile
@@ -1,87 +1,66 @@
-# New ports collection makefile for:	ghostscript
-# Date created:		Tue Jun 10 21:58:54 CEST 1997
-# Whom:			Andreas Klemm 
 #
-# $FreeBSD: ports/print/ghostscript-gpl/Makefile,v 1.143 2006/08/15 00:56:22 clsung Exp $
 # $MidnightBSD$
 #
 
 PORTNAME=	ghostscript
-PORTVERSION=	${GS_VERSION}
-PORTREVISION=	${GS_REVISION}
-PORTEPOCH=	${GS_EPOCH}
+PORTVERSION=	8.63
 CATEGORIES=	print
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs,bjc250/} \
-		http://www.gelhaus.net/hp880c/1.4beta/:hp8xx \
-		http://home.vrweb.de/~martin.lottermoser/pcl3dist/:pcl3 \
-		http://www.harsch.net/Download/:dj970 \
-		http://www33.ocn.ne.jp/~higamasa/gdevmd2k/:md2k \
-		${MASTER_SITE_PORTS_JP:S/$/:ports_jp,ports_jp_gs/} \
-		ftp://download.canon-sales.co.jp/pub/driver/lasershot/linux/:cpca \
-		http://www.ucatv.ne.jp/~taeko/software/gs/:lips \
-		http://www.humblesoft.com/pub/:epag \
-		${MASTER_SITE_FREEBSD_LOCAL}:eplaser \
-		http://www.openprinting.org/download/printing/ghostscript-8.x/drivers/hl1250/:hl1250 \
-		http://www.linuxprinting.org/download/printing/samsung-gdi/:gdi \
-		http://www.linuxprinting.org/download/printing/:lxm3200 \
-		http://homepage.powerup.com.au/~pbwest/lexmark/:lx5000 \
-		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${GS_VERSION:S/.//}/:gs_srcs
-MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs,ports_jp_gs \
-			bjc250gs/:bjc250 \
-			./:ports_jp \
-			arved/:eplaser
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:S/$/:gs_srcs/} \
+		ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/GPL/gs${PORTVERSION:S/.//}/:gs_srcs \
+		http://www.humblesoft.com/pub/:epag
+MASTER_SITE_SUBDIR=	ghostscript/:gs_srcs
 PKGNAMESUFFIX=	-gpl
-DISTFILES=	${GS_SRCS}:gs_srcs \
-		${HP8XX_SRCS}:hp8xx \
-		${PCL3_SRCS}:pcl3 \
-		${DJ970_SRCS}:dj970 \
-		${MD2K_SRCS}:md2k \
-		${ALPS_SRCS}:ports_jp_gs \
-		${BJ10V_SRCS}:ports_jp_gs \
-		${BJC250_SRCS}:bjc250 \
-		${CPCA_SRCS}:cpca \
-		${LIPS_SRCS}:lips \
-		${DMPRT_SRCS}:ports_jp_gs \
-		${EPAG_SRCS}:epag \
-		${EPLASER_SRCS}:eplaser \
-		${MJC_SRCS}:ports_jp \
-		${GDI_SRCS}:gdi \
-		${LXM3200_SRCS}:lxm3200 \
-		${LX5000_SRCS}:lx5000 \
-		${LEX7000_SRCS}:lx5000 \
-		${HL1250_SRCS}:hl1250
-DIST_SUBDIR=	ghostscript
-EXTRACT_ONLY=	${GS_SRCS}
+DISTNAME=	${PORTNAME:S,8$,,}-${PORTVERSION}
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX}:gs_srcs ${EPAG_SRCS}:epag
+DIST_SUBDIR=	${PORTNAME:S,8$,,}
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports at MidnightBSD.org
-COMMENT=	GPL Postscript interpreter
+COMMENT=	Ghostscript 8.x PostScript interpreter
 LICENSE=	gpl2
 
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		png.5:${PORTSDIR}/graphics/png
-RUN_DEPENDS=	${LOCALBASE}/share/ghostscript/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
+RUN_DEPENDS=	${LOCALBASE}/share/${PORTNAME:S,8,,}/fonts/a010013l.pfb:${PORTSDIR}/print/gsfonts
 
-FAKE_OPTS=	trueprefix
+CONFLICTS=	gambc-[0-9]* 
 
-CONFLICTS=	ghostscript-afpl*
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 WANT_GNOME=	yes
-CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd6.0 \
-			--host=${ARCH}-portbld-freebsd6.0 \
-			--target=${ARCH}-portbld-freebsd6.0
-MAKE_ENV=	CC="${CC}" CXX="${CXX}" CFLAGS_STANDARD="${CFLAGS}" \
-		XCFLAGS="${XCFLAGS}"
-PLIST_SUB=	GS_VERSION="${GS_VERSION}" \
-		CIDFONTDIR=${CIDFONTDIR}
-
-SCRIPTS_ENV=	GS_DRIVERS_LIST="${GS_DRIVERS_LIST}" \
-		WITHOUT_X11="${WITHOUT_X11}" \
-		WITH_SVGALIB="${WITH_SVGALIB}"
-
-MAN1=		dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 pdf2dsc.1 pdf2ps.1 \
-		pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 ps2ascii.1 \
-		ps2epsi.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
+USE_LDCONFIG=	yes
+GNU_CONFIGURE=	yes
+
+MAKE_ENV=	CFLAGS_STANDARD="${CFLAGS}" \
+		XCFLAGS="${XCFLAGS}" XLDFLAGS="${XLDFLAGS}" \
+		EXTRALIBS="${EXTRALIBS}" \
+		SOC_LOADER="dxmainc.c"
+CONFIGURE_ENV=	${MAKE_ENV} \
+		CPPFLAGS="-DUPD_SIGNAL=0 -I. -I${WRKSRC}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--disable-compile-inits \
+		--enable-contrib \
+		--enable-dynamic \
+		--with-ijs \
+		--with-jasper
+XCFLAGS=	${PTHREAD_CFLAGS}
+XLDFLAGS=	${PTHREAD_LIBS}
+
+PLIST_SUB=	GS_VERSION="${PORTVERSION}" \
+		CIDFONTDIR="${CIDFONTDIR:S,^${PREFIX}/,,}"
+SUB_FILES=	pkg-message
+SUB_LIST=	DATADIR=${DATADIR} PORTVERSION=${PORTVERSION}
+PKGMESSAGE=	${WRKDIR}/pkg-message
+DATADIR=	${PREFIX}/share/${PORTNAME:S,8$,,}
+
+OPTIONS=	A4SIZE	"Set A4 (not Letter) as a default paper size"	off \
+		FONTCONFIG	"fontconfig support"	on \
+		FT_BRIDGE	"FreeType bridge"	off \
+		X11	"X11 support"	on
+
+MAN1=		dvipdf.1 font2c.1 gs.1 gslp.1 gsnd.1 \
+		pdf2dsc.1 pdf2ps.1 pdfopt.1 pf2afm.1 pfbtopfa.1 printafm.1 \
+		ps2ascii.1 ps2epsi.1 ps2pdf.1 ps2pdfwr.1 ps2ps.1 wftopfa.1
 MLINKS=		gslp.1 gsbj.1 \
 		gslp.1 gsdj.1 \
 		gslp.1 gsdj500.1 \
@@ -90,562 +69,202 @@
 		ps2pdf.1 ps2pdf13.1 \
 		ps2ps.1 eps2eps.1
 
-XCFLAGS=	-DUPD_SIGNAL=0 -DHAVE_HYPOT=1 -DSYS_TYPES_HAS_STDINT_TYPES=1
+CIDFONTDIR=	${DATADIR}/${PORTVERSION}/Resource
 
-.if defined(A4)
-XCFLAGS+=	-DA4
-.endif
+.include "Makefile.drivers"
+.include 
 
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
+.for D in ${OPTIONS:MGS_*:S/^GS_//}
+.if !defined(WITHOUT_GS_${D})
+PLIST_SUB+=	GS_${D}=""
 .else
-USE_XORG=	xt xext
+PLIST_SUB+=	GS_${D}="@comment "
+.endif
+.endfor
+
+.if !defined(WITHOUT_GS_dmprt)
+.include "${FILESDIR}/Makefile.dmprt"
+.endif
+
+.if !defined(WITHOUT_GS_epag)
+.include "${FILESDIR}/Makefile.epag"
+.endif
+
+EPAG_BASE=	epag
+EPAG_SRCS=	${EPAG_BASE}-3.09.tar.gz
+EPAG_NAME=	${EPAG_SRCS:S,.tar.gz$,,}
+
+post-extract-epag:
+	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
+	${LN} -s -f ${EPAG_NAME} ${WRKSRC}/${EPAG_BASE}
+	${INSTALL_DATA} ${FILESDIR}/epag.contrib.mak ${WRKSRC}/src/epag.contrib.mak
+
+post-extract: post-extract-epag
+
+.if !defined(WITHOUT_GS_pcl3)
+.include "${FILESDIR}/Makefile.pcl3"
+.endif
+
+.if defined(WITHOUT_SVGALIB)
+.undef WITH_GS_lvga256
+.undef WITH_GS_vgalib
 .endif
 
-.if defined(WITH_SVGALIB)
+.if defined(WITH_GS_lvga256) \
+	|| defined(WITH_GS_vgalib)
 LIB_DEPENDS+=	vga.1:${PORTSDIR}/graphics/svgalib
 .endif
 
-.if defined(WITH_FT_BRIDGE)
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libfreetype.a:${PORTSDIR}/print/freetype2
-MAKE_ENV+=	FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".a"
+.if defined(WITHOUT_X11)
+. undef WITH_GS_x11
+. undef WITH_GS_x11alpha
+. undef WITH_GS_x11cmyk
+. undef WITH_GS_x11cmyk2
+. undef WITH_GS_x11cmyk4
+. undef WITH_GS_x11cmyk8
+. undef WITH_GS_x11gray2
+. undef WITH_GS_x11gray4
+. undef WITH_GS_x11mono
+. undef WITH_GS_x11rg16x
+. undef WITH_GS_x11rg32x
 .endif
 
-.if defined(WITHOUT_SHLIB)
-ALL_TARGET=	all pcl3opts
-PLIST_SUB+=	SHLIB="@comment "
+.if defined(WITH_GS_x11) \
+	|| defined(WITH_GS_x11alpha) \
+	|| defined(WITH_GS_x11cmyk) \
+	|| defined(WITH_GS_x11cmyk2) \
+	|| defined(WITH_GS_x11cmyk4) \
+	|| defined(WITH_GS_x11cmyk8) \
+	|| defined(WITH_GS_x11gray2) \
+	|| defined(WITH_GS_x11gray4) \
+	|| defined(WITH_GS_x11mono) \
+	|| defined(WITH_GS_x11rg16x) \
+	|| defined(WITH_GS_x11rg32x)
+USE_XORG=	xt xext
+CONFIGURE_ARGS+=--with-x \
+		--x-includes=${X11BASE}/include \
+		--x-libraries=${X11BASE}/lib
+CONFLICTS+=	ghostscript8-nox11-[0-9]*
 .else
-.undef WITHOUT_X11
-USE_GNOME+=	gtk20
-ALL_TARGET=	so pcl3opts
-INSTALL_TARGET=	soinstall
-USE_LDCONFIG=	yes
-PLIST_SUB+=	SHLIB="" SHLIB_VER="${GS_VERSION:R}"
-INCLUDEDIR=	${PREFIX}/include/ghostscript
+PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-nox11
+CONFIGURE_ARGS+=--without-x
+CONFLICTS+=	ghostscript8-[0-9]*
 .endif
 
-GS_SRCS=	${DISTNAME}${EXTRACT_SUFX}
-CIDFONTDIR=	${PREFIX}/share/ghostscript/${GS_VERSION}/Resource
+.if defined(WITHOUT_ICONV)
+. undef WITH_GS_oprp
+. undef WITH_GS_opvp
+.endif
 
-# Additional Drivers:
+_ICONV_ARG=	no
+.if defined(WITH_GS_oprp) \
+	|| defined(WITH_GS_opvp)
+USE_ICONV=	yes
+_ICONV_ARG=	gnu
+EXTRALIBS+=	-liconv
+.endif
+CONFIGURE_ARGS+=--with-libiconv=${_ICONV_ARG}
 
-# HP8XX - additional driver for HP DeskJet 812C/815C/832C/880C/882C/895C
-# http://www.gelhaus.net/hp880c/
-HP8XX=		cdj880
-HP8XX_SRCS=	gdevcd8.tar.gz
-
-# PCL3 - additional driver for HP PCL3 printers, by Martin Lottermoser
-# http://home.vrweb.de/martin.lottermoser/pcl3.html
-# broken
-PCL3=		pcl3
-PCL3_VERS=	3.3
-PCL3_NAME=	${PCL3}-${PCL3_VERS}
-PCL3_SRCS=	${PCL3_NAME}.tar.gz
-PCL3_MAN1=	gs-pcl3.1 pcl3opts.1
-MAN1+=		${PCL3_MAN1}
-
-# DJ970 - additional driver for HP DeskJet 970, supports duplex printing
-# http://www.harsch.net/Ghostscript/ghostscript.html
-DJ970=		gdevdj9
-DJ970_SRCS=	${DJ970}.c.gz
-
-# MD2K - additional driver for Alps MD-2000/2010/4000/1300/1500/5000
-# http://www33.ocn.ne.jp/~higamasa/gdevmd2k/
-MD2K=		md2k
-MD2K_VERS=	0.2a
-MD2K_NAME=	gdevmd2k-${MD2K_VERS}
-MD2K_SRCS=	${MD2K_NAME}.tar.gz
-
-# ALPS - additional driver for Alps MD-5000
-ALPS=		alps
-ALPS_VERS=	0.2
-ALPS_NAME=	gdevalps-${ALPS_VERS}
-ALPS_SRCS=	gdevalps-0.21.tar.gz
-
-# BJ10V - additional driver for Canon BJ-10V
-BJ10V=		bj10v
-BJ10V_NAME=	gdev10v
-BJ10V_SRCS=	${BJ10V_NAME}.tar.gz
-
-# BJC250 - additional driver for Canon BJC-210/240/250/265/1000
-# http://bjc250gs.sourceforge.net/
-BJC250=		bjc250
-BJC250_VERS=	0.756
-BJC250_NAME=	${BJC250}-v${BJC250_VERS}
-BJC250_SRCS=	gs7.05-${BJC250_NAME}.diff.gz
-
-# CPCA - additional driver for Canon CPCA printers
-# http://cweb.canon.jp/open-mie/technical/index-j.html
-CPCA=		cpca
-CPCA_VERS=	1.0.0
-CPCA_NAME=	canon-lips4-${CPCA_VERS}
-CPCA_SRCS=	${CPCA_NAME}-651.tgz
-
-# LIPS - additional driver for Canon LIPS II+/III/IVc/IV printers
-# http://www.ucatv.ne.jp/~taeko/software/gs/
-LIPS=		lips
-LIPS_VERS=	2.4.0
-LIPS_NAME=	gdevlips-${LIPS_VERS}
-LIPS_SRCS=	${LIPS_NAME}.tar.gz
-
-# DMPRT - additional driver for generic dot matrix printers
-DMPRT=		dmprt
-DMPRT_VERS=	2.01
-DMPRT_NAME=	${DMPRT}-${DMPRT_VERS}
-DMPRT_SRCS=	${DMPRT_NAME}.tar.gz
-
-# EPAG - additional driver for Epson ESC/Page printers
-# http://www.humblesoft.com/gdevepag.html
-EPAG=		epag
-EPAG_VERS=	3.09
-EPAG_NAME=	${EPAG}-${EPAG_VERS}
-EPAG_SRCS=	${EPAG_NAME}.tar.gz
-
-# EPLASER - additional driver for ESC/Page printers, by EPSON AVASYS Corp.
-# http://www.avasys.jp/english/linux_e/index.html
-EPLASER=	eplaser
-EPLASER_VERS=	3.1.4
-EPLASER_NAME=	${EPLASER}-${EPLASER_VERS}
-EPLASER_SRCS=	${EPLASER_NAME}-705.tgz
-
-# MJC - additional driver for Epson MachJet series
-MJC=		mjc
-MJC_VERS=	0.8
-MJC_NAME=	gdevmjc-${MJC_VERS}
-MJC_SRCS=	${MJC_NAME}.tar.gz
-
-# GDI - additional driver for Samsung SmartGDI laser printers
-GDI=		gdi
-GDI_NAME=	Samsung-SmartGDI-all-GS
-GDI_SRCS=	${GDI_NAME}.orig.tar.gz
-
-# LXM3200 - additional driver for Lexmark 3200/Z12/Z22/Z31/Z32
-LXM3200=	lxm3200
-LXM3200_VERS=	20030501
-LXM3200_NAME=	${LXM3200}-tweaked-${LXM3200_VERS}
-LXM3200_SRCS=	${LXM3200_NAME}.tar.gz
-
-# LX5000 - additional driver for Lexmark 5000/Z51/Z82
-# http://homepage.powerup.com.au/~pbwest/lexmark/lexmark.html
-LX5000=		lx5000
-LX5000_SRCS=	gdevlx50.c
-
-# LEX7000 - additional driver for Lexmark 2050/3200/5700/7000
-# http://bimbo.fjfi.cvut.cz/~paluch/l7kdriver/
-LEX7000=	lex7000
-LEX7000_SRCS=	gs6.0.lexmark7000.patch
-
-# HL1250 - additional driver for Brother HL-1050/1070/1250/1270N/1030/1240
-HL1250=		hl1250
-HL1250_SRCS=	gdevhl12.c
-
-# contributed uniprint profiles
-CONTRIB_UPP=	lqx70ch.upp lqx70cl.upp lqx70cm.upp \
-		stc740ih.upp stc740p.upp stc740pl.upp
+.if !defined(WITH_LETTERSIZE)
+.if defined(A4) || defined(WITH_A4SIZE)
+XCFLAGS+=	-DA4
+MSG_PAPERSIZE=	"NOTE: Default paper size will be A4."
+.endif
+.endif
 
-.include "Makefile.inc"
-.include 
-.SILENT:
+.if !defined(WITHOUT_FONTCONFIG)
+LIB_DEPENDS+=	fontconfig.1:${PORTSDIR}/x11-fonts/fontconfig
+CONFIGURE_ARGS+=	--enable-fontconfig
+.else
+CONFIGURE_ARGS+=	--disable-fontconfig
+.endif
 
-pre-everything::
-.if !defined(A4)
-	${ECHO_MSG} "Type \"make A4=yes\" if you want -DA4 for compilation."
+.if !defined(WITHOUT_FT_BRIDGE)
+LIB_DEPENDS+=	freetype.9:${PORTSDIR}/print/freetype2
+MAKE_ENV+=	FT_BRIDGE=1 FT_ROOT="${WRKSRC}/freetype" FT_LIB_EXT=".so"
+PLIST_SUB+=	FAPI=""
 .else
-	${ECHO_MSG} "Using -DA4 for compilation."
+PLIST_SUB+=	FAPI="@comment "
 .endif
 
-post-extract:
-	${ECHO_MSG} ">>> in post-extract ..."
-# ** 3rd party driver **
-# Note: don't forget to add those devices in scripts/configure,
-# which update unix-gcc.mak to build gs with these new devices!
-#
-# for HP8XX driver
-	${ECHO_MSG} ">>>   extracting ${HP8XX_SRCS} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${HP8XX_SRCS}
-# for PCL3 driver
-	${ECHO_MSG} ">>>   extracting ${PCL3_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${PCL3_SRCS}
-	${LN} -sf ${PCL3_NAME} ${WRKSRC}/${PCL3}
-	${TAR} -C ${WRKSRC}/${PCL3_NAME} -xf \
-		${WRKSRC}/${PCL3_NAME}/${PCL3}.tar
-# for DJ970 driver
-	${ECHO_MSG} ">>>   extracting ${DJ970_SRCS} ..."
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DJ970_SRCS} ${WRKSRC}/src
-	${GUNZIP_CMD} ${WRKSRC}/src/${DJ970_SRCS}
-# for MD2K driver
-	${ECHO_MSG} ">>>   extracting ${MD2K_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MD2K_SRCS}
-	${LN} -sf ${MD2K_NAME} ${WRKSRC}/${MD2K}
-# for ALPS driver
-	${ECHO_MSG} ">>>   extracting ${ALPS_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${ALPS_SRCS}
-	${LN} -sf ${ALPS_NAME} ${WRKSRC}/${ALPS}
-# for BJ10V driver
-	${ECHO_MSG} ">>>   extracting ${BJ10V_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${BJ10V_SRCS}
-# for BJC250 driver
-	${ECHO_MSG} ">>>   extracting ${BJC250_SRCS} ..."
-	${MKDIR} ${WRKSRC}/${BJC250_NAME}/src
-	${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${BJC250_SRCS} | \
-		${PATCH} -d ${WRKSRC}/${BJC250_NAME} -f -s -N -E -p1 \
-		2>/dev/null || ${TRUE}
-	${LN} -sf ${BJC250_NAME} ${WRKSRC}/${BJC250}
-# for CPCA driver
-	${ECHO_MSG} ">>>   extracting ${CPCA_SRCS} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${CPCA_SRCS}
-# for LIPS driver
-	${ECHO_MSG} ">>>   extracting ${LIPS_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LIPS_SRCS}
-	${LN} -sf ${LIPS_NAME} ${WRKSRC}/${LIPS}
-# for DMPRT driver
-	${ECHO_MSG} ">>>   extracting ${DMPRT_SRCS} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${DMPRT_SRCS}
-# for EPAG driver
-	${ECHO_MSG} ">>>   extracting ${EPAG_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPAG_SRCS}
-	${LN} -sf ${EPAG_NAME} ${WRKSRC}/${EPAG}
-# for EPLASER driver
-	${ECHO_MSG} ">>>   extracting ${EPLASER_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${EPLASER_SRCS}
-	${LN} -sf ${EPLASER_NAME} ${WRKSRC}/${EPLASER}
-# for MJC driver
-	${ECHO_MSG} ">>>   extracting ${MJC_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${MJC_SRCS}
-	${LN} -sf ${MJC_NAME} ${WRKSRC}/${MJC}
-# for GDI driver
-	${ECHO_MSG} ">>>   extracting ${GDI_SRCS} ..."
-	${TAR} -C ${WRKSRC}/src -xzf ${DISTDIR}/${DIST_SUBDIR}/${GDI_SRCS}
-# for LXM3200 driver
-	${ECHO_MSG} ">>>   extracting ${LXM3200_SRCS} ..."
-	${TAR} -C ${WRKSRC} -xzf ${DISTDIR}/${DIST_SUBDIR}/${LXM3200_SRCS}
-	${LN} -sf ${LXM3200_NAME} ${WRKSRC}/${LXM3200}
-# for LX5000 driver
-	${ECHO_MSG} ">>>   extracting ${LX5000_SRCS} ..."
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${LX5000_SRCS} ${WRKSRC}/src
-# for LEX7000 driver
-	${ECHO_MSG} ">>>   extracting ${LEX7000_SRCS} ..."
-	${MKDIR} ${WRKSRC}/${LEX7000}
-	${CAT} ${DISTDIR}/${DIST_SUBDIR}/${LEX7000_SRCS} | \
-		${PATCH} -d ${WRKSRC}/${LEX7000} -f -s -N -E -p1 \
-		2>/dev/null || ${TRUE}
-# for HL1250 driver
-	${ECHO_MSG} ">>>   extracting ${HL1250_SRCS} ..."
-	${MKDIR} ${WRKSRC}/${HL1250}
-	${CP} ${DISTDIR}/${DIST_SUBDIR}/${HL1250_SRCS} ${WRKSRC}/src
+ALL_TARGET=	so
+INSTALL_TARGET=	soinstall
+USE_LDCONFIG=	yes
+PLIST_SUB+=	SHLIB_VER="${PORTVERSION:R}"
+
+PORTDOCS=	japanese chp2200 epson740 lxm3200-tweaked md2k_md5k
+PORTDOC_FILES=	japanese/Gdevlips.htm japanese/README.gs550j		\
+	japanese/cdj880.txt japanese/dj505j.txt japanese/djgpp.txt	\
+	japanese/gdev10v.txt japanese/gdevalps.txt			\
+	japanese/gdevcd8.txt japanese/gdevdmpr.txt			\
+	japanese/gdevfmlbp.txt japanese/gdevj100.txt			\
+	japanese/gdevlbp3.txt japanese/gdevmag.txt			\
+	japanese/gdevmd2k.txt japanese/gdevmjc.txt			\
+	japanese/gdevml6.txt japanese/gdevp201.txt japanese/gs261j.euc	\
+	japanese/gs261j.txt chp2200/AUTHORS chp2200/INSTALL		\
+	epson740/README epson740/upp-HowTo-to-be			\
+	lxm3200-tweaked/LICENSE lxm3200-tweaked/README			\
+	lxm3200-tweaked/RELEASE_NOTES					\
+	lxm3200-tweaked/Z12-Z31-QuickSetup md2k_md5k/README.jis
+
+pre-everything::
+	@${ECHO_MSG} ${MSG_PAPERSIZE}
 
 post-patch:
-	${REINPLACE_CMD} -e 's|^DEVICE_DEVS|#DEVICE_DEVS|g' \
-		${WRKSRC}/src/unix-gcc.mak
-	${REINPLACE_CMD} -e 's|\. de|\.|g' \
-		${WRKSRC}/src/unixinst.mak
-# for DMPRT driver
 	${REINPLACE_CMD} -e 's|%%DATADIR%%|${DATADIR}|g ; \
-		 s|%%GS_VERSION%%|${GS_VERSION}|g' \
-			${WRKSRC}/src/dmp_site.ps
+		 s|%%GS_VERSION%%|${PORTVERSION}|g' \
+			${WRKSRC}/contrib/japanese/dmp_site.ps
+
+pre-build-drivers.mak:
+	@${ECHO_CMD} 'DEVICE_DEVS= \' > ${WRKSRC}/src/drivers.mak
+.for D in ${OPTIONS:MGS_*:S/^GS_//}
+.if defined(WITH_GS_${D})
+	@${ECHO_CMD} '$$(DD)${D}.dev \' >> ${WRKSRC}/src/drivers.mak
+.endif
+.endfor
 
-# here we apply the modifications necessary to build the 3rd party drivers
-# advantage: you see unmodified makefiles after a pure make extract
-pre-configure:
-	${ECHO_MSG} ">>> in pre-configure ..."
-# for HP8XX driver
-	${ECHO_MSG} ">>>   adding ${HP8XX} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/cdj850.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for PCL3 driver
-	${ECHO_MSG} ">>>   adding ${PCL3} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${PCL3_NAME}/src/contrib.mak-7.00.add \
-		>> ${WRKSRC}/src/contrib.mak
-# for DJ970 driver
-	${ECHO_MSG} ">>>   adding ${DJ970} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/dj970.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for MD2K driver
-	${ECHO_MSG} ">>>   adding ${MD2K} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${MD2K_NAME}/gdevmd2k.mak-5.50 \
-		>> ${WRKSRC}/src/contrib.mak
-# for ALPS driver
-	${ECHO_MSG} ">>>   adding ${ALPS} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${ALPS_NAME}/gdevalps.mak-5.50 \
-		>> ${WRKSRC}/src/contrib.mak
-# for BJ10V driver
-	${ECHO_MSG} ">>>   adding ${BJ10V} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${BJ10V_NAME}/gdev10v.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for BJC250 driver
-	${ECHO_MSG} ">>>   adding ${BJC250} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/bjc250.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for CPCA driver
-	${ECHO_MSG} ">>>   adding ${CPCA} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/src/cpca_gdev.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for LIPS driver
-	${ECHO_MSG} ">>>   adding ${LIPS} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${LIPS_NAME}/gdevlips.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for DMPRT driver
-	${ECHO_MSG} ">>>   adding ${DMPRT} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/src/gdevdmpr.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for EPAG driver
-	${ECHO_MSG} ">>>   adding ${EPAG} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/epag.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for EPLASER driver
-	${ECHO_MSG} ">>>   adding ${EPLASER} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevescv7.mak \
-		>> ${WRKSRC}/src/contrib.mak
-	${CAT} ${WRKSRC}/${EPLASER_NAME}/gdevesmv7.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for MJC driver
-	${ECHO_MSG} ">>>   adding ${MJC} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/${MJC_NAME}/gdevmjc.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for GDI driver
-	${ECHO_MSG} ">>>   adding ${GDI} driver to contrib.mak ..."
-	${CAT} ${WRKSRC}/src/smartgdi-contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for LXM3200 driver
-	${ECHO_MSG} ">>>   adding ${LXM3200} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/lxm3200.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for LX5000 driver
-	${ECHO_MSG} ">>>   adding ${LX5000} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/lx5000.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for LEX7000 driver
-	${ECHO_MSG} ">>>   adding ${LEX7000} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/lex7000.contrib.mak \
-		>> ${WRKSRC}/src/contrib.mak
-# for HL1250 driver
-	${ECHO_MSG} ">>>   adding ${HL1250} driver to contrib.mak ..."
-	${CAT} ${FILESDIR}/gdevhl12-hl1250.mak \
-		>> ${WRKSRC}/src/contrib.mak
- 
-post-configure:
-	${ECHO_MSG} ">>> in post-configure ..."
-	cd ${WRKSRC}/jasper ; \
-		${SETENV} ${MAKE_ENV} ${SH} ./configure --build=${ARCH}-mports-freebsd6.0
-
-pre-build:
-	${ECHO_MSG} ">>> in pre-build ..."
-	${ECHO_MSG} ">>>   creating directories for compilation ..."
+pre-build: pre-build-drivers.mak
 	${MKDIR} ${WRKSRC}/obj
 	${MKDIR} ${WRKSRC}/bin
-# for MD2K driver
-	${ECHO_MSG} ">>>   creating symlinks for ${MD2K} ..."
-.for i in gdevmd2k.c
-	${LN} -sf ${WRKSRC}/${MD2K_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for ALPS driver
-	${ECHO_MSG} ">>>   creating symlinks for ${ALPS} ..."
-.for i in gdevalps.c
-	${LN} -sf ${WRKSRC}/${ALPS_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for BJ10V driver
-	${ECHO_MSG} ">>>   creating symlinks for ${BJ10V} ..."
-.for i in gdev10v.c
-	${LN} -sf ${WRKSRC}/${BJ10V_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for BJC250 driver
-	${ECHO_MSG} ">>>   creating symlinks for ${BJC250} ..."
-.for i in gdevbjc_.[ch] gdevbjca.c
-	${LN} -sf ${WRKSRC}/${BJC250_NAME}/src/${i} ${WRKSRC}/src
-.endfor
-# for LIPS driver
-	${ECHO_MSG} ">>>   creating symlinks for ${LIPS} ..."
-.for i in gdevlips.[ch] gdevlprn.[ch] gdevl4r.c gdevl4v.c gdevespg.c \
-	gdevnpdl.c gdevrpdl.c
-	${LN} -sf ${WRKSRC}/${LIPS_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for EPAG driver
-	${ECHO_MSG} ">>>   building ${EPAG} utility ..."
-	cd ${WRKSRC}/${EPAG_NAME} ; \
-		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
-	${ECHO_MSG} ">>>   creating symlinks for ${EPAG} ..."
-.for i in gdevepag.c
-	${LN} -sf ${WRKSRC}/${EPAG_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for EPLASER driver
-	${ECHO_MSG} ">>>   creating symlinks for ${EPLASER} ..."
-.for i in gdevescv.[ch] gdevesmv.c
-	${LN} -sf ${WRKSRC}/${EPLASER_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for MJC driver
-	${ECHO_MSG} ">>>   creating symlinks for ${MJC} ..."
-.for i in gdevmjc.c mjbarrie.c mjbksep.c mjespdtc.c mjespdtm.c mjespdty.c \
-	mjgrnsp.c mjgrnsp2.c mjhtocmy.c mjmtx2.c mjvtbl.c
-	${LN} -sf ${WRKSRC}/${MJC_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for LXM3200 driver
-	${ECHO_MSG} ">>>   creating symlinks for ${LXM3200} ..."
-.for i in gdevlx32.c
-	${LN} -sf ${WRKSRC}/${LXM3200_NAME}/${i} ${WRKSRC}/src
-.endfor
-# for LEX7000 driver
-	${ECHO_MSG} ">>>   creating symlinks for ${LEX7000} ..."
-.for i in gdevlx7.c
-	${LN} -sf ${WRKSRC}/${LEX7000}/src/${i} ${WRKSRC}/src
-.endfor
 .if defined(WITH_FT_BRIDGE)
 	${MKDIR} ${WRKSRC}/freetype/include
-	${LN} -sf ${LOCALBASE}/include/ft2build.h \
+	${LN} -s -f ${LOCALBASE}/include/ft2build.h \
 		${WRKSRC}/freetype/include/ft2build.h
-	${LN} -sf ${LOCALBASE}/include/freetype2/freetype \
+	${LN} -s -f ${LOCALBASE}/include/freetype2/freetype \
 		${WRKSRC}/freetype/include/freetype
 	${MKDIR} ${WRKSRC}/freetype/objs
-	${LN} -sf ${LOCALBASE}/lib/libfreetype.a \
-		${WRKSRC}/freetype/objs/freetype214MT_D.a
+	${LN} -s -f ${LOCALBASE}/lib/libfreetype.so \
+		${WRKSRC}/freetype/objs/freetype214MT_D.so
 .endif
 
 pre-install:
-	${ECHO_MSG} ">>> in pre-install ..."
-	${ECHO_MSG} ">>>   creating ghostscript destdir ..."
-	${MKDIR} ${DATADIR}/${GS_VERSION}/examples
-	${MKDIR} ${CIDFONTDIR}
+	${MKDIR} ${DATADIR}
 	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${DATADIR}
-.if defined(WITH_SHLIB)
-	${MKDIR} ${INCLUDEDIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${INCLUDEDIR}
+
+post-install-docs:
+	${MKDIR} ${WRKSRC}/contrib/japanese
+	${INSTALL_DATA} ${WRKSRC}/contrib/japanese/doc/* ${WRKSRC}/contrib/japanese
+	${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC}/contrib && \
+		${TAR} -cf - ${PORTDOC_FILES} | \
+		( cd ${DOCSDIR} && ${TAR} -xof - )
+
+.if defined(WITH_FT_BRIDGE)
+post-install-fapi:
+	${INSTALL_DATA} ${WRKSRC}/lib/FAPIcidfmap			\
+		${WRKSRC}/lib/FAPIconfig ${WRKSRC}/lib/FAPIfontmap	\
+		${DATADIR}/${PORTVERSION}/lib
+
+post-install: post-install-fapi
 .endif
 
 post-install:
-	${ECHO_MSG} ">>> in post-install ..."
-	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
-	${ECHO_MSG} ">>>   stripping gs ..."
-.if !defined(WITHOUT_SHLIB)
 	${STRIP_CMD} ${PREFIX}/bin/gsc ${PREFIX}/bin/gsx
 	${LN} -sf gsc ${PREFIX}/bin/gs
-	${MKDIR} ${INCLUDEDIR}
-.for i in iapi.h ierrors.h
-	${INSTALL_DATA} ${WRKSRC}/src/${i} ${INCLUDEDIR}
-.endfor
-.else
-	${STRIP_CMD} ${PREFIX}/bin/gs
-.endif
-# for PCL3 driver
-	${ECHO_MSG} ">>>   installing ${PCL3} utility in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
-	${ECHO_MSG} ">>>   installing ${PCL3} manpages ..."
-.for i in ${PCL3_MAN1}
-	${INSTALL_MAN} ${WRKSRC}/${PCL3_NAME}/doc/${i} ${MANPREFIX}/man/man1
-.endfor
-# other pcl3 stuff, which might be interesting for runtime
-	${ECHO_MSG} ">>>   creating ${PCL3} destdir ..."
-	${MKDIR} ${DATADIR}/${GS_VERSION}/${PCL3}
-	${ECHO_MSG} ">>>   installing files in ${PCL3} destdir ..."
-.for i in NEWS BUGS README lib/example.mcf lib/if-pcl3 ps/calign.ps \
-	ps/dumppdd.ps ps/levels-test.ps ps/margins-A4.ps \
-	ps/margins-A4Rotated.ps ps/margins-Env10Rotated.ps \
-	ps/margins-EnvDLRotated.ps ps/margins-Letter.ps \
-	ps/margins-LetterRotated.ps
-	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
-		${DATADIR}/${GS_VERSION}/${PCL3}
-.endfor
-# for DMPRT driver
-	${ECHO_MSG} ">>>   installing ${DMPRT} resources ..."
-.for i in dmp_init.ps dmp_site.ps escp_24.src
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DATADIR}/${GS_VERSION}/lib
-.endfor
-# for EPAG driver
-	${ECHO_MSG} ">>>   installing ${EPAG} utility in bindir ..."
-	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
-# contributed UPP driver
-	${ECHO_MSG} ">>> installing contributed UPP profiles ..."
-.for i in ${CONTRIB_UPP}
-	${INSTALL_DATA} ${FILESDIR}/${i} \
-		${DATADIR}/${GS_VERSION}/lib
-.endfor
-#
-# now NOPORTDOCS dependend stuff
-#
+	${LN} -s -f ${LOCALBASE}/share/fonts/CIDFont ${CIDFONTDIR}/CIDFont
+
 .if !defined(NOPORTDOCS)
-	${ECHO_MSG} ">>> installing PORTDOC stuff ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}
-# for PCL3 driver
-	${ECHO_MSG} ">>>   installing ${PCL3} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${PCL3}
-.for i in NEWS doc/gs-pcl3.html doc/how-to-report.txt doc/pcl3opts.html
-	${INSTALL_DATA} ${WRKSRC}/${PCL3_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${PCL3}
-.endfor
-# for MD2K driver
-	${ECHO_MSG} ">>>   installing ${MD2K} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MD2K}
-.for i in README.jis
-	${INSTALL_DATA} ${WRKSRC}/${MD2K_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${MD2K}
-.endfor
-# for ALPS driver
-	${ECHO_MSG} ">>>   installing ${ALPS} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${ALPS}
-.for i in README.gdevalps
-	${INSTALL_DATA} ${WRKSRC}/${ALPS_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${ALPS}
-.endfor
-# for BJ10V driver
-	${ECHO_MSG} ">>>   installing ${BJ10V} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${BJ10V}
-.for i in gdev10v.jis
-	${INSTALL_DATA} ${WRKSRC}/${BJ10V_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${BJ10V}
-.endfor
-# for LIPS driver
-	${ECHO_MSG} ">>>   installing ${LIPS} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LIPS}
-.for i in Gdevlips.htm
-	${INSTALL_DATA} ${WRKSRC}/${LIPS_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${LIPS}
-.endfor
-# for DMPRT driver
-	${ECHO_MSG} ">>>   installing ${DMPRT} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${DMPRT}
-.for i in gdevdmpr.sj
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${GS_VERSION}/${DMPRT}
-.endfor
-# for EPAG driver
-	${ECHO_MSG} ">>>   installing ${EPAG} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPAG}
-.for i in ert.txt gdevepag.txt ChangeLog
-	${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${EPAG}
-.endfor
-.for i in psprint gsepagif.sh
-	${INSTALL_SCRIPT} ${WRKSRC}/${EPAG_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${EPAG}
-.endfor
-# for EPLASER driver
-	${ECHO_MSG} ">>>   installing ${EPLASER} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${EPLASER}
-.for i in readme-eplaser-705.euc
-	${INSTALL_DATA} ${WRKSRC}/${EPLASER_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${EPLASER}
-.endfor
-# for MJC driver
-	${ECHO_MSG} ">>>   installing ${MJC} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${MJC}
-.for i in MJ700V2C.FAQ README.mjc README.mje README.noz cpem.doc
-	${INSTALL_DATA} ${WRKSRC}/${MJC_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${MJC}
-.endfor
-# for GDI driver
-	${ECHO_MSG} ">>>   installing ${GDI} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${GDI}
-.for i in README
-	${INSTALL_DATA} ${WRKSRC}/src/${i} \
-		${DOCSDIR}/${GS_VERSION}/${GDI}
-.endfor
-# for LXM3200 driver
-	${ECHO_MSG} ">>>   installing ${LXM3200} docs ..."
-	${MKDIR} ${DOCSDIR}/${GS_VERSION}/${LXM3200}
-.for i in README RELEASE_NOTES Z12-Z31-QuickSetup
-	${INSTALL_DATA} ${WRKSRC}/${LXM3200_NAME}/${i} \
-		${DOCSDIR}/${GS_VERSION}/${LXM3200}
-.endfor
+post-install: post-install-docs
 .endif
-	${ECHO_MSG} "> post-installation tasks completed."
 
 .include 
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/distinfo -L print/ghostscript-gpl/distinfo -u -r1.2 -r1.3
--- print/ghostscript-gpl/distinfo
+++ print/ghostscript-gpl/distinfo
@@ -1,57 +1,6 @@
-MD5 (ghostscript/ghostscript-8.56.tar.bz2) = 498015a278308d147bea563be2c5165e
-SHA256 (ghostscript/ghostscript-8.56.tar.bz2) = 6b61f82e464a6e05bac017c9d0e22a01ea7be229cdbf92d303114cc194e77b2d
-SIZE (ghostscript/ghostscript-8.56.tar.bz2) = 12224304
-MD5 (ghostscript/gdevcd8.tar.gz) = 5ce48bff6082a023199c8ede4aae63a0
-SHA256 (ghostscript/gdevcd8.tar.gz) = f52656a951e402f3775fdf09087944dba6f7a58edff17ce350692cee101cccf9
-SIZE (ghostscript/gdevcd8.tar.gz) = 24803
-MD5 (ghostscript/pcl3-3.3.tar.gz) = 34e664c2a98b847598f8441f8cac7ab6
-SHA256 (ghostscript/pcl3-3.3.tar.gz) = 20fc33c741096a88c2aa6f6a03c025cad9bb224729dfffb91673c65c367ac714
-SIZE (ghostscript/pcl3-3.3.tar.gz) = 301470
-MD5 (ghostscript/gdevdj9.c.gz) = 3a9c20c34b79ffab434abfbcc31d1c27
-SHA256 (ghostscript/gdevdj9.c.gz) = 7657dece1c2d9af15b7599e92f3170b9aaf927d429d90e4e928d3d7052fb376f
-SIZE (ghostscript/gdevdj9.c.gz) = 20139
-MD5 (ghostscript/gdevmd2k-0.2a.tar.gz) = 5ed2b4218b8f77cb411f3d2e4509ed24
-SHA256 (ghostscript/gdevmd2k-0.2a.tar.gz) = c99d6b4cc026c78729331c99a6d9ced24960c61b356c3a61162d2268274a7e7c
-SIZE (ghostscript/gdevmd2k-0.2a.tar.gz) = 9955
-MD5 (ghostscript/gdevalps-0.21.tar.gz) = 553bee251b96105eb7d1d7f4027ac0e9
-SHA256 (ghostscript/gdevalps-0.21.tar.gz) = 250f54084bc186237e24233aa3cbffcc192e14b19620876a518b38ffe9b14421
-SIZE (ghostscript/gdevalps-0.21.tar.gz) = 4452
-MD5 (ghostscript/gdev10v.tar.gz) = 1486bb54c214ce215044a6c606280d73
-SHA256 (ghostscript/gdev10v.tar.gz) = 99f51fa42c9223e2c6b3658d82c790cffbf146bd8ef60c89ddba56128c7a40d3
-SIZE (ghostscript/gdev10v.tar.gz) = 6099
-MD5 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 1a12eddad0c5989811edcfd01a20621d
-SHA256 (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = aeeaa041a04a3ca95b50c1c1ebc60b7a570668fd110671610c0f21dab07ddd64
-SIZE (ghostscript/gs7.05-bjc250-v0.756.diff.gz) = 16501
-MD5 (ghostscript/canon-lips4-1.0.0-651.tgz) = 3105272a9351ea632416b53367e2f38a
-SHA256 (ghostscript/canon-lips4-1.0.0-651.tgz) = e11d11fa9d8645e4102a36d293cdf42498b5fbecc966d0bd104c5aa951c08cae
-SIZE (ghostscript/canon-lips4-1.0.0-651.tgz) = 38835
-MD5 (ghostscript/gdevlips-2.4.0.tar.gz) = 89327cac37665f3fdbae0da5f2c8a89f
-SHA256 (ghostscript/gdevlips-2.4.0.tar.gz) = 24164cdc12cb0d03512c2f04ed82fa1e901625504367b8c53cc74134ee9c3047
-SIZE (ghostscript/gdevlips-2.4.0.tar.gz) = 67683
-MD5 (ghostscript/dmprt-2.01.tar.gz) = c7a9fb127fde5d888a798bf5e1822b88
-SHA256 (ghostscript/dmprt-2.01.tar.gz) = c3d8245ae48893856c6b63508262afbf54a3b16c3e606ab07797f46eb9e15ce7
-SIZE (ghostscript/dmprt-2.01.tar.gz) = 44232
+MD5 (ghostscript/ghostscript-8.63.tar.bz2) = c770eedfdd846a53e211e3ba5339de21
+SHA256 (ghostscript/ghostscript-8.63.tar.bz2) = 0801ec174fa8ee67679c9ae42af547f5cbc2cc98faab6268187f69c22b86b0a1
+SIZE (ghostscript/ghostscript-8.63.tar.bz2) = 15017410
 MD5 (ghostscript/epag-3.09.tar.gz) = 63304a6afe44842124d2d880bf24dbe3
 SHA256 (ghostscript/epag-3.09.tar.gz) = ad10eca44c781a5851d5a8993dcd95b2e2b99392cbf2c8372a5a658f3b991b3b
 SIZE (ghostscript/epag-3.09.tar.gz) = 12858
-MD5 (ghostscript/eplaser-3.1.4-705.tgz) = 94246b034af171b4336d90198e9f4bd8
-SHA256 (ghostscript/eplaser-3.1.4-705.tgz) = ed1ccdf6ec613eb5e028786ad59cb3060f00c2ffa8ca5792bfd219514dc69f42
-SIZE (ghostscript/eplaser-3.1.4-705.tgz) = 44523
-MD5 (ghostscript/gdevmjc-0.8.tar.gz) = 228f41c3cccce22c8f477c7a9407527c
-SHA256 (ghostscript/gdevmjc-0.8.tar.gz) = cd922677798ce85b7e06d92694bb8b0012bc5d6ed66d6982f20eed471974f05b
-SIZE (ghostscript/gdevmjc-0.8.tar.gz) = 102654
-MD5 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 61decc4e00a64271948cbb581876352b
-SHA256 (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 2c8c43e2318dd8b143344235ad7ccc203a3a8c4c50419f3967f1a999a92ea430
-SIZE (ghostscript/Samsung-SmartGDI-all-GS.orig.tar.gz) = 10488
-MD5 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 0f88082030c6eb66a95804a6cc9b9e6b
-SHA256 (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 9156ca7948158102938b127b356dfcd778e79a271893f56efe7cb65a41f46380
-SIZE (ghostscript/lxm3200-tweaked-20030501.tar.gz) = 39000
-MD5 (ghostscript/gdevlx50.c) = 081e355c866316a56fbbff5b59f2b7cf
-SHA256 (ghostscript/gdevlx50.c) = 668de62188819f5c27f00ab04f1b7b58ff9ff52ac16497429a0637f412112117
-SIZE (ghostscript/gdevlx50.c) = 99428
-MD5 (ghostscript/gs6.0.lexmark7000.patch) = fd5018c18351bf64805fe5727be196de
-SHA256 (ghostscript/gs6.0.lexmark7000.patch) = 509dfc02436639ce6b9f98465ec306dd2e7f9342feded043c78b0c9cf44021df
-SIZE (ghostscript/gs6.0.lexmark7000.patch) = 27361
-MD5 (ghostscript/gdevhl12.c) = 277c5ddac9c6fb0e2897e95265eb1ff1
-SHA256 (ghostscript/gdevhl12.c) = 0abaa60cbe950b9c923753a687181b775910ecff0848917641e281737f03527a
-SIZE (ghostscript/gdevhl12.c) = 22001
--- print/ghostscript-gpl/files/patch-lips:gdevlprn.h
+++ /dev/null
@@ -1,16 +0,0 @@
---- lips/gdevlprn.h.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevlprn.h	Sat Sep 13 23:06:38 2003
-@@ -28,8 +28,13 @@
- 
- #include "gdevprn.h"
- 
-+#if GS_VERSION_MAJOR >= 8
-+#define lprn_dev_proc_image_out(proc)\
-+  void proc(gx_device_printer *, FILE *, int, int, int, int)
-+#else
- #define lprn_dev_proc_image_out(proc)\
-   void proc(P6(gx_device_printer *, FILE *, int, int, int, int))
-+#endif
- 
- #define dev_proc_image_out(proc) lprn_dev_proc_image_out(proc)
- 
--- print/ghostscript-gpl/files/patch-lips__gdevlprn.c
+++ /dev/null
@@ -1,35 +0,0 @@
---- lips/gdevlprn.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevlprn.c	Fri Dec 17 19:21:08 2004
-@@ -219,13 +219,13 @@
-     maxBy = (pdev->height + lprn->nBh - 1) / lprn->nBh;
-     maxY = lprn->BlockLine / lprn->nBh * lprn->nBh;
- 
--    if (!(lprn->ImageBuf = gs_malloc(bpl, maxY, "lprn_print_image(ImageBuf)")))
-+    if (!(lprn->ImageBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_image(ImageBuf)")))
- 	return_error(gs_error_VMerror);
--    if (!(lprn->TmpBuf = gs_malloc(bpl, maxY, "lprn_print_iamge(TmpBuf)")))
-+    if (!(lprn->TmpBuf = gs_malloc(pdev->memory, bpl, maxY, "lprn_print_iamge(TmpBuf)")))
- 	return_error(gs_error_VMerror);
--    if (!(lprn->bubbleTbl = gs_malloc(sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)")))
-+    if (!(lprn->bubbleTbl = gs_malloc(pdev->memory, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)")))
- 	return_error(gs_error_VMerror);
--    if (!(bubbleBuffer = gs_malloc(sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)")))
-+    if (!(bubbleBuffer = gs_malloc(pdev->memory, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)")))
- 	return_error(gs_error_VMerror);
- 
-     for (i = 0; i < maxBx; i++)
-@@ -261,10 +261,10 @@
-     }
-     lprn_bubble_flush_all(pdev, fp);	/* flush the rest of bubble */
- 
--    gs_free(lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)");
--    gs_free(lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)");
--    gs_free(lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)");
--    gs_free(bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)");
-+    gs_free(pdev->memory, lprn->ImageBuf, bpl, maxY, "lprn_print_image(ImageBuf)");
-+    gs_free(pdev->memory, lprn->TmpBuf, bpl, maxY, "lprn_print_iamge(TmpBuf)");
-+    gs_free(pdev->memory, lprn->bubbleTbl, sizeof(Bubble *), maxBx, "lprn_print_image(bubbleTbl)");
-+    gs_free(pdev->memory, bubbleBuffer, sizeof(Bubble), maxBx, "lprn_print_image(bubbleBuffer)");
- 
-     return code;
- }
--- print/ghostscript-gpl/files/patch-src:gdevl256.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/gdevl256.c.orig	Fri Feb 22 07:24:51 2002
-+++ src/gdevl256.c	Tue May 20 03:08:15 2003
-@@ -147,10 +147,12 @@
- /* for compatibility with the older display modes: */
- /* these are indexed as 0.0.R0.G0.B0.R1.G1.B1. */
- gx_color_index
--lvga256_map_rgb_color(gx_device * dev, gx_color_value r, gx_color_value g,
--		      gx_color_value b)
-+lvga256_map_rgb_color(gx_device * dev, const gx_color_value cv[])
- {
- #define cv_bits(v,n) (v >> (gx_color_value_bits - n))
-+    gx_color_value r = cv[0];
-+    gx_color_value g = cv[1];
-+    gx_color_value b = cv[2];
-     ushort r5 = cv_bits(r, 5), g5 = cv_bits(g, 5), b5 = cv_bits(b, 5);
-     static const byte cube_bits[32] =
-     {0, 128, 128, 128, 128, 128, 128, 128, 128, 128,
--- print/ghostscript-gpl/files/stc740pl.upp
+++ /dev/null
@@ -1,32 +0,0 @@
-# $ApsCVS: src/apsfilter/uniprint/stc740pl.upp,v 1.2 2000/04/21 18:48:01 andreas Exp $
-#
--supModel="Epson Stylus Color 740, 360x360DpI, Plain Paper"
--sDEVICE=uniprint
--dNOPAUSE
--dSAFER
--dupColorModel=/DeviceCMYKgenerate
--dupRendering=/FSCMYK32
--dupOutputFormat=/EscP2
--r360x360
--dupMargins="{ 9.0 39.96 9.0 9.0}"
--dupOutputComponentOrder="{ 1 2 3 0 }"
--dupWeaveYPasses=3
--dupOutputPins=48
--dupWeaveYFeeds="{47 50 47}"
--dupWeaveInitialYFeeds="{1 1 46}"
--dupWeaveInitialPins="{ 16 48 32}"
--dupBeginPageCommand="<
-   1b40   1b40
-   1b2847 0100 01
-   1b2855 0100 0A
-   1b5500
-   1b2865 0200 0002
-   1b2843 0200 0000
-   1b2863 0400 0000 0000
->"
--dupAdjustPageLengthCommand
--dupAdjustTopMarginCommand
--dupAdjustBottomMarginCommand
--dupEndPageCommand="(\033@\014)"
--dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
-
Index: patch-src:unix-gcc.mak
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-src:unix-gcc.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/files/patch-src:unix-gcc.mak -L print/ghostscript-gpl/files/patch-src:unix-gcc.mak -u -r1.2 -r1.3
--- print/ghostscript-gpl/files/patch-src:unix-gcc.mak
+++ print/ghostscript-gpl/files/patch-src:unix-gcc.mak
@@ -1,6 +1,6 @@
---- src/unix-gcc.mak.orig	Fri Jul  7 06:32:50 2006
-+++ src/unix-gcc.mak	Fri Mar 23 14:44:08 2007
-@@ -21,15 +21,16 @@
+--- src/unix-gcc.mak.orig	Sat Nov 10 06:18:04 2007
++++ src/unix-gcc.mak	Sat Nov 24 15:09:41 2007
+@@ -21,15 +21,17 @@
  # source, generated intermediate file, and object directories
  # for the graphics library (GL) and the PostScript/PDF interpreter (PS).
  
@@ -23,10 +23,11 @@
 +PSRESDIR=${.CURDIR}/Resource
 +PSGENDIR=${.CURDIR}/obj
 +PSOBJDIR=${.CURDIR}/obj
++CONTRIBDIR=${.CURDIR}/contrib
  
  # Do not edit the next group of lines.
  
-@@ -48,11 +49,10 @@
+@@ -48,11 +50,10 @@
  # the directories also define the default search path for the
  # initialization files (gs_*.ps) and the fonts.
  
@@ -41,7 +42,16 @@
  exec_prefix = $(prefix)
  bindir = $(exec_prefix)/bin
  scriptdir = $(bindir)
-@@ -143,7 +143,7 @@
+@@ -107,7 +108,7 @@
+ # -DHAVE_HYPOT
+ #       use the system hypot() call
+ 
+-CAPOPT= -DHAVE_MKSTEMP
++CAPOPT= -DHAVE_MKSTEMP -DHAVE_HYPOT
+ 
+ # Define the name of the executable file.
+ 
+@@ -141,7 +142,7 @@
  # some older JPEG streams that violate the standard. If the JPEG
  # library built from local sources, the patch will be applied.
  
@@ -50,7 +60,7 @@
  JPEG_NAME=jpeg
  
  # Define the directory where the PNG library sources are stored,
-@@ -158,7 +158,7 @@
+@@ -155,7 +156,7 @@
  # what its name is.
  # See gs.mak and Make.htm for more information.
  
@@ -59,7 +69,7 @@
  LIBPNG_NAME=png
  
  # Define the directory where the zlib sources are stored.
-@@ -170,7 +170,7 @@
+@@ -167,7 +168,7 @@
  # what its name is (usually libz, but sometimes libgz).
  # See gs.mak and Make.htm for more information.
  
@@ -68,7 +78,7 @@
  #ZLIB_NAME=gz
  ZLIB_NAME=z
  
-@@ -179,6 +179,14 @@
+@@ -176,6 +177,14 @@
  JBIG2_LIB=jbig2dec
  JBIG2SRCDIR=jbig2dec
  
@@ -83,7 +93,7 @@
  # Define the directory where the icclib source are stored.
  # See icclib.mak for more information
  
-@@ -202,7 +210,7 @@
+@@ -204,7 +213,7 @@
  
  # Define the name of the C compiler.
  
@@ -92,47 +102,57 @@
  
  # Define the name of the linker for the final link step.
  # Normally this is the same as the C compiler.
-@@ -219,9 +227,9 @@
+@@ -221,10 +230,10 @@
  # Define the added flags for standard, debugging, profiling 
  # and shared object builds.
  
 -CFLAGS_STANDARD=-O2
--CFLAGS_DEBUG=-g -O0
--CFLAGS_PROFILE=-pg -O2
 +CFLAGS_STANDARD?=-O2
-+CFLAGS_DEBUG=-g
-+CFLAGS_PROFILE=-pg
- CFLAGS_SO=-fPIC
+ CFLAGS_DEBUG=-g -O0
+ CFLAGS_PROFILE=-pg -O2
+-CFLAGS_SO=-fPIC -shared
++CFLAGS_SO=-fPIC
  
  # Define the other compilation flags.  Add at most one of the following:
-@@ -235,7 +243,7 @@
+ #	-DBSD4_2 for 4.2bsd systems.
+@@ -237,7 +246,8 @@
  # We don't include -ansi, because this gets in the way of the platform-
  #   specific stuff that  typically needs; nevertheless, we expect
  #   gcc to accept ANSI-style function prototypes and function definitions.
--XCFLAGS=
-+XCFLAGS+=-I${.CURDIR}/jasper/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
+-XCFLAGS=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\"
++#XCFLAGS+=-DGS_DEVS_SHARED -DGS_DEVS_SHARED_DIR=\"$(gssharedir)\"
++XCFLAGS+=-DUPD_SIGNAL=0 -I${JPXSRCDIR}/src/libjasper/include -I${LOCALBASE}/include/libpng -I${LOCALBASE}/include
  
  CFLAGS=$(CFLAGS_STANDARD) $(GCFLAGS) $(XCFLAGS)
  
-@@ -246,7 +254,7 @@
+@@ -248,7 +258,7 @@
  #	-R /usr/local/xxx/lib:/usr/local/lib
  # giving the full path names of the shared library directories.
  # XLDFLAGS can be set from the command line.
 -XLDFLAGS=
-+XLDFLAGS=-L${LOCALBASE}/lib
++XLDFLAGS+=-L${LOCALBASE}/lib
  
  LDFLAGS=$(XLDFLAGS)
  
-@@ -279,7 +287,7 @@
+@@ -259,7 +269,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+ 
+-EXTRALIBS=-rdynamic -ldl
++EXTRALIBS+=-Wl,-export-dynamic
+ 
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
+@@ -281,7 +291,7 @@
  # Note that x_.h expects to find the header files in $(XINCLUDE)/X11,
  # not in $(XINCLUDE).
  
 -XINCLUDE=-I/usr/X11R6/include
-+XINCLUDE=-I${X11BASE}/include
++XINCLUDE=-I${LOCALBASE}/include
  
  # Define the directory/ies and library names for the X11 library files.
  # XLIBDIRS is for ld and should include -L; XLIBDIR is for LD_RUN_PATH
-@@ -291,12 +299,12 @@
+@@ -293,12 +303,12 @@
  # Solaris and other SVR4 systems with dynamic linking probably want
  #XLIBDIRS=-L/usr/openwin/lib -R/usr/openwin/lib
  # X11R6 (on any platform) may need
@@ -141,14 +161,43 @@
  
  #XLIBDIRS=-L/usr/local/X/lib
 -XLIBDIRS=-L/usr/X11R6/lib
-+XLIBDIRS=-L${X11BASE}/lib
++XLIBDIRS=-L${LOCALBASE}/lib
  XLIBDIR=
 -XLIBS=Xt Xext X11
 +#XLIBS=Xt Xext X11
  
  # Define whether this platform has floating point hardware:
  #	FPU_TYPE=2 means floating point is faster than fixed point.
-@@ -447,6 +455,9 @@
+@@ -316,16 +326,16 @@
+ 
+ # If POSIX sync primitives are used, also change the STDLIBS to include
+ # the pthread library.
+-#SYNC=posync
++SYNC=posync
+ 
+ # Default is No sync primitives since some platforms don't have it (HP-UX)
+-SYNC=nosync
++#SYNC=nosync
+ 
+ # ------ Devices and features ------ #
+ 
+ # Choose the language feature(s) to include.  See gs.mak for details.
+ 
+-FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev
++FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)epsf.dev $(GLD)pipe.dev $(PSD)fapi.dev $(PSD)jbig2.dev $(PSD)jpx.dev
+ #FEATURE_DEVS=$(PSD)psl3.dev $(PSD)pdf.dev
+ # The following is strictly for testing.
+ FEATURE_DEVS_ALL=$(PSD)psl3.dev $(PSD)pdf.dev $(PSD)dpsnext.dev $(PSD)ttfont.dev $(PSD)rasterop.dev $(PSD)double.dev $(PSD)trapping.dev $(PSD)stocht.dev $(GLD)pipe.dev
+@@ -415,7 +425,7 @@
+ DEVICE_DEVS21=$(DD)spotcmyk.dev $(DD)devicen.dev $(DD)xcf.dev $(DD)bmpsep1.dev $(DD)bmpsep8.dev $(DD)bmp16m.dev $(DD)bmp32b.dev $(DD)psdcmyk.dev $(DD)psdrgb.dev
+ 
+ # Shared library target to build.
+-GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so
++#GS_SHARED_OBJS=$(GLOBJDIR)/X11.so $(GLOBJDIR)/lvga256.so $(GLOBJDIR)/vgalib.so
+ #GS_SHARED_OBJS=$(GLOBJDIR)/X11.so
+ 
+ # ---------------------------- End of options --------------------------- #
+@@ -454,6 +464,9 @@
  include $(GLSRCDIR)/zlib.mak
  include $(GLSRCDIR)/libpng.mak
  include $(GLSRCDIR)/jbig2.mak
@@ -158,3 +207,11 @@
  include $(GLSRCDIR)/icclib.mak
  include $(GLSRCDIR)/ijs.mak
  include $(GLSRCDIR)/devs.mak
+@@ -463,6 +476,7 @@
+ include $(GLSRCDIR)/unix-dll.mak
+ include $(GLSRCDIR)/unix-end.mak
+ include $(GLSRCDIR)/unixinst.mak
++include $(CONTRIBDIR)/contrib.mak
+ 
+ # This has to come last so it won't be taken as the default target.
+ $(AK):
--- print/ghostscript-gpl/files/patch-src-dviprlib.c
+++ /dev/null
@@ -1,135 +0,0 @@
---- src/dviprlib.c.orig	Tue May 13 16:14:09 1997
-+++ src/dviprlib.c	Tue May 24 21:41:09 2005
-@@ -39,8 +39,8 @@
- 
- 
- /*--- forward declarations ---*/
--private int dviprt_read_S_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
--private int dviprt_read_QR_cfg(P2(dviprt_cfg_t *,dviprt_cfg_i *));
-+private int dviprt_read_S_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
-+private int dviprt_read_QR_cfg(dviprt_cfg_t *,dviprt_cfg_i *);
-      
- /*--- library functions ---*/
- int 
-@@ -429,21 +429,21 @@
- 
- /*--- forward declarations ---*/
- private int dviprt_set_select
--  (P4(dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *));
-+  (dviprt_cfg_item_t *,uchar **,dviprt_cfg_t *,dviprt_cfg_i *);
- private int dviprt_set_integer
--  (P4(dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *));
-+  (dviprt_cfg_item_t *, uchar *, dviprt_cfg_t *,dviprt_cfg_i *);
- private int dviprt_set_strings
--  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
-+  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
- private int dviprt_set_rpexpr
--  (P6(dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int));
-+  (dviprt_cfg_item_t *,uchar *,int , dviprt_cfg_t *,dviprt_cfg_i *,int);
- private int dviprt_set_code
--  (P4(dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *));
-+  (dviprt_cfg_item_t *,uchar *,dviprt_cfg_t *,dviprt_cfg_i *);
- 
--private long dviprt_oct2long(P3(uchar *,uchar *,uchar **));
--private long dviprt_dec2long(P3(uchar *,uchar *,uchar **));
--private long dviprt_hex2long(P3(uchar *,uchar *,uchar **));
-+private long dviprt_oct2long(uchar *,uchar *,uchar **);
-+private long dviprt_dec2long(uchar *,uchar *,uchar **);
-+private long dviprt_hex2long(uchar *,uchar *,uchar **);
-      
--private int dviprt_printtokenerror(P4(dviprt_cfg_i *,char *,int ,int));
-+private int dviprt_printtokenerror(dviprt_cfg_i *,char *,int ,int);
-      
- /*--- macros ---*/
- #define strlcmp(tmplt,str,len) \
-@@ -1433,7 +1433,11 @@
- char *dviprt_prtcodename[] = { CFG_PRTCODE_NAME, NULL };
- char *dviprt_encodename[] = { CFG_ENCODE_NAME, NULL };
- 
-+#if 0
- private FILE *dviprt_messagestream = stderr;
-+#else  /* patch for glibc 2.1.x by Shin Fukui  */
-+private FILE *dviprt_messagestream;
-+#endif
- 
- /*--- library functions ---*/
- int
-@@ -1568,16 +1572,16 @@
- 
- 
- /*--- forward declarations ---*/
--private int dviprt_getmaximalwidth(P1(dviprt_print *));
--private int dviprt_flush_buffer(P2(dviprt_print *,uchar far *));
--private int dviprt_output_transpose(P3(dviprt_print *,uchar far *,uint ));
--private int dviprt_output_nontranspose(P3(dviprt_print *,uchar far *,uint ));
--private int dviprt_output_nontranspose_reverse(P3(dviprt_print *,uchar far *,uint ));
--private int dviprt_reverse_bits(P2(uchar far *,uint));
--private int dviprt_transpose8x8(P4(uchar far *,uint, uchar far *,uint));
--private int dviprt_output_expr(P4(dviprt_print *,int,uint,uint));
--private int dviprt_default_outputproc(P3(uchar far *,long ,void *));
--private long dviprt_getbuffersize(P1(dviprt_print *));
-+private int dviprt_getmaximalwidth(dviprt_print *);
-+private int dviprt_flush_buffer(dviprt_print *,uchar far *);
-+private int dviprt_output_transpose(dviprt_print *,uchar far *,uint);
-+private int dviprt_output_nontranspose(dviprt_print *,uchar far *,uint);
-+private int dviprt_output_nontranspose_reverse(dviprt_print *,uchar far *,uint);
-+private int dviprt_reverse_bits(uchar far *,uint);
-+private int dviprt_transpose8x8(uchar far *,uint, uchar far *,uint);
-+private int dviprt_output_expr(dviprt_print *,int,uint,uint);
-+private int dviprt_default_outputproc(uchar far *,long ,void *);
-+private long dviprt_getbuffersize(dviprt_print *);
-      
- /*--- library functions ---*/
- long
-@@ -1618,7 +1622,7 @@
- int
-   dviprt_setstream
- #ifdef __PROTOTYPES__
--  (dviprt_print *pprint,int (*func)(P3(uchar far *,long ,void*)),void *pstream)
-+  (dviprt_print *pprint,int (*func)(uchar far *,long ,void*),void *pstream)
- #else
- (pprint,func,pstream)
- dviprt_print *pprint;
-@@ -2264,19 +2268,19 @@
- #define DVIPRT_SUPPORT_PCL 1
- 
- /*--- forward declarations ---*/
--private long dviprt_null_getworksize(P2(dviprt_print *,long ));
--private long dviprt_null_encode(P3(dviprt_print *,long ,int ));
--private long dviprt_hex_getworksize(P2(dviprt_print *,long ));
--private long dviprt_hex_encode(P3(dviprt_print *,long ,int ));
-+private long dviprt_null_getworksize(dviprt_print *,long );
-+private long dviprt_null_encode(dviprt_print *,long ,int );
-+private long dviprt_hex_getworksize(dviprt_print *,long );
-+private long dviprt_hex_encode(dviprt_print *,long ,int );
- #if DVIPRT_SUPPORT_FAX
--private long dviprt_fax_getworksize(P2(dviprt_print *,long ));
--private long dviprt_fax_encode(P3(dviprt_print *,long ,int ));
-+private long dviprt_fax_getworksize(dviprt_print *,long );
-+private long dviprt_fax_encode(dviprt_print *,long ,int );
- #endif
- #if DVIPRT_SUPPORT_PCL
--private long dviprt_pcl1_getworksize(P2(dviprt_print *,long ));
--private long dviprt_pcl1_encode(P3(dviprt_print *,long ,int ));
--private long dviprt_pcl2_getworksize(P2(dviprt_print *,long ));
--private long dviprt_pcl2_encode(P3(dviprt_print *,long ,int ));
-+private long dviprt_pcl1_getworksize(dviprt_print *,long );
-+private long dviprt_pcl1_encode(dviprt_print *,long ,int );
-+private long dviprt_pcl2_getworksize(dviprt_print *,long );
-+private long dviprt_pcl2_encode(dviprt_print *,long ,int );
- #endif
-      
- private dviprt_encoder dviprt_encoder_list[] = {
-@@ -2468,9 +2472,9 @@
-   int o_count;
-   int o_bufcount;
- } FaxEncodeInfo;
--private int dviprt_fax_set_white(P2(int,FaxEncodeInfo *));
--private int dviprt_fax_set_black(P2(int,FaxEncodeInfo *));
--private int dviprt_fax_set_bitcount(P2(FaxEncode_t *,FaxEncodeInfo *));
-+private int dviprt_fax_set_white(int,FaxEncodeInfo *);
-+private int dviprt_fax_set_black(int,FaxEncodeInfo *);
-+private int dviprt_fax_set_bitcount(FaxEncode_t *,FaxEncodeInfo *);
-      
- private long 
- dviprt_fax_encode(dviprt_print *pprint,long s,int f)
--- print/ghostscript-gpl/files/patch-lips:gdevlips.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- lips/gdevlips.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevlips.c	Tue Jan 13 01:23:47 2004
-@@ -62,7 +62,15 @@
- 	height = tmp;
-     }
-     for (pt = lips_paper_table; pt->num_unit < 80; pt++)
-+/* add by shige 11/06 2003 */
-+#ifdef USE_LIPS_SIZE_ERROR
-+	if(pt->width+LIPS_SIZE_ERROR_VALUE>=width 
-+	   && pt->width-LIPS_SIZE_ERROR_VALUE<=width 
-+	   && pt->height+LIPS_SIZE_ERROR_VALUE>=height 
-+	   && pt->height-LIPS_SIZE_ERROR_VALUE<=height) 
-+#else
- 	if (pt->width == width && pt->height == height)
-+#endif
- 	    break;
- 
-     return pt->num_unit + landscape;
--- print/ghostscript-gpl/files/patch-src-gdevdmpr.c
+++ /dev/null
@@ -1,134 +0,0 @@
---- src/gdevdmpr.c.orig	Tue May 13 20:43:37 1997
-+++ src/gdevdmpr.c	Sat Mar 24 15:41:48 2007
-@@ -41,7 +41,7 @@
- /* include library header. */
- #include "dviprlib.h"
- 
--extern FILE *lib_fopen(P1(const char *));
-+extern FILE *lib_fopen(const char *);
- 
- #define LOCAL_DEBUG 0
- 
-@@ -87,12 +87,12 @@
- private dev_proc_close_device(gdev_dmprt_close);
- 
- /* declarations of sub functions to get printer properties. */
--private void gdev_dmprt_init_printer_props(P1(gx_device_dmprt *));
--private int gdev_dmprt_get_printer_props(P2(gx_device_dmprt *,char *));
--private int gdev_dmprt_check_code_props(P2(byte * ,int ));
--private FILE *gdev_dmprt_dviprt_lib_fopen(P2(const char *,char *));
-+private void gdev_dmprt_init_printer_props(gx_device_dmprt *);
-+private int gdev_dmprt_get_printer_props(gx_device_dmprt *,char *);
-+private int gdev_dmprt_check_code_props(byte * ,int );
-+private FILE *gdev_dmprt_dviprt_lib_fopen(const char *,char *);
- 
--private int gdev_dmprt_error_no_dviprt_to_gs(P1(int ));
-+private int gdev_dmprt_error_no_dviprt_to_gs(int );
- 
- /* The device descriptor */
- gx_device_procs prn_dmprt_procs = {
-@@ -405,7 +405,9 @@
-   if (pddev->dmprt.max_height>0 && pddev->dmprt.max_heightheight)
-     pddev->height = pddev->dmprt.max_height;
-   
-+#if 0
-   dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
-+#endif
-   
-   return code;
- }
-@@ -425,7 +427,9 @@
-   if (code < 0) return code;
-   if (code == 0) pddev->dmprt.debug_f = vbool;
-   
-+#if 0
-   dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
-+#endif
-   
-   code = param_read_bool(plist, "Verbose", &vbool);
-   if (code < 0) return code;
-@@ -475,14 +479,14 @@
-   code = param_read_string(plist, "FileName", &vstr);
-   if (code < 0) return code;
-   if (code == 0) {
--    char *filename = gs_malloc(vstr.size + 1, 1,
-+    char *filename = gs_malloc(pdev->memory, vstr.size + 1, 1,
- 			       "gdev_dmprt_put_props(filename)");
-     int ccode;
-     if (filename == 0) return e_VMerror;
-     strncpy(filename, (const char*)vstr.data, vstr.size);
-     filename[vstr.size] = '\0';
-     ccode = gdev_dmprt_get_printer_props(pddev,filename);
--    gs_free(filename, vstr.size+1, 1, "gdev_dmprt_put_props(filename)");
-+    gs_free(pdev->memory, filename, vstr.size+1, 1, "gdev_dmprt_put_props(filename)");
-     if (ccode < 0) return ccode;
-   }
- 
-@@ -686,7 +690,7 @@
-   byte *in;
-   
-   /* get work buffer */
--  in = (byte *)gs_malloc(1, i_buf_size ,"gdev_dmprt_print_page(in)");
-+  in = (byte *)gs_malloc(pdev->memory, 1, i_buf_size ,"gdev_dmprt_print_page(in)");
-   if ( in == 0 )
-     return e_VMerror;
-   
-@@ -737,7 +741,7 @@
-     eprintf1(" %lu bytes\n",dviprt_getoutputbytes(pprint)-prev_bytes);
-   }
- error_ex:
--  gs_free((char *)in, 1, i_buf_size,"gdev_dmprt_print_page(in)");
-+  gs_free(pdev->memory, (char *)in, 1, i_buf_size,"gdev_dmprt_print_page(in)");
-   
-   return code;
- }
-@@ -797,7 +801,7 @@
-   dviprt_cfg_t cfg;
-   char *fname;
- 
--  fname = gs_malloc(256,1,"dviprt_lib_fname");
-+  fname = gs_malloc(pdev->memory, 256,1,"dviprt_lib_fname");
-   if (fname == NULL) return e_VMerror;
-   
-   fp = gdev_dmprt_dviprt_lib_fopen(fnamebase,fname);
-@@ -828,11 +832,12 @@
-       cfg.integer[CFG_Y_DPI] > 0 ? cfg.integer[CFG_Y_DPI] : pddev->dmprt.orig_x_dpi;
-   }
-   
--  gs_free(fname,256,1,"dviprt_lib_fname");
-+  gs_free(pdev->memory, fname,256,1,"dviprt_lib_fname");
-   
-   return code;
- }
- 
-+private const char * gp_file_name_concat_string(const char *, unsigned);
- private FILE *
- gdev_dmprt_dviprt_lib_fopen(const char *fnamebase,char *fname)
- {
-@@ -845,9 +850,7 @@
-     env = getenv("TEXCFG");
-     if (env) {
-       strcpy(fname,env);
--      strcat(fname,
--        gp_file_name_concat_string(env,strlen(env),fname,strlen(fnamebase)));
--      strcat(fname,fnamebase);
-+      strcat(fname, gp_file_name_concat_string(env,strlen(env)));
-       fp = fopen(fname,gp_fmode_rb);
-     }
-   }
-@@ -867,4 +870,15 @@
-   default:
-     return -1;
-   }
-+}
-+
-+/* Answer the string to be used for combining a directory/device prefix */
-+/* with a base file name. The prefix directory/device is examined to    */
-+/* determine if a separator is needed and may return an empty string    */
-+private const char *
-+gp_file_name_concat_string(const char *prefix, unsigned plen)
-+{
-+    if (plen > 0 && prefix[plen - 1] == '/')
-+        return "";
-+    return "/";
- }
--- print/ghostscript-gpl/files/patch-md2k:gdevmd2k.c
+++ /dev/null
@@ -1,68 +0,0 @@
---- md2k/gdevmd2k.c.orig	Sun May  2 14:07:57 1999
-+++ md2k/gdevmd2k.c	Fri Dec 17 19:10:22 2004
-@@ -495,7 +495,7 @@
-     int i, j;
- 
-     /* allocate memory */
--    work = (byte *)gs_malloc(3+sizeof(int), line_size,
-+    work = (byte *)gs_malloc(pdev->memory, 3+sizeof(int), line_size,
- 			     "alps_print_page(work)");
-     if (work == 0)
- 	return_error(gs_error_VMerror);
-@@ -597,7 +597,7 @@
- 	   "\033\052\162\103"
- 	   "\033\045\0\130", 1, 9, prn_stream);
- 
--    gs_free((char *)work, 3+sizeof(int), line_size, "alps_print_page(work)");
-+    gs_free(pdev->memory, (char *)work, 3+sizeof(int), line_size, "alps_print_page(work)");
-     return 0;
- }
- 
-@@ -638,11 +638,13 @@
-     (k) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
- 
- private gx_color_index
--alps_map_cmyk_color(gx_device* pdev,
--		    gx_color_value c, gx_color_value m,
--		    gx_color_value y, gx_color_value k)
-+alps_map_cmyk_color(gx_device* pdev, const gx_color_value cv[])
- {
-     gx_color_index color;
-+    gx_color_value c = cv[0];
-+    gx_color_value m = cv[1];
-+    gx_color_value y = cv[2];
-+    gx_color_value k = cv[3];
- 
-     switch (pdev->color_info.depth) {
-     case 1:
-@@ -675,10 +677,12 @@
- }
- 
- private gx_color_index
--alps_map_cmy_color(gx_device* pdev,
--		   gx_color_value c, gx_color_value m,
--		   gx_color_value y, gx_color_value k)
-+alps_map_cmy_color(gx_device* pdev, const gx_color_value cv[])
- {
-+    gx_color_value c = cv[0];
-+    gx_color_value m = cv[1];
-+    gx_color_value y = cv[2];
-+    gx_color_value k = cv[3];
-     int nbits = pdev->color_info.depth;
-     ulong weight = ((gx_max_color_value - k) << 10) / gx_max_color_value;
-     c = ((c * weight) >> 10) + k;
-@@ -694,10 +698,12 @@
- /* Mapping of RGB colors to gray values. */
- 
- private gx_color_index
--alps_map_rgb_color(gx_device *pdev,
--		   gx_color_value r, gx_color_value g, gx_color_value b)
-+alps_map_rgb_color(gx_device *pdev, const gx_color_value cv[])
- {
- 
-+  gx_color_value r = cv[0];
-+  gx_color_value g = cv[1];
-+  gx_color_value b = cv[2];
-   if (gx_color_value_to_byte(r & g & b) == 0xff) {
-       return (gx_color_index) 0;	/* White */
-   } else {
Index: patch-epag__gdevepag.c
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-epag__gdevepag.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/ghostscript-gpl/files/patch-epag__gdevepag.c -L print/ghostscript-gpl/files/patch-epag__gdevepag.c -u -r1.1 -r1.2
--- print/ghostscript-gpl/files/patch-epag__gdevepag.c
+++ print/ghostscript-gpl/files/patch-epag__gdevepag.c
@@ -1,37 +1,217 @@
 --- epag/gdevepag.c.orig	Sat Jul  8 13:33:09 2000
-+++ epag/gdevepag.c	Thu May 26 00:12:48 2005
++++ epag/gdevepag.c	Sat Nov 24 15:25:11 2007
+@@ -102,30 +102,30 @@
+ } EpagBubble;
+ 
+ /* The device descriptors */
+-private dev_proc_open_device(epag_open);
+-private dev_proc_close_device(epag_close);
+-private dev_proc_print_page(epag_print_page);
+-private void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
+-private dev_proc_print_page(epag_print_page);
+-private dev_proc_get_params(epag_get_params);
+-private dev_proc_put_params(epag_put_params);
+-private void epag_paper_set(gx_device_printer *pdev, FILE *fp);
+-private void epag_bubble_flush_all(EpagPageCont *cont);
+-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
+-private void epag_page_close(EpagPageCont *cont);
+-private int epag_read_image(EpagPageCont *cont);
+-private void epag_process_line(EpagPageCont *cont);
+-private int epag_is_black(EpagPageCont *cont, int bx);
+-private void epag_rect_add(EpagPageCont *cont,int start,int end);
+-private void  epag_bubble_gen(EpagPageCont *cont,
++static dev_proc_open_device(epag_open);
++static dev_proc_close_device(epag_close);
++static dev_proc_print_page(epag_print_page);
++static void epag_printer_initialize(gx_device_printer *pdev, FILE *fp,int);
++static dev_proc_print_page(epag_print_page);
++static dev_proc_get_params(epag_get_params);
++static dev_proc_put_params(epag_put_params);
++static void epag_paper_set(gx_device_printer *pdev, FILE *fp);
++static void epag_bubble_flush_all(EpagPageCont *cont);
++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,EpagPageCont *cont);
++static void epag_page_close(EpagPageCont *cont);
++static int epag_read_image(EpagPageCont *cont);
++static void epag_process_line(EpagPageCont *cont);
++static int epag_is_black(EpagPageCont *cont, int bx);
++static void epag_rect_add(EpagPageCont *cont,int start,int end);
++static void  epag_bubble_gen(EpagPageCont *cont,
+ 			      int x0, int x1, int y0, int y1);
+-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
+-private void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl);
++static void epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl);
+ 
+ /*
+  *   ??????????????
+  */
+-private gx_device_procs prn_epag_procs =
++static gx_device_procs prn_epag_procs =
+ prn_params_procs(epag_open, gdev_prn_output_page, epag_close,
+ 		 epag_get_params, epag_put_params);
+ gx_device_printer far_data gs_epag_device =
+@@ -140,13 +140,13 @@
+ static char *epson_remote_start = "\033\001 at EJL \r\n";
+ 
+ /* Open the printer, adjusting the margins if necessary. */
+-private int
++static int
+ epag_open(gx_device *pdev)
+ {
+   return gdev_prn_open(pdev);
+ }
+ 
+-private int
++static int
+ epag_close(gx_device *pdev)
+ {
+   gdev_prn_open_printer(pdev, 1);
+@@ -163,7 +163,7 @@
+   return gdev_prn_close(pdev);
+ }
+ 
+-private int 
++static int 
+ epag_print_page(gx_device_printer *pdev, FILE *fp)
+ {
+   EpagPageCont cont;
+@@ -205,7 +205,7 @@
+   GS, '2', 'a', 'b', 'P',          /* ?????????????????? */
+ };
+ 
+-private void
++static void
+ epag_printer_initialize(gx_device_printer *pdev, FILE *fp, int copies)
+ {
+   double xDpi,yDpi;
+@@ -260,7 +260,7 @@
+     fprintf(fp,"%c%dcoO",GS, copies < 256 ? copies : 255);
+ }
+ 
+-private int
++static int
+ epag_get_params(gx_device *pdev, gs_param_list *plist)
+ {
+   int code;
+@@ -286,7 +286,7 @@
+ }
+ 
+ /* Put properties. */
+-private int
++static int
+ epag_put_params(gx_device *pdev, gs_param_list *plist)
+ {
+   param_read_int(plist, "cRowBuf", &epag_cont.cRowBuf);
+@@ -380,7 +380,7 @@
+ /*
+  * epag_bubble_flush_all: ?????????? bubble????????????????
+  */
+-private void epag_bubble_flush_all(EpagPageCont *cont)
++static void epag_bubble_flush_all(EpagPageCont *cont)
+ {
+   int i;
+   
+@@ -392,7 +392,7 @@
+ /*
+  * epag_page_cont_init: EpagPageCont????????????????????????
+  */
+-private void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
++static void epag_page_cont_init(gx_device_printer *pdev,FILE *fp,
+ 				 EpagPageCont *cont)
+ {
+   int bpl;
 @@ -417,15 +417,15 @@
    cont->maxY = epag_cont.cRowBuf / cont->bh * cont->bh ;
    if(cont->maxY < cont->bh) cont->maxY = cont->bh;
    
 -  cont->bp  = gs_malloc(bpl , cont->maxY, "epag_skip_blank_init(bp)");
 -  cont->bp2 = gs_malloc(bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
-+  cont->bp  = gs_malloc(pdev->memory, bpl , cont->maxY, "epag_skip_blank_init(bp)");
-+  cont->bp2 = gs_malloc(pdev->memory, bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
++  cont->bp  = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl , cont->maxY, "epag_skip_blank_init(bp)");
++  cont->bp2 = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), bpl*3/2+1 , cont->maxY, "epag_skip_blank_init(bp2)");
  
    cont->h = cont->r = 0;
  
 -  cont->bubbleTbl=gs_malloc(sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
-+  cont->bubbleTbl=gs_malloc(pdev->memory, sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
++  cont->bubbleTbl = (byte *)gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble *),cont->maxBx,"bubbleTbl");
    for(i=0;imaxBx;i++)
      cont->bubbleTbl[i] = NULL;
 -  cont->bubbleBuffer=gs_malloc(sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
-+  cont->bubbleBuffer=gs_malloc(pdev->memory, sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
++  cont->bubbleBuffer=gs_malloc(gs_lib_ctx_get_non_gc_memory_t(), sizeof(EpagBubble),cont->maxBx,"bubbleBuffer");
    bbtbl = (EpagBubble *)cont->bubbleBuffer;
    for(i=0;imaxBx-1;i++)
      bbtbl[i].next = &bbtbl[i+1];
-@@ -436,9 +436,11 @@
- private void
+@@ -433,15 +433,15 @@
+   cont->freeBubbleList = &bbtbl[0];
+ }
+ 
+-private void
++static void
  epag_page_close(EpagPageCont *cont)
  {
 -  gs_free(cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
 -  gs_free(cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
 -  gs_free(cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
-+  gx_device* pdev;
-+
-+  gs_free(pdev->memory, cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
-+  gs_free(pdev->memory, cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
-+  gs_free(pdev->memory, cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
++  gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp, bpl, cont->maxY, "epag_skip_blank_init(bp)");
++  gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bp2, bpl*3/2+1, cont->maxY, "epag_skip_blank_init(bp2)");
++  gs_free(gs_lib_ctx_get_non_gc_memory_t(), cont->bubbleBuffer, sizeof(EpagBubble), cont->maxBx,"bubbleBuffer");
+ }
+ 
+-private int
++static int
+ epag_read_image(EpagPageCont *cont)
+ {
+   int bh = cont->bh;
+@@ -473,7 +473,7 @@
+ /*
+  *    bh??????????????????????????????
+  */
+-private void
++static void
+ epag_process_line(EpagPageCont *cont)
+ {
+   int bh = cont->bh;
+@@ -502,7 +502,7 @@
+   else epag_rect_add(cont, 0, cont->maxBx-1);
+ }
+ 
+-private int
++static int
+ epag_is_black(EpagPageCont *cont, int bx)
+ {
+   int bh  = cont->bh;
+@@ -520,7 +520,7 @@
+   return 0;
+ }
+ 
+-private void
++static void
+ epag_rect_add(EpagPageCont *cont,int start,int end)
+ {
+   int x0 = start * cont->bw;
+@@ -544,7 +544,7 @@
+   }
+ }
+ 
+-private void
++static void
+ epag_bubble_gen(EpagPageCont *cont, int x0, int x1, int y0, int y1)
+ {
+   EpagBubble *bbl;
+@@ -569,7 +569,7 @@
+   }
  }
  
- private int
+-private void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
++static void epag_bubble_flush(EpagPageCont *cont,EpagBubble *bbl)
+ {
+   int bx,bx0,bx1;
+   
+@@ -588,7 +588,7 @@
+ 
+ /* ?????????????? */
+ 
+-private void
++static void
+ epag_bubble_image_out(EpagPageCont *cont,EpagBubble *bbl)
+ {
+   FILE *fp = cont->fp;
--- /dev/null
+++ print/ghostscript-gpl/files/patch-contrib__japanese__gdevdmpr.c
@@ -0,0 +1,44 @@
+--- contrib/japanese/gdevdmpr.c.orig	Thu Apr 26 01:27:24 2007
++++ contrib/japanese/gdevdmpr.c	Tue May 15 01:44:09 2007
+@@ -41,8 +41,6 @@
+ /* include library header. */
+ #include "dviprlib.h"
+ 
+-extern FILE *lib_fopen(const char *);
+-
+ #define LOCAL_DEBUG 0
+ 
+ #define DEVICE_NAME "dmprt"
+@@ -405,8 +403,6 @@
+   if (pddev->dmprt.max_height>0 && pddev->dmprt.max_heightheight)
+     pddev->height = pddev->dmprt.max_height;
+   
+-  dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
+-  
+   return code;
+ }
+ 
+@@ -425,8 +421,6 @@
+   if (code < 0) return code;
+   if (code == 0) pddev->dmprt.debug_f = vbool;
+   
+-  dviprt_setmessagestream(pddev->dmprt.debug_f ? stderr : NULL);
+-  
+   code = param_read_bool(plist, "Verbose", &vbool);
+   if (code < 0) return code;
+   pddev->dmprt.verbose_f = vbool;
+@@ -841,13 +835,12 @@
+   char *env;
+ 
+   strcpy(fname,fnamebase);
+-  fp = lib_fopen(fname);
++  fp = fopen(fname,"r");
+   if (fp == NULL) {
+     env = getenv("TEXCFG");
+     if (env) {
+       strcpy(fname,env);
+       strcat(fname, gp_file_name_concat_string(env,strlen(env)));
+-      strcat(fname,fnamebase);
+       fp = fopen(fname,gp_fmode_rb);
+     }
+   }
--- print/ghostscript-gpl/files/patch-lips:gdevlips.h
+++ /dev/null
@@ -1,17 +0,0 @@
---- lips/gdevlips.h.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevlips.h	Tue Jan 13 01:23:47 2004
-@@ -188,6 +188,14 @@
-     bool faceup;\
-     char mediaType[LIPS_MEDIACHAR_MAX];
- 
-+/* added by shige 11/06 2003 */
-+#define USE_LIPS_SIZE_ERROR
-+#define LIPS_SIZE_ERROR_VALUE	2
-+
-+/* added by shige 11/09 2003 */
-+#define LIPS_HEIGHT_MAX_720 11906
-+#define LIPS_WIDTH_MAX_720 8419
-+
- int lips_media_selection(int width, int height);
- int lips_packbits_encode(byte * inBuff, byte * outBuff, int Length);
- int lips_mode3format_encode(byte * inBuff, byte * outBuff, int Length);
--- print/ghostscript-gpl/files/patch-src:gdevgdi.c
+++ /dev/null
@@ -1,1007 +0,0 @@
---- src/gdevgdi.c.orig	Wed Jun 19 19:32:49 2002
-+++ src/gdevgdi.c	Fri Dec 31 17:41:18 2004
-@@ -60,8 +60,8 @@
- #define GDI_REPEAT_LENGTH 2
- #define GDI_BAND_HEIGHT   128
- #define GDI_MAX_BAND      66
--//#define GDI_BAND_WIDTH    4928
--//#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4)
-+/*#define GDI_BAND_WIDTH    4928*/
-+/*#define GDI_BAND_WIDTH_BYTES (((GDI_BAND_WIDTH + 31)/32)*4)*/
- 
- #define GDI_PRE_COMP      2
- #define GDI_REAL_COMP     0
-@@ -74,8 +74,8 @@
- 
- #define GDI_MARGINS_A4	        0.167, 0.167, 0.167, 0.167
- #define GDI_MARGINS_LETTER	0.167, 0.167, 0.167, 0.167
--//#define GDI_MARGINS_A4	0.0, 0.0, 0.0, 0.0
--//#define GDI_MARGINS_LETTER	0.0, 0.0, 0.0, 0.0
-+/*#define GDI_MARGINS_A4	0.0, 0.0, 0.0, 0.0*/
-+/*#define GDI_MARGINS_LETTER	0.0, 0.0, 0.0, 0.0*/
- 
- /* The number of blank lines that make it worthwhile to reposition */
- /* the cursor. */
-@@ -86,9 +86,15 @@
- 
- int GDI_BAND_WIDTH[] = {4768, 4928};
- 
-+#if GS_VERSION_MAJOR >= 8
-+private int gdi_print_page(gx_device_printer *pdev, FILE *prn_stream);
-+private int gdi_open(gx_device *pdev);
-+private int gdi_close(gx_device *pdev);
-+#else
- private int gdi_print_page(P2(gx_device_printer *pdev, FILE *prn_stream));
- private int gdi_open(P1(gx_device *pdev));
- private int gdi_close(P1(gx_device *pdev));
-+#endif
- 
- /* The device descriptors */
- private dev_proc_open_device(gdi_open);
-@@ -107,6 +113,14 @@
- 	1,                      /* color bit */ 
-         gdi_print_page);
- 
-+gx_device_printer far_data gs_samsunggdi_device =
-+  prn_device(prn_gdi_procs, "samsunggdi",
-+	DEFAULT_WIDTH_10THS, DEFAULT_HEIGHT_10THS, /* paper size (unit : 10/72 inch size) */
-+	X_DPI2, Y_DPI2,
-+	0.20, 0.25, 0.25, 0.25,		/* margins filled in by gdi_open */
-+	1,                      /* color bit */ 
-+        gdi_print_page);
-+
- private FILE *WritePJLHeaderData(gx_device_printer *pdev, FILE *fp);
- private FILE *WriteBandHeader(FILE *fp, unsigned int usBandNo, 
-                      unsigned char ubCompMode, unsigned int usBandWidth, 
-@@ -193,9 +207,9 @@
- 	}
- 
-         ul_band_size = band_width_bytes * band_height;
--        ibp = (byte *)gs_malloc(ul_band_size, 1, "gdi_print_page");
--        obp = (byte *)gs_malloc(ul_band_size*13/10, 1, "gdi_print_page");
--        tmp = (byte *)gs_malloc(raster, 1, "gdi_print_page");
-+        ibp = (byte *)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page");
-+        obp = (byte *)gs_malloc(pdev->memory, ul_band_size*13/10, 1, "gdi_print_page");
-+        tmp = (byte *)gs_malloc(pdev->memory, raster, 1, "gdi_print_page");
- 
-         if (!ibp) return_error(gs_error_VMerror);
-         if (!obp) return_error(gs_error_VMerror);
-@@ -220,7 +234,7 @@
-             memset(obp, 0x00, ul_band_size*13/10);
-             for (j=0; j ul_tiff_size) ? ul_tiff_size : ul_scan_size;
-+            /*ul_tiff_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/
-+            /*ul_scan_size = (unsigned long)bmp2run(obp, ibp, band_height, band_width_bytes, GDI_PRE_COMP);*/
-+	    /*ul_min_size =  (ul_scan_size > ul_tiff_size) ? ul_tiff_size : ul_scan_size;*/
- 	    ul_min_size = ul_tiff_size;
- 	    compression_type = GDI_COMP_MODITIFF;
--	    //compression_type =  (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE;
-+	    /*compression_type =  (ul_scan_size > ul_tiff_size) ? GDI_COMP_MODITIFF : GDI_COMP_SCANLINE;*/
-             switch (compression_type) {
- 	    case GDI_COMP_MODITIFF:
-+#define FUDGE_BIG_BANDS
-+#ifndef FUDGE_BIG_BANDS
-                 ul_comp_size = FrameTiffComp(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP);
-+#else
-+	      {
-+		/* Very ugly.  The printer will hose if the compressed
-+                   band size is over 65536, so we "fudge" the data in
-+                   this case repeatedly until we get what we want. 
-+
-+		   The fudge algorithm is simple, this is kinda-sorta
-+		   RLE, so we just round groups of bits in groups of
-+		   2, then 3, then 4, etc until the thing works.  */
-+#define MAXBAND 0xffff
-+#define ASSERT(x)
-+		int fudge=0;
-+		byte *use_band=ibp;
-+		do {
-+		  ul_comp_size = FrameTiffComp(obp, use_band, 
-+					       band_height, band_width_bytes, 
-+					       GDI_REAL_COMP);
-+		  if (ul_comp_size > MAXBAND-8) {
-+		    int f, g, h;
-+		    if (!fudge) {
-+		      ASSERT(use_band == ibp);
-+		      use_band = (byte*)gs_malloc(pdev->memory, ul_band_size, 1, "gdi_print_page/fudge");
-+		      fudge=1;
-+		    }
-+		    memcpy(use_band, ibp, ul_band_size);
-+		    fudge++;
-+		    ASSERT(fudge>=2);
-+		    {
-+#define FUDGE2(x) ( (((((x)>>6)&0x3)?3:0)<<6)	\
-+		    | (((((x)>>4)&0x3)?3:0)<<4)	\
-+		    | (((((x)>>2)&0x3)?3:0)<<2)	\
-+		    | (((((x)>>0)&0x3)?3:0)) )
-+#define FUDGE4(x) ( (((((x)>>4)&0xf)?0xf:0)<<4)	\
-+		    | (((((x)>>0)&0xf)?0xf:0)) )
-+#define FUDGE8(x) ( (((((x)>>0)&0xff)?0xf:0)) )
-+#define FUDGE(fudge, x) ( (fudge == 2 ? FUDGE2(x) 	\
-+			   : fudge == 3 ? FUDGE4(x)	\
-+			   : fudge == 4 ? FUDGE8(x)	\
-+			   : 0 ) )
-+
-+		      for(f=0;f MAXBAND-8);
-+	      oh_well:
-+		if (fudge > 1) {
-+		  ASSERT(use_band != ibp);
-+		  gs_free(pdev->memory, use_band, ul_band_size, 1, "gdi_print_page/fudge");
-+		  /*fprintf(stderr, "smartgdi: band %d fudge factor is %d\n", i, fudge);*/
-+		}
-+	      }
-+#endif
- 		break;
- 	    case GDI_COMP_SCANLINE:
-                 ul_comp_size = bmp2run(obp, ibp, band_height, band_width_bytes, GDI_REAL_COMP);
-@@ -253,15 +323,15 @@
- 
-             prn_stream = WriteBandHeader(prn_stream, i, compression_type, (band_width_bytes * 8),
-                                          band_height, ul_comp_size); 
--            //fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size);
-+            /*fprintf(prn_stream, "[%d] band, size : %d\n", i, ul_tiff_size);*/
-             fwrite(obp, ul_comp_size, 1, prn_stream);
-         }
-     
-         /* Trailer Output */
-         WriteTrailerData(prn_stream);
--        gs_free(ibp, ul_band_size, 1, "gdi_line_buffer");
--        gs_free(obp, ul_band_size*13/10, 1, "gdi_line_buffer");
--        gs_free(tmp, raster, 1, "gdi_line_buffer");
-+        gs_free(pdev->memory, ibp, ul_band_size, 1, "gdi_line_buffer");
-+        gs_free(pdev->memory, obp, ul_band_size*13/10, 1, "gdi_line_buffer");
-+        gs_free(pdev->memory, tmp, raster, 1, "gdi_line_buffer");
-         return code;
- }
- 
-@@ -271,50 +341,50 @@
-   unsigned char buffer[300];
-   int dots_per_inch = (int)pdev->y_pixels_per_inch;
- 
--  strcpy(buffer, "\x1b%-12345X");
-+  strcpy(buffer, "\033%-12345X");
-   
--  // Paper Type
--  strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\x0d\x0a");
--  //Density
--  strcat(buffer, "@PJL SET DENSITY = 1\x0d\x0a");
--  // Toner Save
--  strcat(buffer, "@PJL SET TONERSAVE = OFF\x0d\x0a");
--  // Enter Language SMART
--  strcat(buffer, "@PJL ENTER LANGUAGE = SMART\x0d\x0a");
--  // JobStart
--  strcat(buffer, "$PJL JOB START\x0d\x0a");
-+  /* Paper Type*/
-+  strcat(buffer, "@PJL SET PAPERTYPE = NORMAL ON\015\012");
-+  /*Density*/
-+  strcat(buffer, "@PJL SET DENSITY = 1\015\012");
-+  /* Toner Save*/
-+  strcat(buffer, "@PJL SET TONERSAVE = OFF\015\012");
-+  /* Enter Language SMART*/
-+  strcat(buffer, "@PJL ENTER LANGUAGE = SMART\015\012");
-+  /* JobStart*/
-+  strcat(buffer, "$PJL JOB START\015\012");
- 
--  // Resolution
-+  /* Resolution*/
-   if (dots_per_inch == 600)
--      strcat(buffer, "$PJL RESOLUTION = 600\x0d\x0a");
-+      strcat(buffer, "$PJL RESOLUTION = 600\015\012");
-   else
--      strcat(buffer, "$PJL RESOLUTION = 300\x0d\x0a");
-+      strcat(buffer, "$PJL RESOLUTION = 300\015\012");
- 
--  // Copies
--  strcat(buffer, "$PJL COPIES = 1\x0d\x0a");
--  // Paper Size
-+  /* Copies*/
-+  strcat(buffer, "$PJL COPIES = 1\015\012");
-+  /* Paper Size*/
-   switch (gdev_pcl_paper_size((gx_device*)pdev)) 
-   {
- 	case PAPER_SIZE_A4:
--  			strcat(buffer, "$PJL PAGE A4 AUTO\x0d\x0a");
-+  			strcat(buffer, "$PJL PAGE A4 AUTO\015\012");
- 			break;
- 	case PAPER_SIZE_LETTER:
--  			strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
-+  			strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
- 			break;
- 	case PAPER_SIZE_LEGAL:
--  			strcat(buffer, "$PJL PAGE LEGAL AUTO\x0d\x0a");
-+  			strcat(buffer, "$PJL PAGE LEGAL AUTO\015\012");
- 			break;
- 	default:
--  			strcat(buffer, "$PJL PAGE LETTER AUTO\x0d\x0a");
-+  			strcat(buffer, "$PJL PAGE LETTER AUTO\015\012");
- 			break;
-   }
--  // bitmap start
--  strcat(buffer, "$PJL BITMAP START\x0d\x0a");
--  // write buffer to file.
-+  /* bitmap start*/
-+  strcat(buffer, "$PJL BITMAP START\015\012");
-+  /* write buffer to file.*/
-   ulSize = strlen(buffer);
-   fwrite(buffer, 1, ulSize, fp );
-   return(fp);
--} // WritePJLHeaderData()     
-+} /* WritePJLHeaderData()     */
- 
- 
- FILE *WriteBandHeader
-@@ -335,33 +405,33 @@
- 
-   ulBandSize += 8;
- 
--  // bandsize
-+  /* bandsize*/
-   buf[i++] = (unsigned char)((ulBandSize >> 24) & 0xff);
-   buf[i++] = (unsigned char)((ulBandSize >> 16) & 0xff);
-   buf[i++] = (unsigned char)((ulBandSize >> 8) & 0xff);
-   buf[i++] = (unsigned char)(ulBandSize & 0xff);
-   
--  // id                            
-+  /* id        */                    
-   buf[i++] = (unsigned char)((usBandNo >> 8) & 0xff);
-   buf[i++] = (unsigned char)(usBandNo & 0xff);
- 
--  // compress mode         
-+  /* compress mode         */
-   buf[i++] = (unsigned char)(ubCompMode & 0xff);
- 
--  // ubLeft                  
-+  /* ubLeft                  */
-   buf[i++] = (unsigned char)(ubLeft & 0xff);
- 
--  // height
-+  /* height*/
-   buf[i++] = (unsigned char)((usBandHeight >> 8) & 0xff);
-   buf[i++] = (unsigned char)(usBandHeight & 0xff);
- 
--  // width                     
-+  /* width   */                  
-   buf[i++] = (unsigned char)((usBandWidth >> 8) & 0xff);
-   buf[i++] = (unsigned char)(usBandWidth & 0xff);
- 
-   fwrite(buf, 1, i, fp);
-   return(fp);
--} // end of WriteBandHeader()
-+} /* end of WriteBandHeader()*/
- 
- FILE *WriteTrailerData(FILE *fp)
- {
-@@ -369,18 +439,18 @@
-   unsigned long buffer[200];
- 
-   memset((char*)buffer, 0x00, 200);
--  strcpy((char*)buffer, "$PJL PRINT 4\x0d\x0a");
--  strcat((char*)buffer, "$PJL EOJ\x0d\x0a");
--  strcat((char*)buffer, "$PJL SYNC\x0d\x0a");
--  strcat((char*)buffer, "$PJL RELEASE 0 2047\x0d\x0a");
--  strcat((char*)buffer, "$PJL GARBAGE\x0d\x0a");
--  strcat((char*)buffer, "\x1b%-12345X\x0d\x0a");
-+  strcpy((char*)buffer, "$PJL PRINT 4\015\012");
-+  strcat((char*)buffer, "$PJL EOJ\015\012");
-+  strcat((char*)buffer, "$PJL SYNC\015\012");
-+  strcat((char*)buffer, "$PJL RELEASE 0 2047\015\012");
-+  strcat((char*)buffer, "$PJL GARBAGE\015\012");
-+  strcat((char*)buffer, "\033%-12345X\015\012");
- 
-   ulSize = strlen((char*)buffer);
-   fwrite(buffer, 1, ulSize, fp);
- 
-   return(fp);
--} // WriteTrailerData()
-+} /* WriteTrailerData()*/
- 
- unsigned long FrameTiffComp(unsigned char *pubDest, 
-                             unsigned char *pubSrc, 
-@@ -399,7 +469,7 @@
- 
-   for (i = 0; i < usTotalLines; i++)
-   {
--    if (!(ubMode & 0x02)) //
-+    if (!(ubMode & 0x02))
-     {
-       usLineSize = FrameTiff_Comp(SrcPtr, TgtPtr, usBytesPerLine);
-     }
-@@ -416,7 +486,7 @@
-     ulret += usLineSize;
-   }
- 
--  if (!(ubMode & 0x02)) //
-+  if (!(ubMode & 0x02))
-   {
-     switch (ulret%4)
-     {
-@@ -448,7 +518,7 @@
-     }
-   }
-   return(ulret);
--}  // FrameTiffComp()
-+}  /* FrameTiffComp()*/
- 
- unsigned int FrameTiff_Comp(unsigned char *lpSrcBuf, unsigned char *lpTgtBuf, unsigned int nSrcBytes)
- {
-@@ -528,13 +598,13 @@
-           usEndCnt = 16384;
-         }
-         usEndCnt = usCount - 2;
--        // usEndCnt = usCount - 2; original
--        // 19990824 by LSM : for end file while (usEndCnt--)
-+        /* usEndCnt = usCount - 2; original*/
-+        /* 19990824 by LSM : for end file while (usEndCnt--)*/
-         while (usEndCnt--)
-         {
-           /* read next data */
-           ubFirst = ubSecond;
--          ubSecond = *pubSrc++; // read 3rd Data
-+          ubSecond = *pubSrc++; /* read 3rd Data*/
-           if (ubFirst == ubSecond)
-           {
-             if (usEndCnt <= 1)
-@@ -544,7 +614,7 @@
-             }
-             else
-             {
--              ubSecond = *pubSrc++; // read 4th Data
-+              ubSecond = *pubSrc++; /* read 4th Data*/
-               usEndCnt--;
-               if (ubFirst == ubSecond)
-               {
-@@ -660,14 +730,14 @@
-         {
-           usEndCnt = 16384;
-         }
--        // usEndCnt = usCount - 2;
-+        /* usEndCnt = usCount - 2;*/
-         usEndCnt = usCount - 2;
--        // 19990824 by LSM : for Last file while (usEndCnt--)
-+        /* 19990824 by LSM : for Last file while (usEndCnt--)*/
-         while (usEndCnt--)
-         {
-           /* read next data */
-           ubFirst = ubSecond;
--          ubSecond = *pubSrc++; // read 3rd Data
-+          ubSecond = *pubSrc++; /* read 3rd Data*/
-           if (ubFirst == ubSecond)
-           {
-             if (usEndCnt <= 1)
-@@ -677,8 +747,8 @@
-             }
-             else
-             {
--              ubSecond = *pubSrc++; // read 4th Data
--              usEndCnt--; // 19990824 by LSM
-+              ubSecond = *pubSrc++; /* read 4th Data*/
-+              usEndCnt--; /* 19990824 by LSM*/
-               if (ubFirst == ubSecond)
-               {
-                 ubMisCnt = 3;
-@@ -691,7 +761,7 @@
-       /* save data */
-       usControl = (unsigned int) (pubSrc - pubOrg);
-       usControl -= ubMisCnt;
--      // 19990824 by LSM : for fixing GPF on Photoshop
-+      /* 19990824 by LSM : for fixing GPF on Photoshop*/
-       if (usControl > usCount)
-       {
-         usControl = usCount;
-@@ -728,77 +798,77 @@
- }   sc_tbl;
- 
- static sc_tbl  gdi_ScanTbl[256] = {
--{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 },   // 0x00
-+{ 8, 0, 0 }, { 7, 1, 1 }, { 6, 1, 0 }, { 6, 2, 1 },   /* 0x00*/
- { 5, 1, 0 }, { 0, 0, 1 }, { 5, 2, 0 }, { 5, 3, 1 }, 
- { 4, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 4, 2, 0 }, { 0, 0, 1 }, { 4, 3, 0 }, { 4, 4, 1 }, 
--{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x10
-+{ 3, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x10*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 3, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 3, 3, 0 }, { 0, 0, 1 }, { 3, 4, 0 }, { 3, 5, 1 }, 
--{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x20
-+{ 2, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x20*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x30
-+{ 2, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x30*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 2, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 2, 4, 0 }, { 0, 0, 1 }, { 2, 5, 0 }, { 2, 6, 1 }, 
--{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x40
-+{ 1, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x40*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x50
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x50*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x60
-+{ 1, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x60*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x70
-+{ 1, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x70*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 1, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 1, 5, 0 }, { 0, 0, 1 }, { 1, 6, 0 }, { 1, 7, 1 }, 
--{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x80
-+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x80*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x90
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x90*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0xa0
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0xa0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0xb0
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0xb0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0xc0
-+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0xc0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0xd0
-+{ 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0xd0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0xe0
-+{ 0, 3, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0xe0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
--{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0xf0
-+{ 0, 4, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0xf0*/
- { 0, 0, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 5, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 }, 
- { 0, 6, 0 }, { 0, 0, 1 }, { 0, 7, 0 }, { 0, 8, 1 }, 
- };
- 
- static sc_tbl  gdi_ScanTbl4[16] = {
--{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 },   // 0x00
--{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 },   // 0x04
--{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   // 0x08
--{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 }    // 0x0c
-+{ 4, 0, 0 }, { 3, 1, 1 }, { 2, 1, 0 }, { 2, 2, 1 },   /* 0x00*/
-+{ 1, 1, 0 }, { 0, 0, 1 }, { 1, 2, 0 }, { 1, 3, 1 },   /* 0x04*/
-+{ 0, 1, 0 }, { 0, 0, 1 }, { 0, 0, 0 }, { 0, 0, 1 },   /* 0x08*/
-+{ 0, 2, 0 }, { 0, 0, 1 }, { 0, 3, 0 }, { 0, 4, 1 }    /* 0x0c*/
- };
- 
- long SaveScanData( unsigned char *, unsigned short, unsigned short, unsigned short, unsigned short, unsigned short );
-@@ -816,32 +886,32 @@
-   lWarp = (long)(usWarp << 3);
-   lDis  = ((long)usDy * lWarp) + (long)sDx;
- 
--  // 1st, 2nd, 3rd & 4th byte
--  ultmp_dat = 0xc0000000;
-+  /* 1st, 2nd, 3rd & 4th byte*/
-+  ultmp_dat = 0xc0000000ul;
-   if (lDis < 0)
-   {
--    ultmp_dat |= 0x20000000;
-+    ultmp_dat |= 0x20000000ul;
-   }
--  ultmp_dat |= (lDis & 0x1fffffff);
--  *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000) >> 24);
--  *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000) >> 16);
--  *out_buf++ = (unsigned char)((ultmp_dat & 0xff00) >> 8);
--  *out_buf++ = (unsigned char)(ultmp_dat & 0xff);
-+  ultmp_dat |= (lDis & 0x1ffffffful);
-+  *out_buf++ = (unsigned char)((ultmp_dat & 0xff000000ul) >> 24);
-+  *out_buf++ = (unsigned char)((ultmp_dat & 0xff0000ul) >> 16);
-+  *out_buf++ = (unsigned char)((ultmp_dat & 0xff00ul) >> 8);
-+  *out_buf++ = (unsigned char)(ultmp_dat & 0xfful);
- 
--  // 5th & 6th byte
-+  /* 5th & 6th byte*/
-   ustmp_dat = 0xc000;
-   ustmp_dat |= (usRl & 0x3fff);
-   *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8);
-   *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
- 
-   return(6);
--} // Save6Bytes()
-+} /* Save6Bytes()*/
- 
- long  Save4Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx)
- {
-   unsigned short  ustmp_dat;
- 
--  // 1st & 2nd byte
-+  /* 1st & 2nd byte*/
-   ustmp_dat = 0x8000;
-   if (sDx < 0)
-   {
-@@ -851,7 +921,7 @@
-   *out_buf++ = (unsigned char)((ustmp_dat & 0xff00) >> 8);
-   *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
- 
--  // 3rd & 4th byte
-+  /* 3rd & 4th byte*/
-   ustmp_dat = 0x8000;
-   ustmp_dat |= ((usDy & 0x03) << 12);
-   ustmp_dat |= (usRl & 0xfff);
-@@ -859,13 +929,13 @@
-   *out_buf++ = (unsigned char)(ustmp_dat & 0xff);
- 
-   return(4);
--}   // end of Save4Bytes()
-+}   /* end of Save4Bytes()*/
- 
- long  Save2Bytes(unsigned char *out_buf, unsigned short usDy, unsigned short usRl, short sDx)
- {
-   unsigned char ubtmp_dat;
- 
--  // 1st byte
-+  /* 1st byte*/
-   ubtmp_dat = 0x00;
-   if (usDy == 1)
-   {
-@@ -874,7 +944,7 @@
-   ubtmp_dat |= (usRl & 0x3f);
-   *out_buf++ = ubtmp_dat;
- 
--  // 2nd byte
-+  /* 2nd byte*/
-   if (sDx < 0)
-   {
-     ubtmp_dat = 0x80;
-@@ -886,7 +956,7 @@
-   ubtmp_dat |= ((unsigned char)sDx & 0x7f);
-   *out_buf++ = ubtmp_dat;
-   return(2);
--}   // end of Save2Bytes()
-+}   /* end of Save2Bytes()*/
- 
- long SaveScanData (unsigned char *out_buf, 
-                    unsigned short us1Cnt, 
-@@ -900,26 +970,26 @@
- 
-   sDisX = (int)usPosX01 - (int)usPosX10;
- 
--  // 48 bit
-+  /* 48 bit*/
-   if ( (usDy > 3) || (us1Cnt > 4095) ) 
-   {
-     Save6Bytes(out_buf, usDy, us1Cnt, sDisX, usWarp);
-     lRet = 6;
-   }
--  // 32 bit
-+  /* 32 bit*/
-   else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) ) 
-   {
-     Save4Bytes(out_buf, usDy, us1Cnt, sDisX);
-     lRet = 4;
-   }
--  // 16 bit
-+  /* 16 bit*/
-   else 
-   {
-     Save2Bytes(out_buf, usDy, us1Cnt, sDisX);
-     lRet = 2;
-   }
-   return(lRet);
--} // end of SaveScanData()
-+} /* end of SaveScanData()*/
- 
- 
- long UpdateScanSize (unsigned char *out_buf, 
-@@ -934,23 +1004,23 @@
- 
-   sDisX = usPosX01 - usPosX10;
- 
--  // 48 bit
-+  /* 48 bit*/
-   if ( (usDy > 3) || (us1Cnt > 4095) ) 
-   {
-     lRet = 6;
-   }
--  // 32 bit
-+  /* 32 bit*/
-   else if ( (usDy > 1) || (us1Cnt > 63) || (sDisX > 127) || (sDisX < -128) )
-   {
-     lRet = 4;
-   }
--  // 16 bit
-+  /* 16 bit*/
-   else
-   {
-     lRet = 2;
-   }
-   return(lRet);
--} // end of UpdateScanSize() by bglee 19981224
-+} /* end of UpdateScanSize() by bglee 19981224*/
- 
- long GetSimpleScan(unsigned char *out_buf,
-                    unsigned char ubSizeMode, 
-@@ -983,10 +1053,10 @@
-   }
- 
-   
--  // 1 X 1 X
-+  /* 1 X 1 X*/
-   if (ubPreBit) 
-   {
--    // 1 0 1 X
-+    /* 1 0 1 X*/
-     if (ubDx) 
-     {
-       lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
-@@ -994,23 +1064,23 @@
-       *usPosX01 = usBytePos + ubDx;
-       *us1Count = ubRl;
-       *usDy = 0;
--      // 1 0 1 0
-+      /* 1 0 1 0*/
-       if (!ubLastBit) 
-       {
--        // 19990330 by bglee
-+        /* 19990330 by bglee*/
-         out_buf = out_buf + lScanSize;
-         
-         lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
-         *usPosX10 = *usPosX01 ;
-         *us1Count = 0;
-       }
--      // 1 0 1 1
-+      /* 1 0 1 1*/
-     }
--    // 1 1 1 X
-+    /* 1 1 1 X*/
-     else 
-     {
-       *us1Count += ubRl;
--      // 1 1 1 0
-+      /* 1 1 1 0*/
-       if (!ubLastBit) 
-       {
-         lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
-@@ -1018,16 +1088,16 @@
-         *us1Count = 0;
-         *usDy = 0;
-       }
--      // 1 1 1 1
-+      /* 1 1 1 1*/
-     }
-   }
--  // 0 X 1 X
-+  /* 0 X 1 X*/
-   else 
-   {
--    // 0 X 1 X
-+    /* 0 X 1 X*/
-     *usPosX01 = usBytePos + ubDx;
-     *us1Count += ubRl;
--    // 0 X 1 0
-+    /* 0 X 1 0*/
-     if (!ubLastBit) 
-     {
-       lScanSize += (*UpdateScanLine[ubSizeMode])(out_buf, *us1Count, *usDy, *usPosX10, *usPosX01, usWidth);
-@@ -1035,11 +1105,11 @@
-       *us1Count = 0;
-       *usDy = 0;
-     }
--    // 0 X 1 1
-+    /* 0 X 1 1*/
-   }
- 
-   return(lScanSize);
--} // end of GetSimpleScan() 
-+} /* end of GetSimpleScan() */
- 
- 
- long scan_map (unsigned char *in_buf, 
-@@ -1049,7 +1119,7 @@
-                unsigned char ubMode) 
- {
-   unsigned int  i, j, k;
--  unsigned char ubPreBit, ubCrtByte;//, ubLastBit;
-+  unsigned char ubPreBit, ubCrtByte;/*, ubLastBit;*/
-   long  lScanSize, lTmp;
-   long lCrtSize;
-   unsigned short  us1Count;
-@@ -1078,7 +1148,7 @@
-       switch (ubCrtByte) 
-       {
-         case 0x00:
--          // 1 0
-+          /* 1 0 */
-           if (ubPreBit) 
-           {
-             lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
-@@ -1088,16 +1158,16 @@
-             us1Count = 0;
-             usDy = 0;
-           }
--          // 0 0
-+          /* 0 0*/
-           break;
- 
-         case 0xff:
--          // 1 1
-+          /* 1 1*/
-           if (ubPreBit)
-           {
-             us1Count += 8;
-           }
--          // 0 1
-+          /* 0 1*/
-           else 
-           {
-             us1Count = 8;
-@@ -1106,7 +1176,7 @@
-           break;
- 
-         default:
--          // X X 1 X
-+          /* X X 1 X*/
-           if (gdi_ScanTbl[ubCrtByte].ubRl) 
-           {
-             usBytePos = (j << 3);
-@@ -1114,7 +1184,7 @@
-             out_buf = out_buf + lTmp;
-             lScanSize += lTmp;
-           }
--          // complex pattern
-+          /* complex pattern*/
-           else 
-           {
-             for (k = 0; k < 2; k++) 
-@@ -1124,7 +1194,7 @@
-               switch (ubTemp) 
-               {
-                 case 0x00:
--                  // 1 0
-+                  /* 1 0*/
-                   if (ubPreBit) 
-                   {
-                     lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
-@@ -1134,16 +1204,16 @@
-                     us1Count = 0;
-                     usDy = 0;
-                   }
--                  // 0 0
-+                  /* 0 0*/
-                   break;
- 
-                 case 0x0f:
--                  // 1 1
-+                  /* 1 1*/
-                   if (ubPreBit)
-                   {
-                     us1Count += 4;
-                   }
--                  // 0 1
-+                  /* 0 1*/
-                   else 
-                   {
-                     us1Count = 4;
-@@ -1152,7 +1222,7 @@
-                   break;
- 
-                 case 0x05:
--                  // 1 0101
-+                  /* 1 0101*/
-                   if (ubPreBit) 
-                   {
-                     lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, us1Count, usDy, usPosX10, usPosX01, usWidth);
-@@ -1162,13 +1232,13 @@
-                     usPosX10 = usBytePos - us1Count;
-                     usDy = 0;
-                   }
--                  // 0 0101
-+                  /* 0 0101*/
-                   usPosX01 = usBytePos + 1;
-                   lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, usDy, usPosX10, usPosX01, usWidth);
-                   out_buf = out_buf + lTmp;
-                   lScanSize += lTmp;
- 
--                  // next
-+                  /* next*/
-                   usPosX10 = 0;
-                   usPosX01 = 2;
-                   usDy = 0;
-@@ -1176,12 +1246,12 @@
-                             break;
- 
-                 case 0x09:
--                  // 1 1001
-+                  /* 1 1001*/
-                   if (ubPreBit)
-                   {
-                     us1Count++;
-                   }
--                  // 0 1001
-+                  /* 0 1001*/
-                   else 
-                   {
-                     usPosX01 = usBytePos;
-@@ -1191,7 +1261,7 @@
-                   out_buf = out_buf + lTmp;
-                   lScanSize += lTmp;
- 
--                  // next
-+                  /* next*/
-                   if (ubPreBit)
-                   {       
-                     usPosX10 = usBytePos - us1Count + 1;
-@@ -1207,12 +1277,12 @@
-                   break;
- 
-                 case 0x0a:
--                  // 1 1010
-+                  /* 1 1010*/
-                   if (ubPreBit)
-                   {
-                     us1Count++;
-                   }
--                  // 0 1010
-+                  /* 0 1010*/
-                   else 
-                   {
-                     us1Count = 1;
-@@ -1222,25 +1292,25 @@
-                   out_buf = out_buf + lTmp;
-                   lScanSize += lTmp;
- 
--                  // next
-+                  /* next*/
-                   usPosX10 = usBytePos - us1Count + 1;
-                   usPosX01 = usBytePos + 2;
-                   lTmp = (*UpdateScanLine[ubSizeMode])(out_buf, 1, 0, usPosX10, usPosX01, usWidth);
-                   out_buf = out_buf + lTmp;
-                   lScanSize += lTmp;
--                  // next
-+                  /* next*/
-                   usPosX10 = usBytePos + 2;
-                   usDy = 0;
-                   us1Count = 0;
-                   break;
- 
-                 case 0x0b:
--                  // 1 1011
-+                  /* 1 1011*/
-                   if (ubPreBit)
-                   {
-                     us1Count++;
-                   }
--                  // 0 1011
-+                  /* 0 1011*/
-                   else 
-                   {
-                     us1Count = 1;
-@@ -1250,7 +1320,7 @@
-                   out_buf = out_buf + lTmp;
-                   lScanSize += lTmp;
- 
--                  // next
-+                  /* next*/
-                   if (ubPreBit)
-                   {       
-                     usPosX10 = usBytePos - us1Count + 1;
-@@ -1267,12 +1337,12 @@
-                   break;
- 
-                 case 0x0d:
--                  // 1 1101
-+                  /* 1 1101*/
-                   if (ubPreBit)
-                   {
-                     us1Count += 2;
-                   }
--                  // 0 1101
-+                  /* 0 1101*/
-                   else 
-                   {
-                     us1Count = 2;
-@@ -1282,7 +1352,7 @@
-                   out_buf = out_buf + lTmp;
-                   lScanSize += lTmp;
- 
--                  // next
-+                  /* next*/
-                   if (ubPreBit)
-                   {
-                     usPosX10 = usBytePos - us1Count + 2;
-@@ -1298,17 +1368,17 @@
-                   break;
- 
-                 default:
--                  // X X 1 X
-+                  /* X X 1 X*/
-                   lTmp = GetSimpleScan(out_buf, ubSizeMode, &us1Count, &usDy, &usPosX10, &usPosX01, usBytePos, ubTemp, 4, ubPreBit, usWidth);
-                   out_buf = out_buf + lTmp;
-                   lScanSize += lTmp;
-                   break;
--              } // end of switch()
-+              } /* end of switch()*/
-               ubPreBit = ubTemp & 0x01;
--            } // end of k-loop
-+            } /* end of k-loop*/
-           }
-           break;
--      } // end of switch()
-+      } /* end of switch()*/
- 
-       ubPreBit = ubCrtByte & 0x01;
-     } /*for  usWidth */
-@@ -1326,7 +1396,7 @@
-     }
-     usDy++;
- 
--    // check size over
-+    /* check size over*/
-     if ( (i % 5) == 4 ) 
-     {
-       lCrtSize = (long)((long)usWidth * (long)(i + 1));
-@@ -1342,7 +1412,7 @@
-     lScanSize = -1;
-   }
-   return(lScanSize);
--} // end of scan_map() 
-+} /* end of scan_map() */
- 
- /*****************************************************************
-  *  H : bmp2run
-@@ -1362,7 +1432,7 @@
-   unsigned char *tmp_buf1, *tmp_buf2;
-   long  scan_size;
- 
--  //return(-1); // 19990323 by bglee - request from SM Lee
-+  /*return(-1);*/ /* 19990323 by bglee - request from SM Lee*/
-   
-   tmp_buf1 = in_buf;
-   tmp_buf2 = out_buf;
-@@ -1372,7 +1442,7 @@
-     return(-1);
-   }
- 
--  if ( !(ubMode & 0x02) )  // real compression //---
-+  if ( !(ubMode & 0x02) )  /* real compression */
-   {
-     out_buf = tmp_buf2 + scan_size;
-     *out_buf++ = 0x00;
-@@ -1385,7 +1455,7 @@
-       scan_size += 2;
-     }
-   }
--  else    // pre-compression
-+  else    /* pre-compression*/
-   {
-     scan_size += 2;
-     if (scan_size % 4) 
--- print/ghostscript-gpl/files/patch-lips__gdevrpdl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lips/gdevrpdl.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevrpdl.c	Fri Dec 31 17:34:04 2004
-@@ -81,7 +81,7 @@
-     if (pdev->PageCount == 0)
- 	rpdl_printer_initialize(pdev, prn_stream, num_coipes);
- 
--    if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)")))
-+    if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)")))
- 	return_error(gs_error_VMerror);
- 
-     lprn->NegativePrint = false; /* Not Support */
-@@ -90,7 +90,7 @@
-     if (code < 0)
- 	return code;
- 
--    gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)");
-+    gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "rpdl_print_page_copies(CompBuf)");
- 
-     fprintf(prn_stream, "\014");	/* Form  Feed */
- 
--- print/ghostscript-gpl/files/patch-src:smartgdi-contrib.mak
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/smartgdi-contrib.mak.orig	Wed Jun 19 21:43:43 2002
-+++ src/smartgdi-contrib.mak	Mon Jul 21 13:59:00 2003
-@@ -3,10 +3,12 @@
- ### Note : this driver is used by Samsung SmartGDI compatible printers.   ###
- ###
- 
-+gdi_opts=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR)
-+
- GDIMONO=$(GLOBJ)gdevgdi.$(OBJ) $(HPPCL)
- 
- $(DD)gdi.dev: $(GDIMONO) $(DD)page.dev
- 	$(SETPDEV) $(DD)gdi $(GDIMONO)
- 
- $(GLOBJ)gdevgdi.$(OBJ): $(GLSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h)
--	$(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(GLSRC)gdevgdi.c
-+	$(GLCC) $(GLO_)gdevgdi.$(OBJ) $(C_) $(gdi_opts) $(GLSRC)gdevgdi.c
--- print/ghostscript-gpl/files/patch-src-gdevdmpr.mak
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/gdevdmpr.mak.orig	Mon May  1 20:24:43 2000
-+++ src/gdevdmpr.mak	Mon May  1 20:26:23 2000
-@@ -1,8 +1,12 @@
- ### ---------------- Dot matrix printer device ---------------- ###
--dmprt_=gdevdmpr.$(OBJ) dviprlib.$(OBJ) gdevprn.$(OBJ)
-+dmprt_=$(GLOBJ)gdevdmpr.$(OBJ) $(GLOBJ)dviprlib.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
- 
--dmprt.dev: $(dmprt_)
--	$(SETDEV) dmprt $(dmprt_)
--	$(ADDMOD) dmprt -ps dmp_init
--gdevdmpr.$(OBJ): gdevdmpr.c dviprlib.h $(PDEVH)
--dviprlib.$(OBJ): dviprlib.c dviprlib.h
-+$(DD)dmprt.dev: $(dmprt_)
-+	$(SETDEV) $(DD)dmprt $(dmprt_)
-+	$(ADDMOD) $(DD)dmprt -ps dmp_init
-+
-+$(GLOBJ)gdevdmpr.$(OBJ): $(GLSRC)gdevdmpr.c $(GLSRC)dviprlib.h $(PDEVH)
-+	$(GLCC) $(GLO_)gdevdmpr.$(OBJ) $(C_) $(GLSRC)gdevdmpr.c
-+
-+$(GLOBJ)dviprlib.$(OBJ): $(GLSRC)dviprlib.c $(GLSRC)dviprlib.h
-+	$(GLCC) $(GLO_)dviprlib.$(OBJ) $(C_) $(GLSRC)dviprlib.c
--- print/ghostscript-gpl/files/patch-lips:gdevl4r.c
+++ /dev/null
@@ -1,176 +0,0 @@
---- lips/gdevl4r.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevl4r.c	Fri Dec 17 19:19:02 2004
-@@ -53,8 +53,8 @@
- #define lips_device(dtype, procs, dname, xdpi, ydpi, lm, bm, rm, tm, color_bits,\
- 		    print_page_copies, image_out, cassetFeed, username)\
- {        std_device_std_color_full_body(dtype, &procs, dname,\
--          (int)((long)(DEFAULT_WIDTH_10THS) * (xdpi) / 10),\
--          (int)((long)(DEFAULT_HEIGHT_10THS) * (ydpi) / 10),\
-+          (int)((long)((DEFAULT_WIDTH_10THS) * (xdpi)) / 10),\
-+          (int)((long)((DEFAULT_HEIGHT_10THS) * (ydpi)) / 10),\
-           xdpi, ydpi, color_bits,\
-           -(lm) * (xdpi), -(tm) * (ydpi),\
-           (lm) * 72.0, (bm) * 72.0,\
-@@ -68,8 +68,8 @@
- #define lips4_device(dtype, procs, dname, xdpi, ydpi, lm, bm, rm, tm, color_bits,\
- 		    print_page_copies, image_out, cassetFeed, username)\
- {        std_device_std_color_full_body(dtype, &procs, dname,\
--          (int)((long)(DEFAULT_WIDTH_10THS) * (xdpi) / 10),\
--          (int)((long)(DEFAULT_HEIGHT_10THS) * (ydpi) / 10),\
-+          (int)((long)((DEFAULT_WIDTH_10THS) * (xdpi)) / 10),\
-+          (int)((long)((DEFAULT_HEIGHT_10THS) * (ydpi)) / 10),\
-           xdpi, ydpi, color_bits,\
-           -(lm) * (xdpi), -(tm) * (ydpi),\
-           (lm) * 72.0, (bm) * 72.0,\
-@@ -178,8 +178,13 @@
- private int lips4c_output_page(gx_device_printer * pdev, FILE * prn_stream);
- private int lips_delta_encode(byte * inBuff, byte * prevBuff, byte * outBuff, byte * diffBuff, int Length);
- private int lips_byte_cat(byte * TotalBuff, byte * Buff, int TotalLen, int Len);
-+#if GS_VERSION_MAJOR >= 8
-+private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies);
-+private int lips_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies);
-+#else
- private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies));
- private int lips_print_page_copies(P4(gx_device_printer * pdev, FILE * prn_stream, lips_printer_type ptype, int numcopies));
-+#endif
- private int lips4type_print_page_copies(gx_device_printer * pdev, FILE * prn_stream, int num_copies, int ptype);
- 
- private int
-@@ -597,7 +602,7 @@
-     /* Initialize printer. */
-     lips_job_start(pdev, ptype, prn_stream, num_copies);
- 
--    if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
-+    if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
- 	return_error(gs_error_VMerror);
- 
- 
-@@ -607,7 +612,7 @@
-     if (code < 0)
- 	return code;
- 
--    gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
-+    gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
- 
-     /* eject page */
-     lips_job_end(pdev, prn_stream);
-@@ -641,9 +646,9 @@
- 
-     if (pdev->color_info.depth == 1)
-       {
--	if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
-+	if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf)")))
- 	  return_error(gs_error_VMerror);
--	if (!(lprn->CompBuf2 = gs_malloc(bpl * 3 / 2 + 1, maxY, "(CompBuf2)")))
-+	if (!(lprn->CompBuf2 = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "(CompBuf2)")))
- 	  return_error(gs_error_VMerror);
- 
- 	if (lprn->NegativePrint) {
-@@ -663,8 +668,8 @@
- 	if (code < 0)
- 	  return code;
- 	
--	gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
--	gs_free(lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)");
-+	gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "(CompBuf)");
-+	gs_free(pdev->memory, lprn->CompBuf2, bpl * 3 / 2 + 1, maxY, "(CompBuf2)");
-       }
-     else
-       {
-@@ -903,15 +908,15 @@
-     int lnum = 0;
- 
-     /* Memory Allocate */
--    if (!(pBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)")))
-+    if (!(pBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)")))
- 	return_error(gs_error_VMerror);
--    if (!(prevBuff = (byte *) gs_malloc(nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)")))
-+    if (!(prevBuff = (byte *) gs_malloc(pdev->memory, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)")))
- 	return_error(gs_error_VMerror);
--    if (!(ComBuff = (byte *) gs_malloc(Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)")))
-+    if (!(ComBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)")))
- 	return_error(gs_error_VMerror);
--    if (!(TotalBuff = (byte *) gs_malloc((Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)")))
-+    if (!(TotalBuff = (byte *) gs_malloc(pdev->memory, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)")))
- 	return_error(gs_error_VMerror);
--    if (!(diffBuff = (byte *) gs_malloc(Xpixel * num_components * 2, sizeof(byte), "lips_print_page")))
-+    if (!(diffBuff = (byte *) gs_malloc(pdev->memory, Xpixel * num_components * 2, sizeof(byte), "lips_print_page")))
- 	return_error(gs_error_VMerror);
- 
-     /* make output data */
-@@ -927,11 +932,11 @@
- 			    pdev->height - (lnum - NUM_LINES_4C));
-     }
-     /* Free Memory */
--    gs_free(pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)");
--    gs_free(prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)");
--    gs_free(ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)");
--    gs_free(TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)");
--    gs_free(diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page");
-+    gs_free(pdev->memory, pBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(pBuff)");
-+    gs_free(pdev->memory, prevBuff, nBytesPerLine, sizeof(byte), "lips4c_compress_output_page(prevBuff)");
-+    gs_free(pdev->memory, ComBuff, Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128, sizeof(byte), "lips4c_compress_output_page(ComBuff)");
-+    gs_free(pdev->memory, TotalBuff, (Xpixel * num_components + (Xpixel * num_components + 127) * 129 / 128) * NUM_LINES_4C, sizeof(byte), "lips4c_compress_output_page(TotalBuff)");
-+    gs_free(pdev->memory, diffBuff, Xpixel * num_components * 2, sizeof(byte), "lips_print_page");
- 
-     return 0;
- }
-@@ -1065,11 +1070,25 @@
- 	if (paper_size == USER_SIZE) {
- 	    fprintf(prn_stream, "%c2 I", LIPS_CSI);
- 	    fprintf(prn_stream, "%c80;%d;%dp", LIPS_CSI,
--		    width * 10, height * 10);
-+		    /* modified by shige 06/27 2003
-+		    width * 10, height * 10); */
-+		    /* modified by shige 11/09 2003
-+		    height * 10, width * 10); */
-+		    (height * 10 > LIPS_HEIGHT_MAX_720)?
-+		    LIPS_HEIGHT_MAX_720 : (height * 10),
-+		    (width * 10 > LIPS_WIDTH_MAX_720)?
-+		    LIPS_WIDTH_MAX_720 : (width * 10));
- 	} else if (paper_size == USER_SIZE + LANDSCAPE) {
- 	    fprintf(prn_stream, "%c2 I", LIPS_CSI);
- 	    fprintf(prn_stream, "%c81;%d;%dp", LIPS_CSI,
--		    height * 10, width * 10);
-+		    /* modified by shige 06/27 2003
-+		    width * 10, height * 10); */
-+		    /* modified by shige 11/09 2003
-+		    width * 10, height * 10); */
-+		    (width * 10 > LIPS_HEIGHT_MAX_720)?
-+		    LIPS_HEIGHT_MAX_720 : (width * 10),
-+		    (height * 10 > LIPS_WIDTH_MAX_720)?
-+		    LIPS_WIDTH_MAX_720 : (height * 10));
- 	} else {
- 	    fprintf(prn_stream, "%c%dp", LIPS_CSI, paper_size);
- 	}
-@@ -1078,14 +1097,28 @@
- 	    prev_paper_height != height) {
- 	    fprintf(prn_stream, "%c2 I", LIPS_CSI);
- 	    fprintf(prn_stream, "%c80;%d;%dp", LIPS_CSI,
--		    width * 10, height * 10);
-+		    /* modified by shige 06/27 2003
-+		    width * 10, height * 10); */
-+		    /* modified by shige 11/09 2003
-+		    height * 10, width * 10); */
-+		    (height * 10 > LIPS_HEIGHT_MAX_720)?
-+		    LIPS_HEIGHT_MAX_720 : (height * 10),
-+		    (width * 10 > LIPS_WIDTH_MAX_720)?
-+		    LIPS_WIDTH_MAX_720 : (width * 10));
- 	}
-     } else if (paper_size == USER_SIZE + LANDSCAPE) {
- 	if (prev_paper_width != width ||
- 	    prev_paper_height != height) {
- 	    fprintf(prn_stream, "%c2 I", LIPS_CSI);
- 	    fprintf(prn_stream, "%c81;%d;%dp", LIPS_CSI,
--		    height * 10, width * 10);
-+		    /* modified by shige 06/27 2003
-+		    height * 10, width * 10); */
-+		    /* modified by shige 11/09 2003
-+		    width * 10, height * 10); */
-+		    (width * 10 > LIPS_HEIGHT_MAX_720)?
-+		    LIPS_HEIGHT_MAX_720 : (width * 10),
-+		    (height * 10 > LIPS_WIDTH_MAX_720)?
-+		    LIPS_WIDTH_MAX_720 : (height * 10));
- 	}
-     }
-     /* desired number of copies */
--- print/ghostscript-gpl/files/patch-src__unix-dll.mak
+++ /dev/null
@@ -1,35 +0,0 @@
---- ./src/unix-dll.mak.orig	2009-01-03 14:55:23 -0500
-+++ ./src/unix-dll.mak	2009-01-03 14:57:45 -0500
-@@ -108,19 +108,19 @@
- 	$(MAKE) $(SODEFS) GENOPT='-DDEBUG' CFLAGS='$(CFLAGS_DEBUG) $(CFLAGS_SO) $(GCFLAGS) $(XCFLAGS)' $(GSSOC) $(GSSOX)
- 
- install-so: so
--	-mkdir -p $(prefix)
--	-mkdir -p $(datadir)
--	-mkdir -p $(gsdir)
--	-mkdir -p $(gsdatadir)
--	-mkdir -p $(bindir)
--	-mkdir -p $(libdir)
--	$(INSTALL_PROGRAM) $(GSSOC) $(bindir)/$(GSSOC_XENAME)
--	$(INSTALL_PROGRAM) $(GSSOX) $(bindir)/$(GSSOX_XENAME)
--	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR_MINOR)
--	$(RM_) $(libdir)/$(GS_SONAME)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME)
--	$(RM_) $(libdir)/$(GS_SONAME_MAJOR)
--	ln -s $(GS_SONAME_MAJOR_MINOR) $(libdir)/$(GS_SONAME_MAJOR)
-+	-mkdir -p $(DESTDIR)$(prefix)
-+	-mkdir -p $(DESTDIR)$(datadir)
-+	-mkdir -p $(DESTDIR)$(gsdir)
-+	-mkdir -p $(DESTDIR)$(gsdatadir)
-+	-mkdir -p $(DESTDIR)$(bindir)
-+	-mkdir -p $(DESTDIR)$(libdir)
-+	$(INSTALL_PROGRAM) $(GSSOC) $(DESTDIR)$(bindir)/$(GSSOC_XENAME)
-+	$(INSTALL_PROGRAM) $(GSSOX) $(DESTDIR)$(bindir)/$(GSSOX_XENAME)
-+	$(INSTALL_PROGRAM) $(BINDIR)/$(SOBINRELDIR)/$(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR_MINOR)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME)
-+	$(RM_) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
-+	ln -s $(GS_SONAME_MAJOR_MINOR) $(DESTDIR)$(libdir)/$(GS_SONAME_MAJOR)
- 
- soinstall: install-so install-scripts install-data
- 
--- print/ghostscript-gpl/files/patch-src:gdevdj9.c
+++ /dev/null
@@ -1,273 +0,0 @@
---- src/gdevdj9.c.orig	Fri Dec 17 19:31:42 2004
-+++ src/gdevdj9.c	Fri Dec 17 19:44:07 2004
-@@ -243,19 +243,19 @@
- };
- 
- private int
--    rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise1x1(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- private int
--    rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise2x1(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- private int
--    rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise1x2(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- private int
--    rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise2x2(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- 
--private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
-+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
-     {
- 	rescale_byte_wise1x1, rescale_byte_wise1x2
-     },
-@@ -264,7 +264,7 @@
-     }
- };
- /*
--private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
-+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
-     {
- 	rescale_byte_wise1x1, rescale_byte_wise1x1
-     },
-@@ -273,8 +273,8 @@
-     }
- };
- */
--private int cdj970_write_header(P2(gx_device *, FILE *));
--private int cdj970_write_trailer(P2(gx_device *, FILE *));
-+private int cdj970_write_header(gx_device *, FILE *);
-+private int cdj970_write_trailer(gx_device *, FILE *);
- 
- /*
-  * Drivers stuff.
-@@ -422,16 +422,16 @@
- };
- 
-     /* function pointer typedefs for device driver struct */
--typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size,
--				    FILE * prn_stream));
--typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev,
-+typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size,
-+				    FILE * prn_stream);
-+typedef void (*PrintNonBlankLines) (gx_device_printer * pdev,
- 				       struct ptr_arrays *data_ptrs,
- 				       struct misc_struct *misc_vars,
- 				       struct error_val_field *error_values,
- 				       const Gamma *gamma,
--				       FILE * prn_stream));
-+				       FILE * prn_stream);
- 
--typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream));
-+typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream);
- 
- typedef struct gx_device_cdj970_s {
-     gx_device_common;
-@@ -529,18 +529,18 @@
- }
- 
- private void
--     cdj970_start_raster_mode(P3(gx_device_printer * pdev,
--				 int papersize, FILE * prn_stream));
-+     cdj970_start_raster_mode(gx_device_printer * pdev,
-+				 int papersize, FILE * prn_stream);
- 
- private void
--     cdj970_print_non_blank_lines(P6(gx_device_printer * pdev,
-+     cdj970_print_non_blank_lines(gx_device_printer * pdev,
- 				     struct ptr_arrays *data_ptrs,
- 				     struct misc_struct *misc_vars,
- 				     struct error_val_field *error_values,
- 				     const Gamma *gamma,
--				     FILE * prn_stream));
-+				     FILE * prn_stream);
- private void
--     cdj970_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+     cdj970_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
- 
- 
- private const gx_device_procs cdj970_procs =
-@@ -555,12 +555,12 @@
- 				cdj970_terminate_page);
- 
- /* Forward references */
--private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
--				 int *, int, int, int));
--private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float
--				   *, float, float, int));
--private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int));
--private int cdj_set_bpp(P3(gx_device *, int, int));
-+private int cdj_put_param_int(gs_param_list *, gs_param_name,
-+				 int *, int, int, int);
-+private int cdj_put_param_float(gs_param_list *, gs_param_name, float
-+				   *, float, float, int);
-+private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
-+private int cdj_set_bpp(gx_device *, int, int);
- 
- static int PageCtr = 0;
- 
-@@ -692,70 +692,70 @@
- 
- /* internal functions */
- private void
--     FSDlinebw(P7(int scan, int plane_size,
-+     FSDlinebw(int scan, int plane_size,
- 		  struct error_val_field *error_values,
- 		  byte * kP,
--		  int n, int *ep, byte * dp));
-+		  int n, int *ep, byte * dp);
- 		  
- private void
--     FSDlinec2(P9(int scan, int plane_size,
-+     FSDlinec2(int scan, int plane_size,
- 		  struct error_val_field *error_values,
- 		  byte * cPa, byte * mPa, byte * yPa, int n,
--		  byte * dp, int *ep));
-+		  byte * dp, int *ep);
- 		  
- private void
--     FSDlinec3(P12(int scan, int plane_size,
-+     FSDlinec3(int scan, int plane_size,
- 		   struct error_val_field *error_values,
- 		   byte * cPa, byte * mPa, byte * yPa,
- 		   byte * cPb, byte * mPb, byte * yPb,
--		   int n, byte * dp, int *ep));
-+		   int n, byte * dp, int *ep);
- 		   
- private void
--     FSDlinec4(P12(int scan, int plane_size,
-+     FSDlinec4(int scan, int plane_size,
- 		   struct error_val_field *error_values,
- 		   byte * cPa, byte * mPa, byte * yPa,
- 		   byte * cPb, byte * mPb, byte * yPb,
--		   int n, byte * dp, int *ep));
-+		   int n, byte * dp, int *ep);
- 
- private void
-      init_error_buffer(struct misc_struct *misc_vars,
- 		       struct ptr_arrays *data_ptrs);
- 		       
- private void
--     do_floyd_steinberg(P8(int scan, int cscan, int plane_size,
-+     do_floyd_steinberg(int scan, int cscan, int plane_size,
- 			   int plane_size_c, int n,
- 			   struct ptr_arrays *data_ptrs,
- 			   gx_device_printer * pdev,
--			   struct error_val_field *error_values));
-+			   struct error_val_field *error_values);
- 
- 			   	   
- private int
--    do_gcr(P7(int bytecount, byte * inbyte, const byte * kvalues,
-+    do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
- 	      const byte * cvalues, const byte * mvalues,
--	      const byte * yvalues, const int *kcorrect));
-+	      const byte * yvalues, const int *kcorrect);
- 	      
- private void
--     send_scan_lines(P6(gx_device_printer * pdev,
-+     send_scan_lines(gx_device_printer * pdev,
- 			struct ptr_arrays *data_ptrs,
- 			struct misc_struct *misc_vars,
- 			struct error_val_field *error_values,
- 			const Gamma *gamma,
--			FILE * prn_stream));
-+			FILE * prn_stream);
- 			
- private void
--     do_gamma(P3(float mastergamma, float gammaval, byte * values));
-+     do_gamma(float mastergamma, float gammaval, byte * values);
-      
- private void
--     do_black_correction(P2(float kvalue, int *kcorrect));
-+     do_black_correction(float kvalue, int *kcorrect);
- 
- private void
--     init_data_structure(P3(gx_device_printer * pdev,
-+     init_data_structure(gx_device_printer * pdev,
- 			    struct ptr_arrays *data_ptrs,
--			    struct misc_struct *misc_vars));
-+			    struct misc_struct *misc_vars);
- 			    
- private void
--     calculate_memory_size(P2(gx_device_printer * pdev,
--			      struct misc_struct *misc_vars));
-+     calculate_memory_size(gx_device_printer * pdev,
-+			      struct misc_struct *misc_vars);
- 
- 
- /* assign_dpi:  
-@@ -863,7 +863,7 @@
- 		 2bpp feature of the hp970 someday, it is sized like storage.
- 		 storagee contains the errors from b/w fs-ditherng */
- 
--	data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W,
-+	data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W,
- 					    "cdj970_print_page");
- 
- 	/* if we can't allocate working area */
-@@ -884,7 +884,7 @@
- 	(*cdj970->terminate_page) (pdev, prn_stream);
- 
- 	/* Free Memory */
--	gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W,
-+	gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W,
- 	    "hp970_print_page");
- 
- 	PageCtr ++;
-@@ -2292,12 +2292,13 @@
- /* gdev_cmyk_map_cmyk_color: 
- ----------------------------------------------------------------------------------*/
- private gx_color_index gdev_cmyk_map_cmyk_color(gx_device 			*pdev,
--																								gx_color_value 	cyan, 
--																								gx_color_value 	magenta,
--																								gx_color_value 	yellow,
--																								gx_color_value 	black)
-+																								const gx_color_value 	cv[])
- {
- 	gx_color_index color;
-+	gx_color_value cyan = cv[0];
-+	gx_color_value magenta = cv[1];
-+	gx_color_value yellow = cv[2];
-+	gx_color_value black = cv[3];
- 
- 	switch (pdev->color_info.depth) {
- 		case 1:
-@@ -2331,10 +2332,11 @@
- /* gdev_cmyk_map_rgb_color: Mapping of RGB colors to gray values. 
- ----------------------------------------------------------------------------------*/
- private gx_color_index gdev_cmyk_map_rgb_color(	gx_device 			*pdev, 
--																								gx_color_value 	r, 
--																								gx_color_value 	g, 
--																								gx_color_value 	b)
-+																								const gx_color_value 	cv[])
- {
-+	gx_color_value r = cv[0];
-+	gx_color_value g = cv[1];
-+	gx_color_value b = cv[2];
- 	if (gx_color_value_to_byte(r & g & b) == 0xff) {
- 		return (gx_color_index) 0;	/* White */
- 	} else {
-@@ -2427,10 +2429,11 @@
- /* gdev_pcl_map_rgb_color: 
- ----------------------------------------------------------------------------------*/
- private gx_color_index gdev_pcl_map_rgb_color(	gx_device 			*pdev, 
--																								gx_color_value 	r,
--																								gx_color_value 	g, 
--																								gx_color_value 	b)
-+																								const gx_color_value 	cv[])
- {
-+	gx_color_value r = cv[0];
-+	gx_color_value g = cv[1];
-+	gx_color_value b = cv[2];
- 	if (gx_color_value_to_byte(r & g & b) == 0xff)
- 		return (gx_color_index) 0;	/* white */
- 	else {
--- print/ghostscript-gpl/files/patch-src-gdevijs.c
+++ /dev/null
@@ -1,659 +0,0 @@
---- src/gdevijs.c.orig	Thu Mar 10 23:57:23 2005
-+++ src/gdevijs.c	Fri May 27 02:56:55 2005
-@@ -27,15 +27,29 @@
-  * which is a security risk, since any program can be run.
-  * You should use -dSAFER which sets .LockSafetyParams to true 
-  * before opening this device.
-+ *
-+ * 11/26/03 David Suffield
-+ * (c) 2003-2004 Copyright Hewlett-Packard Development Company, LP
-+ *
-+ * 1. Removed hpijs 1.0-1.0.2 workarounds, use hpijs 1.0.3 or higher.
-+ * 2. Added krgb support.
-+ *
-+ * 02/21/05 David Suffield
-+ * 1. Fixed segfault issue with 1-bit color space.
-+ * 2. Fixed z-order issue with colored text on black rectangle.
-+ *
-  */
- 
- #include "unistd_.h"	/* for dup() */
- #include 
-+#include 
- #include "gdevprn.h"
- #include "gp.h"
- #include "ijs.h"
- #include "ijs_client.h"
- 
-+/*#define KRGB_DEBUG*/
-+
- /* This should go into gdevprn.h, or, better yet, gdevprn should
-    acquire an API for changing resolution. */
- int gdev_prn_maybe_realloc_memory(gx_device_printer *pdev,
-@@ -52,6 +66,14 @@
- private dev_proc_put_params(gsijs_put_params);
- private dev_proc_finish_copydevice(gsijs_finish_copydevice);
- 
-+/* Following definitions are for krgb support. */
-+private dev_proc_create_buf_device(gsijs_create_buf_device);
-+private dev_proc_fill_rectangle(gsijs_fill_rectangle);
-+private dev_proc_copy_mono(gsijs_copy_mono);
-+private dev_proc_fill_mask(gsijs_fill_mask);
-+private dev_proc_fill_path(gsijs_fill_path);
-+private dev_proc_stroke_path(gsijs_stroke_path);
-+
- private const gx_device_procs gsijs_procs = {
- 	gsijs_open,
- 	NULL,	/* get_initial_matrix */
-@@ -126,6 +148,14 @@
- 
-     IjsClientCtx *ctx;
-     int ijs_version;
-+
-+    /* Additional parameters for krgb support. */
-+    int krgb_mode;     /* 0=false, 1=true */
-+    int k_path;        /* k plane path, 0=false, 1=true */
-+    int k_width;       /* k plane width in pixels */
-+    int k_band_size;   /* k plane buffer size in bytes, byte aligned */
-+    unsigned char *k_band;  /* k plane buffer */
-+    gx_device_procs prn_procs;  /* banding playback procedures */
- };
- 
- #define DEFAULT_DPI 74   /* See gsijs_set_resolution() below. */
-@@ -153,7 +183,12 @@
-     FALSE,	/* Tumble_set */
- 
-     NULL,	/* IjsClient *ctx */
--    0		/* ijs_version */
-+    0,		/* ijs_version */
-+    0,          /* krgb_mode */
-+    0,          /* k_path */
-+    0,          /* k_width */
-+    0,          /* k_band_size */
-+    NULL        /* k_band buffer */
- };
- 
- 
-@@ -169,12 +204,254 @@
- 
- /**************************************************************************/
- 
--/* ------ Private definitions ------ */
-+/* ---------------- Low-level graphic procedures ---------------- */
-+
-+static unsigned char xmask[] =
-+{
-+   0x80,    /* x=0 */
-+   0x40,    /* 1 */
-+   0x20,    /* 2 */
-+   0x10,    /* 3 */
-+   0x08,    /* 4 */
-+   0x04,    /* 5 */
-+   0x02,    /* 6 */
-+   0x01     /* 7 */
-+};
-+
-+private int gsijs_fill_rectangle(gx_device * dev, int x, int y, int w, int h,
-+           gx_color_index color)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+
-+   if (ijsdev->krgb_mode && ijsdev->k_path && y >= 0 && x >= 0) 
-+   {
-+      int raster = (ijsdev->k_width+7) >> 3;
-+      register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3);
-+      int dest_start_bit = x & 7;
-+      int i,j,w1;
-+
-+      if (h <= 0 || w <= 0)
-+         return 0;
-+
-+      if ((x+w) > ijsdev->k_width)
-+         w1 = ijsdev->k_width - x; 
-+      else
-+         w1 = w;
-+
-+      /* Note x,y orgin 0,0 is stored first byte 0 left to right. */
-+
-+      if (color==0x0)
-+      { 
-+         /* Color is black, store in k plane band instead of regular band. */
-+         for (j=0; j>3] |= xmask[(dest_start_bit+i)&7];
-+            dest+=raster;    
-+         }
-+         return 0;
-+      }
-+      else
-+      {
-+         /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */
-+         for (j=0; j>3] &= ~xmask[(dest_start_bit+i)&7];
-+            dest+=raster;    
-+         }
-+      }
-+   }
-+
-+   return (*ijsdev->prn_procs.fill_rectangle)(dev, x, y, w, h, color);
-+}
-+
-+private int gsijs_copy_mono(gx_device * dev, const byte * data,
-+      int dx, int draster, gx_bitmap_id id,
-+      int x, int y, int w, int height, gx_color_index zero, gx_color_index one)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+
-+   /*   if (ijsdev->krgb_mode && ijsdev->k_path && one==0x0) */
-+   if (ijsdev->krgb_mode && ijsdev->k_path) 
-+   {
-+      /* Store in k plane band instead of regular band. */
-+      int raster = (ijsdev->k_width+7) >> 3;       /* raster width in bytes, byte aligned */
-+      register unsigned char *dest=ijsdev->k_band+(raster*y)+(x >> 3);
-+      register const unsigned char *scan=data+(dx >> 3);
-+      int dest_start_bit = x & 7;
-+      int scan_start_bit = dx & 7;
-+      int i, h=height;
-+      
-+      if (h <= 0 || w <= 0)
-+         return 0;
-+
-+      if (one==0x0)
-+      {
-+         /* Color is black, store in k plane band instead of regular band. */
-+         while (h-- > 0)
-+         {
-+            for (i=0; i>3] & xmask[(scan_start_bit+i)&7])
-+                  dest[(dest_start_bit+i)>>3] |= xmask[(dest_start_bit+i)&7];
-+            }
-+            scan+=draster;
-+            dest+=raster;
-+         }
-+         return 0;
-+      }
-+      else
-+      {
-+         /* Color is not black, remove any k plane bits for z-order dependencies, store in regular band. */
-+         while (h-- > 0)
-+         {
-+            for (i=0; i>3] & xmask[(scan_start_bit+i)&7])
-+                  dest[(dest_start_bit+i)>>3] &= ~xmask[(dest_start_bit+i)&7];
-+            }
-+            scan+=draster;
-+            dest+=raster;
-+         }
-+      }   
-+   }
-+
-+   return (*ijsdev->prn_procs.copy_mono)(dev, data, dx, draster, id, x, y, w, height, zero, one);
-+}
-+
-+/* ---------------- High-level graphic procedures ---------------- */
-+
-+private int gsijs_fill_mask(gx_device * dev,
-+      const byte * data, int dx, int raster, gx_bitmap_id id,
-+      int x, int y, int w, int h,
-+      const gx_drawing_color * pdcolor, int depth,
-+      gs_logical_operation_t lop, const gx_clip_path * pcpath)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+   int code;
-+
-+   ijsdev->k_path = 1;
-+
-+   code = (*ijsdev->prn_procs.fill_mask)(dev, data, dx, raster, id, x, y, w, h, pdcolor, depth, lop, pcpath);
-+
-+   ijsdev->k_path = 0;
-+
-+   return code;
-+}
-+
-+private int gsijs_fill_path(gx_device * dev, const gs_imager_state * pis,
-+      gx_path * ppath, const gx_fill_params * params,
-+      const gx_drawing_color * pdcolor,
-+      const gx_clip_path * pcpath)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+   int code;
-+
-+   ijsdev->k_path = 1;
-+
-+   code = (*ijsdev->prn_procs.fill_path)(dev, pis, ppath, params, pdcolor, pcpath);
-+
-+   ijsdev->k_path = 0;
-+
-+   return 0;
-+}
-+
-+private int gsijs_stroke_path(gx_device * dev, const gs_imager_state * pis,
-+        gx_path * ppath, const gx_stroke_params * params,
-+        const gx_drawing_color * pdcolor,
-+        const gx_clip_path * pcpath)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)((gx_device_forward *)dev)->target;
-+   int code;
-+
-+   ijsdev->k_path = 1;
- 
--/* Versions 1.0 through 1.0.2 of hpijs report IJS version 0.29, and
--   require some workarounds. When more up-to-date hpijs versions
--   become ubiquitous, all these workarounds should be removed. */
--#define HPIJS_1_0_VERSION 29
-+   code = (*ijsdev->prn_procs.stroke_path)(dev, pis, ppath, params, pdcolor, pcpath);
-+
-+   ijsdev->k_path = 0;
-+
-+   return code;
-+}
-+
-+/* ---------------- krgb banding playback procedures ---------------- */
-+
-+private int gsijs_get_bits(gx_device_printer * pdev, int y, byte * str, byte ** actual_data)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
-+   gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
-+   int band_height = cdev->page_info.band_params.BandHeight;
-+   int band_number = y/band_height;
-+   int raster = (ijsdev->k_width+7) >> 3;       /* raster width in bytes, byte aligned */
-+   int y1=raster*(y-(band_height*band_number));
-+ 
-+   if (y1 == 0)
-+   {
-+      /* First raster for band, clear k_band. Banding playback occurs on first raster. */
-+      memset(ijsdev->k_band, 0, ijsdev->k_band_size); 
-+   }
-+
-+   return gdev_prn_get_bits(pdev, y, str, actual_data);  /* get raster from regular band */
-+}
-+
-+private int gsijs_k_get_bits(gx_device_printer * pdev, int y, byte ** actual_data)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)pdev;
-+   gx_device_clist_common *cdev = (gx_device_clist_common *)pdev;
-+   int band_height = cdev->page_info.band_params.BandHeight;
-+   int band_number = y/band_height;
-+   int raster = (ijsdev->k_width+7) >> 3;       /* raster width in bytes, byte aligned */
-+   int y1=raster*(y-(band_height*band_number));
-+ 
-+   *actual_data = ijsdev->k_band+y1;
-+
-+   return 0;
-+}
-+
-+private int gsijs_create_buf_device(gx_device **pbdev, gx_device *target,
-+            const gx_render_plane_t *render_plane, gs_memory_t *mem, bool for_band)
-+{
-+   gx_device_ijs *ijsdev = (gx_device_ijs *)target;
-+   int n_chan = ijsdev->color_info.num_components;
-+   int code = gx_default_create_buf_device(pbdev, target, render_plane, mem, for_band);
-+   if (code < 0 || n_chan != 3)
-+      return code;
-+
-+   /* Save buffer (vector) procedures so that we can hook them during banding playback. */
-+   ijsdev->prn_procs = (*pbdev)->procs;
-+
-+   /* Replace buffer procedures with krgb procedures. */
-+   set_dev_proc(*pbdev, fill_rectangle, gsijs_fill_rectangle);
-+   set_dev_proc(*pbdev, copy_mono, gsijs_copy_mono);
-+   set_dev_proc(*pbdev, fill_mask, gsijs_fill_mask);
-+   set_dev_proc(*pbdev, fill_path, gsijs_fill_path);
-+   set_dev_proc(*pbdev, stroke_path, gsijs_stroke_path);
-+
-+   return code;
-+}
-+
-+/* See if IJS server supports krgb. Return value: 0=false, 1=true. */
-+private int
-+gsijs_set_krgb_mode(gx_device_ijs *ijsdev)
-+{
-+    char buf[256];
-+    int n_chan = ijsdev->color_info.num_components;
-+    int code;
-+
-+    if (n_chan != 3)
-+        return 0;    /* no krgb support, not RGB colorspace */
-+
-+    buf[0] = 0;
-+    code = ijs_client_enum_param(ijsdev->ctx, 0, "ColorSpace", buf, sizeof(buf)-1);
-+    if (code >= 0)
-+        buf[code] = 0;
-+    if (strstr(buf, "KRGB") == NULL)
-+        return 0;  /* no krgb support */
-+
-+    return 1;  /* krgb is supported */
-+}
-+
-+/* ------ Private definitions ------ */
- 
- private int
- gsijs_parse_wxh (const char *val, int size, double *pw, double *ph)
-@@ -212,34 +489,6 @@
- }
- 
- /**
-- * gsijs_set_generic_params_hpijs: Set generic IJS parameters.
-- *
-- * This version is specialized for hpijs 1.0 through 1.0.2, and
-- * accommodates a number of quirks.
-- **/
--private int
--gsijs_set_generic_params_hpijs(gx_device_ijs *ijsdev)
--{
--    char buf[256];
--    int code = 0;
--
--    /* IjsParams, Duplex, and Tumble get set at this point because
--       they may affect margins. */
--    if (ijsdev->IjsParams) {
--	code = gsijs_client_set_param(ijsdev, "IjsParams", ijsdev->IjsParams);
--    }
--
--    if (code == 0 && ijsdev->Duplex_set) {
--	int duplex_val;
--	
--	duplex_val = ijsdev->Duplex ? (ijsdev->IjsTumble ? 1 : 2) : 0;
--	sprintf (buf, "%d", duplex_val);
--	code = gsijs_client_set_param(ijsdev, "Duplex", buf);
--    }
--    return code;
--}
--
--/**
-  * gsijs_set_generic_params: Set generic IJS parameters.
-  **/
- private int
-@@ -250,9 +499,6 @@
-     int i, j;
-     char *value;
- 
--    if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
--	return gsijs_set_generic_params_hpijs(ijsdev);
--
-     /* Split IjsParams into separate parameters and send to ijs server */
-     value = NULL;
-     for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -293,68 +539,6 @@
- }
- 
- /**
-- * gsijs_set_margin_params_hpijs: Do margin negotiation with IJS server.
-- *
-- * This version is specialized for hpijs 1.0 through 1.0.2, and
-- * accommodates a number of quirks.
-- **/
--private int
--gsijs_set_margin_params_hpijs(gx_device_ijs *ijsdev)
--{
--    char buf[256];
--    int code = 0;
--
--    if (code == 0) {
--	sprintf(buf, "%d", ijsdev->width);
--	code = gsijs_client_set_param(ijsdev, "Width", buf);
--    }
--    if (code == 0) {
--	sprintf(buf, "%d", ijsdev->height);
--	code = gsijs_client_set_param(ijsdev, "Height", buf);
--    }
--
--    if (code == 0) {
--	double printable_width, printable_height;
--	double printable_left, printable_top;
--	float m[4];
--
--	code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableArea",
--				   buf, sizeof(buf));
--	if (code == IJS_EUNKPARAM)
--	    /* IJS server doesn't support margin negotiations.
--	       That's ok. */
--	    return 0;
--	else if (code >= 0) {
--	    code = gsijs_parse_wxh(buf, code,
--				    &printable_width, &printable_height);
--	}
--
--	if (code == 0) {
--	    code = ijs_client_get_param(ijsdev->ctx, 0, "PrintableTopLeft",
--					buf, sizeof(buf));
--	    if (code == IJS_EUNKPARAM)
--		return 0;
--	    else if (code >= 0) {
--		code = gsijs_parse_wxh(buf, code,
--					&printable_left, &printable_top);
--	    }
--	}
--
--	if (code == 0) {
--	    m[0] = printable_left;
--	    m[1] = ijsdev->MediaSize[1] * (1.0 / 72) -
--	      printable_top - printable_height;
--	    m[2] = ijsdev->MediaSize[0] * (1.0 / 72) -
--	      printable_left - printable_width;
--	    m[3] = printable_top;
--	    gx_device_set_margins((gx_device *)ijsdev, m, true);
--	}
--    }
--
--    return code;
--}
--
--/**
-  * gsijs_set_margin_params: Do margin negotiation with IJS server.
-  **/
- private int
-@@ -365,9 +549,6 @@
-     int i, j;
-     char *value;
- 
--    if (ijsdev->ijs_version == HPIJS_1_0_VERSION)
--	return gsijs_set_margin_params_hpijs(ijsdev);
--
-     /* Split IjsParams into separate parameters and send to ijs server */
-     value = NULL;
-     for (i=0, j=0; (j < ijsdev->IjsParams_size) && (i < sizeof(buf)-1); j++) {
-@@ -534,12 +715,18 @@
-     char buf[256];
-     bool use_outputfd;
-     int fd = -1;
-+    long max_bitmap = ijsdev->space_params.MaxBitmap;
- 
-     if (strlen(ijsdev->IjsServer) == 0) {
- 	eprintf("ijs server not specified\n");
- 	return gs_note_error(gs_error_ioerror);
-     }
- 
-+    ijsdev->space_params.MaxBitmap = 0;	/* force banding */
-+
-+    /* Set create_buf_device in printer device, so that we can hook the banding playback procedures. */
-+    ijsdev->printer_procs.buf_procs.create_buf_device = gsijs_create_buf_device;
-+
-     /* Decide whether to use OutputFile or OutputFD. Note: how to
-        determine this is a tricky question, so we just allow the
-        user to set it.
-@@ -554,6 +741,8 @@
-     if (code < 0)
- 	return code;
- 
-+    ijsdev->space_params.MaxBitmap = max_bitmap;
-+    
-     if (use_outputfd) {
- 	/* Note: dup() may not be portable to all interesting IJS
- 	   platforms. In that case, this branch should be #ifdef'ed out.
-@@ -613,6 +802,9 @@
-     if (code >= 0)
- 	code = gsijs_set_margin_params(ijsdev);
- 
-+    if (code >= 0)
-+        ijsdev->krgb_mode = gsijs_set_krgb_mode(ijsdev);
-+
-     return code;
- }
- 
-@@ -695,21 +887,6 @@
-     return min(width, end);
- }
- 
--private int ijs_all_white(unsigned char *data, int size)
--{
--   int clean = 1;
--   int i;
--   for (i = 0; i < size; i++)
--   {
--     if (data[i] != 0xFF)
--     {
--        clean = 0;
--        break;
--     }
--   }
--   return clean;
--}
--
- /* Print a page.  Don't use normal printer gdev_prn_output_page 
-  * because it opens the output file.
-  */
-@@ -720,8 +897,9 @@
-     gx_device_printer *pdev = (gx_device_printer *)dev;
-     int raster = gdev_prn_raster(pdev);
-     int ijs_width, ijs_height;
--    int row_bytes;
-+    int row_bytes, k_row_bytes=0;
-     int n_chan = pdev->color_info.num_components;
-+    int krgb_mode = ijsdev->krgb_mode;
-     unsigned char *data;
-     char buf[256];
-     double xres = pdev->HWResolution[0];
-@@ -737,13 +915,23 @@
- 
-     /* Determine bitmap width and height */
-     ijs_height = gdev_prn_print_scan_lines(dev);
--    if (ijsdev->ijs_version == HPIJS_1_0_VERSION) {
--	ijs_width = pdev->width;
--    } else {
- 	ijs_width = gsijs_raster_width(dev);
--    }
-+
-     row_bytes = (ijs_width * pdev->color_info.depth + 7) >> 3;
- 
-+    if (krgb_mode)
-+    {
-+        gx_device_clist_common *cdev = (gx_device_clist_common *)dev;
-+        int band_height = cdev->page_info.band_params.BandHeight;
-+        k_row_bytes = (ijs_width + 7) >> 3;
-+
-+        /* Create banding buffer for k plane. */
-+        ijsdev->k_width = ijs_width;
-+        ijsdev->k_band_size = band_height * k_row_bytes;   
-+        if ((ijsdev->k_band = gs_malloc(pdev->memory, ijsdev->k_band_size, 1, "gsijs_output_page")) == (unsigned char *)NULL)
-+           return gs_note_error(gs_error_VMerror);
-+    }
-+
-     /* Required page parameters */
-     sprintf(buf, "%d", n_chan);
-     gsijs_client_set_param(ijsdev, "NumChan", buf);
-@@ -752,44 +940,71 @@
- 
-     /* This needs to become more sophisticated for DeviceN. */
-     strcpy(buf, (n_chan == 4) ? "DeviceCMYK" : 
--	((n_chan == 3) ? "DeviceRGB" : "DeviceGray"));
-+	((n_chan == 3) ? (krgb_mode ? "KRGB" : "DeviceRGB") : "DeviceGray"));
-     gsijs_client_set_param(ijsdev, "ColorSpace", buf);
- 
--    /* If hpijs 1.0, don't set width and height here, because it
--       expects them to be the paper size. */
--    if (ijsdev->ijs_version != HPIJS_1_0_VERSION) {
--	sprintf(buf, "%d", ijs_width);
--	gsijs_client_set_param(ijsdev, "Width", buf);
--	sprintf(buf, "%d", ijs_height);
--	gsijs_client_set_param(ijsdev, "Height", buf);
--    }
-+    sprintf(buf, "%d", ijs_width);
-+    gsijs_client_set_param(ijsdev, "Width", buf);
-+    sprintf(buf, "%d", ijs_height);
-+    gsijs_client_set_param(ijsdev, "Height", buf);
- 
-     sprintf(buf, "%gx%g", xres, yres);
-     gsijs_client_set_param(ijsdev, "Dpi", buf);
- 
-+#ifdef KRGB_DEBUG
-+    int kfd, rgbfd;
-+    char sz[128];
-+    kfd = open("/tmp/k.pbm", O_CREAT | O_TRUNC | O_RDWR, 0644);
-+    rgbfd = open("/tmp/rgb.ppm", O_CREAT | O_TRUNC | O_RDWR, 0644);
-+    snprintf(sz, sizeof(sz), "P4\n#gdevijs test\n%d\n%d\n", ijs_width, ijs_height);
-+    write(kfd, sz, strlen(sz));
-+    snprintf(sz, sizeof(sz), "P6\n#gdevijs test\n%d\n%d\n255\n", ijs_width, ijs_height);
-+    write(rgbfd, sz, strlen(sz));
-+#endif
-+
-     for (i=0; ictx, IJS_CMD_BEGIN_PAGE);
- 	status = ijs_client_send_cmd_wait(ijsdev->ctx);
- 
- 	for (y = 0; y < ijs_height; y++) {
--	    code = gdev_prn_get_bits(pdev, y, data, &actual_data);
--	    if (code < 0)
--		break;
-+            if (krgb_mode)
-+                code = gsijs_get_bits(pdev, y, data, &actual_data);
-+            else
-+                code = gdev_prn_get_bits(pdev, y, data, &actual_data);
-+            if (code < 0)
-+                break;
-+#ifdef KRGB_DEBUG
-+            write(rgbfd, actual_data, row_bytes);
-+#endif
-+            status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, row_bytes);
-+            if (status)
-+                break;
- 
--	    if (ijsdev->ijs_version == HPIJS_1_0_VERSION &&
--		ijs_all_white(actual_data, row_bytes))
--		status = ijs_client_send_data_wait(ijsdev->ctx, 0, NULL, 0);
--	    else
--		status = ijs_client_send_data_wait(ijsdev->ctx, 0,
--		    (char *)actual_data, row_bytes);
--	    if (status)
--		break;
-+            if (krgb_mode) {
-+                code = gsijs_k_get_bits(pdev, y, &actual_data);
-+                if (code < 0)
-+                    break;
-+#ifdef KRGB_DEBUG
-+                write(kfd, actual_data, k_row_bytes);
-+#endif
-+                status = ijs_client_send_data_wait(ijsdev->ctx, 0, (char *)actual_data, k_row_bytes);
-+                if (status)
-+                    break;
-+	    }
- 	}
- 	ijs_client_begin_cmd(ijsdev->ctx, IJS_CMD_END_PAGE);
- 	status = ijs_client_send_cmd_wait(ijsdev->ctx);
-     }
- 
-+#ifdef KRGB_DEBUG
-+    close(kfd);
-+    close(rgbfd);
-+#endif
-+
-+    if(krgb_mode)
-+        gs_free(pdev->memory, ijsdev->k_band, ijsdev->k_band_size, 1, "gsijs_output_page");
-+
-     gs_free_object(pdev->memory, data, "gsijs_output_page");
- 
-     endcode = (pdev->buffer_space && !pdev->is_async_renderer ?
-@@ -1093,7 +1308,6 @@
- 	dprintf2("ijs: Can't set parameter %s=%s\n", key, value);
-     return code;
- }
-- 
- 
- private int
- gsijs_set_color_format(gx_device_ijs *ijsdev)
--- print/ghostscript-gpl/files/bjc250.contrib.mak
+++ /dev/null
@@ -1,31 +0,0 @@
-### ----------------- The BJC-210/240/250/250ex/265/1000 ---------------- ###
-
-### 
-### For questions about the driver, mailto://szaszg at hu.inter.net
-### http://bjc250gs.sourceforge.net
-###
-
-bjc_h=$(GLSRC)gdevbjc_.h
-
-bjc_=$(GLOBJ)gdevbjc_.$(OBJ) $(GLOBJ)gdevbjca.$(OBJ)
-
-$(GLOBJ)gdevbjc_.$(OBJ) : $(GLSRC)gdevbjc_.c $(PDEVH) $(bjc_h)
-	$(GLCC) $(GLO_)gdevbjc_.$(OBJ) $(C_) $(GLSRC)gdevbjc_.c
-
-$(GLOBJ)gdevbjca.$(OBJ) : $(GLSRC)gdevbjca.c $(PDEVH) $(bjc_h)
-	$(GLCC) $(GLO_)gdevbjca.$(OBJ) $(C_) $(GLSRC)gdevbjca.c
-
-$(DD)bjcmono.dev : $(bjc_) $(DD)page.dev
-	$(SETPDEV) $(DD)bjcmono $(bjc_)
-
-$(DD)bjcgray.dev : $(bjc_) $(DD)page.dev
-	$(SETPDEV) $(DD)bjcgray $(bjc_)
-
-$(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev
-	$(SETPDEV) $(DD)bjccmyk $(bjc_)
-
-$(DD)bjccolor.dev : $(bjc_) $(DD)page.dev
-	$(SETPDEV) $(DD)bjccolor $(bjc_)
-
-### -------------------- The H-P Color LaserJet 5/5M -------------------- ###
-
--- print/ghostscript-gpl/files/patch-src:cpca_gdevl4v.c
+++ /dev/null
@@ -1,82 +0,0 @@
---- src/cpca_gdevl4v.c.orig	Tue May  7 00:30:00 2002
-+++ src/cpca_gdevl4v.c	Wed Dec 10 19:54:46 2003
-@@ -316,41 +316,35 @@
- };
- 
- /* Vector device implementation */
--private int lips4v_beginpage(P1(gx_device_vector * vdev));
--private int lips4v_setfillcolor(P2(gx_device_vector * vdev,
--				   const gx_drawing_color * pdc));
--private int lips4v_setstrokecolor(P2(gx_device_vector * vdev,
--				     const gx_drawing_color * pdc));
--private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern,
--			      uint count, floatp offset));
--private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness));
-+private int lips4v_beginpage(gx_device_vector * vdev);
-+private int lips4v_setfillcolor(gx_device_vector * vdev,
-+				   const gx_drawing_color * pdc);
-+private int lips4v_setstrokecolor(gx_device_vector * vdev,
-+				     const gx_drawing_color * pdc);
-+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
-+			      uint count, floatp offset);
-+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
- private int
--lips4v_setlogop(P3
--
--		(gx_device_vector * vdev, gs_logical_operation_t lop,
--		 gs_logical_operation_t diff));
-+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
-+		 gs_logical_operation_t diff);
- private int
- 
--lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
- private int
--lips4v_moveto(P6
--	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
--	       floatp y, gx_path_type_t type));
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
- private int
--lips4v_lineto(P6
--	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
--	       floatp y, gx_path_type_t type));
-+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
- private int
--lips4v_curveto(P10
--	       (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
-+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
- 		floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
--		gx_path_type_t type));
-+		gx_path_type_t type);
- private int
--lips4v_closepath(P6
--		 (gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
--		  floatp y_start, gx_path_type_t type));
-+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
-+		  floatp y_start, gx_path_type_t type);
- 
--private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
- private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
- private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -2296,7 +2290,7 @@
- 	}
- 	color_set_pure(&color, one);
- 	code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
--					     &color);
-+					     NULL, &color);
-     }
-     if (code < 0)
- 	return 0;
-@@ -2438,7 +2432,7 @@
-     if (w <= 0 || h <= 0)
- 	return 0;
-     if (depth > 1 ||
--	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- 	gdev_vector_update_log_op(vdev, lop) < 0)
- 	return gx_default_fill_mask(dev, data, data_x, raster, id,
--- /dev/null
+++ print/ghostscript-gpl/files/patch-lib-cidfmap
@@ -0,0 +1,61 @@
+--- lib/cidfmap.orig	2005-12-29 04:56:24.000000000 +0900
++++ lib/cidfmap	2008-03-04 07:04:11.000000000 +0900
+@@ -26,3 +26,58 @@
+ %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
+ %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
+ %
++/Ryumin-Light << /FileType /TrueType /Path (Ryumin-Light.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++/GothicBBB-Medium << /FileType /TrueType /Path (GothicBBB-Medium.ttf) /SubfontID 0 /CSI [(Japan1) 3] >> ;
++
++/Ryumin-Medium		/Ryumin-Light ;
++/Ryumin-Regular		/Ryumin-Light ;
++/RyuminPro-Light	/Ryumin-Light ;
++
++/GothicBBBPro-Medium	/GothicBBB-Medium ;
++
++/KozGoPro-Bold		/GothicBBB-Medium ;
++/KozGoPro-Heavy		/GothicBBB-Medium ;
++/KozGoPro-Medium	/GothicBBB-Medium ;
++/KozGoPro-Regular	/GothicBBB-Medium ;
++
++/KozMinPro-Bold		/Ryumin-Light ;
++/KozMinPro-Light	/Ryumin-Light ;
++/KozMinPro-Medium	/Ryumin-Light ;
++/KozMinPro-Regular	/Ryumin-Light ;
++
++/HiraKakuPro-W3		/GothicBBB-Medium ;
++/HiraKakuPro-W6		/GothicBBB-Medium ;
++/HiraKakuStd-W8		/GothicBBB-Medium ;
++
++/HiraMaruPro-W4		/GothicBBB-Medium ;
++
++/HiraMinPro-W3		/Ryumin-Light ;
++
++/HeiseiMin-W3		/Ryumin-Light ;
++/HeiseiKakuGo-W5	/GothicBBB-Medium ;
++
++/FutoMinA101-Bold	/Ryumin-Light ;
++/FutoMinA101Pro-Bold	/Ryumin-Light ;
++/FutoGoB101-Bold	/GothicBBB-Medium ;
++/FutoGoB101Pro-Bold	/GothicBBB-Medium ;
++
++/Jun101-Light		/Ryumin-Light ;
++/Jun101Pro-Light	/Ryumin-Light ;
++
++/MidashiGo-MB31		/GothicBBB-Medium ;
++/MidashiGoPro-MB31	/GothicBBB-Medium ;
++
++/MidashiMinPro-MA31	/Ryumin-Light ;
++
++%/Munhwa-Regular	/Munhwa-Regular ;
++%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
++%/Munhwa-Bold		/Munhwa-Bold ;
++%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
++
++/HYGoThic-Medium	/MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium	/Munhwa-Regular ;
++/HYRGoThic-Medium	/MunhwaGothic-Bold ;
++
++/STHeiti-Regular << /FileType /TrueType /Path (STHeiti-Regular.ttf) /SubfontID 0 /CSI [(CNS1) 5] >> ;
++/STSong-Light << /FileType /TrueType /Path (STSong-Light.ttf) /SubfontID 0 /CSI [(GB1) 5] >> ;
++/MSung-Light << /FileType /TrueType /Path (MSung-Light.ttf) /SubfontID 0 /CSI [(GB1) 5] >> ;
--- print/ghostscript-gpl/files/cdj850.contrib.mak
+++ /dev/null
@@ -1,21 +0,0 @@
-###- cdj850 - HP 850 Driver under development -------- ###
-cdeskjet8_=$(GLOBJ)gdevcd8.$(OBJ) $(HPPCL)
-
-$(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj670 $(cdeskjet8_)
-
-$(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj850 $(cdeskjet8_)
-
-$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj880 $(cdeskjet8_)
-
-$(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj890 $(cdeskjet8_)
-
-$(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_)
-
-$(GLOBJ)gdevcd8.$(OBJ) : $(GLSRC)gdevcd8.c $(PDEVH) $(math__h)\
- $(gsparam_h) $(gxlum_h) $(gdevpcl_h)
-	$(GLCC) $(GLO_)gdevcd8.$(OBJ) $(C_) $(GLSRC)gdevcd8.c
--- print/ghostscript-gpl/files/patch-bjc250:src:gdevbjca.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- bjc250/src/gdevbjca.c.orig	Fri Nov  8 06:15:15 2002
-+++ bjc250/src/gdevbjca.c	Fri Nov  8 07:47:41 2002
-@@ -46,10 +46,10 @@
- #include 
- #include 
- 
--private void bjc_put_bytes(P3(FILE *file, const char *data, int count));
--private void bjc_put_hi_lo(P2(FILE *file, int value));
--private void bjc_put_lo_hi(P2(FILE *file, int value));
--private void bjc_put_command(P3(FILE *file, char command, int count));
-+private void bjc_put_bytes(FILE *file, const char *data, int count);
-+private void bjc_put_hi_lo(FILE *file, int value);
-+private void bjc_put_lo_hi(FILE *file, int value);
-+private void bjc_put_command(FILE *file, char command, int count);
- 
- /* ---------------- Utilities ---------------- */
- 
--- print/ghostscript-gpl/files/patch-src_cpca_mk_cmd.c
+++ /dev/null
@@ -1,270 +0,0 @@
---- src/cpca_mk_cmd.c.orig	Wed Mar 15 15:00:26 2006
-+++ src/cpca_mk_cmd.c	Wed Mar 15 15:33:26 2006
-@@ -586,6 +586,7 @@
-   Ptr             data ;
-   short           size ;
-   Ptr             work ;
-+  short          *swork ;
-   unsigned long   comSize = 0 ;
- 
-   if (p && str) {
-@@ -594,7 +595,9 @@
-     if (data) {
-       work = data ;
- 
--      *( ( short *)work )++ = id_val_code_set_Shift_JIS ;
-+	  swork = (short *)work ;
-+      *swork++ = id_val_code_set_Shift_JIS ;
-+	  work = (Ptr)swork ;
-       memcpy( work, str, (unsigned char)str[ 0 ] + 1 ) ;
-       comSize = glue_cpcaSetJob( p,
-                                  Attribute,
-@@ -867,6 +870,7 @@
-   short          size ;
-   Ptr            data ;
-   Ptr            work ;
-+  unsigned short *uswork ;
-   unsigned long  comSize = 0 ;
- 
-   if (p) {
-@@ -877,8 +881,10 @@
- 
-       *work++ = id_val_resolution_type_dpi ;
- 
--      *( ( unsigned short *)work )++ = resolutionX ;
--      *( ( unsigned short *)work )++ = resolutionY ;
-+	  uswork = (unsigned short *)work ;
-+      *uswork++ = resolutionX ;
-+      *uswork++ = resolutionY ;
-+      work = (Ptr)uswork ;
- 
-       comSize = glue_cpcaSetDocument ( p,
-                                        id_att_resolution,
-@@ -1597,6 +1603,8 @@
-   short                paramSize ;
-   unsigned long        userID ;
-   unsigned long        password ;
-+  cpcaHANDLE           *cpcaHANDLEp ;
-+  cpcaUBYTE            *cpcaUBYTEp ;
- 
- 
-   z_setUserInfo( userInfo, &userID, &password ) ;
-@@ -1616,9 +1624,14 @@
-   p += comSize ;
- 
-   /* ???????????????????? */
--  *( ( cpcaHANDLE *)p )++  = inParam->Object1 ;
--  *( ( cpcaUBYTE  *)p )++  = inParam->Mode ;
--  *( ( cpcaHANDLE *)p )++  = inParam->Object2 ;
-+  cpcaHANDLEp = (cpcaHANDLE *)p ;
-+  *cpcaHANDLEp++  = inParam->Object1 ;
-+  cpcaUBYTEp = (cpcaUBYTE *)cpcaHANDLEp ;
-+  *cpcaUBYTEp++  = inParam->Mode ;
-+  cpcaHANDLEp = (cpcaHANDLE *)cpcaUBYTEp ;
-+  *cpcaHANDLEp++  = inParam->Object2 ;
-+  p = (Ptr)cpcaHANDLEp ;
-+
-   comSize += 9;
- 
-   return comSize ;
-@@ -1644,7 +1657,7 @@
-   short             paramSize ;
-   unsigned long     userID ;
-   unsigned long     password ;
--
-+  cpcaATTRIB        *cpcaATTRIBp;
- 	
-   z_setUserInfo( userInfo, &userID, &password ) ;
-   paramSize = 2 + inParam->Size ;
-@@ -1661,7 +1674,9 @@
-   p += comSize ;
- 
-   /*  ???????????????????? */
--  *( ( cpcaATTRIB *)p )++  = inParam->Attribute ;
-+  cpcaATTRIBp = (cpcaATTRIB *)p ;
-+  *cpcaATTRIBp++  = inParam->Attribute ;
-+  p = (Ptr)cpcaATTRIBp ;
-   if ( inParam->Data && ( inParam->Size > 0 ) )
-   {
-     memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -1687,6 +1702,7 @@
-   short               paramSize ;
-   unsigned long       userID ;
-   unsigned long       password ;
-+  cpcaHANDLE          *cpcaHANDLEp ;
- 
-   z_setUserInfo( userInfo, &userID, &password ) ;
-   paramSize = sizeof( cpcaHANDLE ) ;
-@@ -1703,7 +1719,10 @@
-   p += comSize ;
- 
-   /*  ???????????????????? */
--  *( ( cpcaHANDLE *)p )++ = inParam->Object ;
-+  cpcaHANDLEp = (cpcaHANDLE *)p ;
-+  *cpcaHANDLEp++ = inParam->Object ;
-+  p = (Ptr)cpcaHANDLEp ;
-+
-   comSize += paramSize ;
- 
-   return comSize ;
-@@ -1723,6 +1742,7 @@
-   short             paramSize ;
-   unsigned long     userID ;
-   unsigned long     password ;
-+  cpcaATTRIB        *cpcaATTRIBp;
- 
-   z_setUserInfo( userInfo, &userID, &password ) ;
-   paramSize = sizeof( cpcaATTRIB ) + inParam->Size ;
-@@ -1739,7 +1759,9 @@
-   p += comSize ;
- 
-   /*  ???????????????????? */
--  *( ( cpcaATTRIB *)p )++ = inParam->Attribute ;
-+  cpcaATTRIBp = (cpcaATTRIB *)p; 
-+  *cpcaATTRIBp++ = inParam->Attribute ;
-+  p = (Ptr)cpcaATTRIBp ;
-   if ( inParam->Data && ( inParam->Size > 0 ) )
-   {
-     memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -1764,22 +1786,27 @@
-   short                 comSize ;
-   Ptr                   work ;
-   char                  BindName;
-+  unsigned char         *ucwork ;
- 
-   work = p ;
- 
-   /* ???????????????????? */
--  *( ( unsigned char *)work )++ = bindInfo;
-+  ucwork = (unsigned char *)work ;
-+  *ucwork++ = bindInfo;
-   /* ??????????????????????????????) */
--  *( ( unsigned char *)work )++ = bindNum ;
-+  *ucwork++ = bindNum ;
-   /* ???????????? */
-   /*  null?????????? */
-   BindName = 0;
-+  work = (Ptr)ucwork ;
- 
-   memcpy( ( StringPtr )work, &BindName, 1 ) ;
-   work += 1 ;
-   /* ?????????????????????? */
--  *( ( unsigned char *)work )++ = 0 ;
--  *( ( unsigned char *)work )++ = 0 ;
-+  ucwork = (unsigned char *)work ;
-+  *ucwork++ = 0 ;
-+  *ucwork++ = 0 ;
-+  work = (Ptr)ucwork ;
-   /* ???????????? */
-   comSize = work - p ;
- 
-@@ -1803,19 +1830,24 @@
-   Ptr                   work ;
-   char                  count;
-   char                  str_count;
-+  unsigned char         *ucwork ;
-+  unsigned short        *uswork ;
- 
-   work = p ;
-   count = 1;
-   str_count = 1;
- 
-   /* Type:???????????????????????? */
--  *( ( unsigned char *)work )++ = str_count;
-+  ucwork = (unsigned char *)work ;
-+  *ucwork++ = str_count;
-   /* Type:???????????????????????? */
--  *( ( unsigned char *)work )++ = id_val_finishing_type_staple_stitching;
-+  *ucwork++ = id_val_finishing_type_staple_stitching;
-   /* Count:???????????????????????? */
--  *( ( unsigned char *)work )++ = count ;
-+  *ucwork++ = count ;
-   /* Locate:???????????????????????? */
--  *( ( unsigned short *)work )++ = staple_val;
-+  uswork = (unsigned short *)ucwork ;
-+  *uswork++ = staple_val;
-+  work = (Ptr)uswork ;
-   /* ???????????? */
-   comSize = work - p ;
- 
-@@ -1839,6 +1871,7 @@
-   short          paramSize ;
-   unsigned long  userID ;
-   unsigned long  password ;
-+  cpcaHANDLE     *cpcaHANDLEp ;
- 
-   z_setUserInfo( userInfo, &userID, &password ) ;
-   paramSize = 4 ;
-@@ -1855,7 +1888,9 @@
-   p += comSize ;
- 
-   /* ???????????????????? */
--  *( ( cpcaHANDLE *)p )++ = inParam->Object ;
-+  cpcaHANDLEp = (cpcaHANDLE *)p ;
-+  *cpcaHANDLEp++ = inParam->Object ;
-+  p = (Ptr)cpcaHANDLEp ;
-   comSize += paramSize ;
- 
-   return comSize ;
-@@ -1876,7 +1911,7 @@
-   short           paramSize ;
-   unsigned long   userID ;
-   unsigned long   password ;
--
-+  cpcaATTRIB      *cpcaATTRIBp ;
- 
-   z_setUserInfo( userInfo, &userID, &password ) ;
-   paramSize = 2 + inParam->Size ;
-@@ -1893,7 +1928,9 @@
-   p += comSize ;
- 
-   /* ???????????????????? */
--  *( ( cpcaATTRIB *)p )++ = inParam->Attribute ;
-+  cpcaATTRIBp = (cpcaATTRIB *)p ;
-+  *cpcaATTRIBp++ = inParam->Attribute ;
-+  p = (Ptr)cpcaATTRIBp ;
-   if ( inParam->Data && ( inParam->Size > 0 ) )
-   {
-     memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -1918,6 +1955,8 @@
-   short           paramSize ;
-   unsigned long   userID ;
-   unsigned long   password ;
-+  cpcaHANDLE      *cpcaHANDLEp ;
-+  cpcaUSHORT      *cpcaUSHORTp ;
- 
-   z_setUserInfo( userInfo, &userID, &password ) ;
-   paramSize = 6 + inParam->Size ;
-@@ -1934,8 +1973,11 @@
-   p += comSize ;              
- 
-   /* ???????????????????? */
--  *( ( cpcaHANDLE *)p )++     = inParam->Object ;
--  *( ( cpcaUSHORT *)p )++     = inParam->Method ;
-+  cpcaHANDLEp = (cpcaHANDLE *)p ;
-+  *cpcaHANDLEp++     = inParam->Object ;
-+  cpcaUSHORTp = (cpcaUSHORT *)cpcaHANDLEp ;
-+  *cpcaUSHORTp++     = inParam->Method ;
-+  p = (Ptr)cpcaUSHORTp ;
-   if ( inParam->Data && ( inParam->Size > 0 ) )
-   {
-     memcpy( p, inParam->Data, inParam->Size ) ;
-@@ -2075,6 +2117,7 @@
-   short                 paramSize ;
-   unsigned long         userID ;
-   unsigned long         password ;
-+  cpcaUBYTE             *cpcaUBYTEp ;
- 
-   z_setUserInfo( userInfo, &userID, &password ) ;
-   paramSize = 1 ;
-@@ -2091,7 +2134,9 @@
-   p += comSize ;
- 
-   /* ???????????????????? */
--  *( ( cpcaUBYTE *)p )++ = inParam->Code ;
-+  cpcaUBYTEp = (cpcaUBYTE *)p ;
-+  *cpcaUBYTEp++ = inParam->Code ;
-+  p = (Ptr)cpcaUBYTEp ;
-   comSize += paramSize ;
- 
-   return comSize ;
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-gdevl256.c
@@ -0,0 +1,17 @@
+--- src/gdevl256.c.orig	Mon Jun  4 00:54:57 2007
++++ src/gdevl256.c	Mon Jun  4 01:13:56 2007
+@@ -143,9 +143,12 @@
+ /* for compatibility with the older display modes: */
+ /* these are indexed as 0.0.R0.G0.B0.R1.G1.B1. */
+ gx_color_index
+-lvga256_map_rgb_color(gx_device * dev, gx_color_value r, gx_color_value g,
+-		      gx_color_value b)
++lvga256_map_rgb_color(gx_device * dev, const gx_color_value cv[])
+ {
++	gx_color_value r = cv[0];
++	gx_color_value g = cv[1];
++	gx_color_value b = cv[2];
++
+ #define cv_bits(v,n) (v >> (gx_color_value_bits - n))
+     ushort r5 = cv_bits(r, 5), g5 = cv_bits(g, 5), b5 = cv_bits(b, 5);
+     static const byte cube_bits[32] =
--- print/ghostscript-gpl/files/patch-eplaser:gdevescv.c
+++ /dev/null
@@ -1,100 +0,0 @@
---- eplaser/gdevescv.c.orig	Mon May 17 14:25:19 2004
-+++ eplaser/gdevescv.c	Mon Aug  2 14:04:30 2004
-@@ -37,10 +37,6 @@
- 
-  */
- 
--#include 
--#include 
--#include 
--
- #include "math_.h"
- #include "gx.h"
- #include "gserrors.h"
-@@ -62,6 +58,10 @@
- #include "gspath.h"
- #include "gzpath.h"
- 
-+#include 
-+#include 
-+#include 
-+
- /* ---------------- Device definition ---------------- */
- 
- /* Device procedures */
-@@ -342,6 +342,16 @@
- };
- 
- /* Vector device implementation */
-+#if GS_VERSION_MAJOR >= 8
-+private int escv_beginpage(gx_device_vector * vdev);
-+private int escv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int escv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int escv_setdash(gx_device_vector * vdev, const float *pattern, 
-+			      uint count, floatp offset);
-+private int escv_setflat(gx_device_vector * vdev, floatp flatness);
-+private int escv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, 
-+			       gs_logical_operation_t diff);
-+#else
- private int escv_beginpage(P1(gx_device_vector * vdev));
- private int escv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
- private int escv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-@@ -350,10 +360,25 @@
- private int escv_setflat(P2(gx_device_vector * vdev, floatp flatness));
- private int escv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
- 			       gs_logical_operation_t diff));
-+#endif
- private int escv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
- 			       fixed y1, gx_path_type_t type);
- private int escv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
- 			       gx_path_type_t type);
-+#if GS_VERSION_MAJOR >= 8
-+private int escv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int escv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+			   floatp x, floatp y, gx_path_type_t type);
-+private int escv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
-+			   floatp x, floatp y, gx_path_type_t type);
-+private int escv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+			       floatp x1, floatp y1, floatp x2, floatp y2,
-+			       floatp x3, floatp y3, gx_path_type_t type);
-+private int escv_closepath(gx_device_vector * vdev, floatp x, floatp y,
-+				floatp x_start, floatp y_start, gx_path_type_t type);
-+
-+private int escv_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#else
- private int escv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
- private int escv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
- 			   floatp x, floatp y, gx_path_type_t type));
-@@ -366,6 +391,7 @@
- 				floatp x_start, floatp y_start, gx_path_type_t type));
- 
- private int escv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+#endif
- private int escv_setlinewidth(gx_device_vector * vdev, floatp width);
- private int escv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int escv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -1578,7 +1604,7 @@
-             pdev->MaskState = 1;
-         }
- 	color_set_pure(&color, one);
--	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
-+	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
- 
- 	/* ?????????????????????????????????????? */
-     }
-@@ -1671,13 +1697,13 @@
- 		 gs_logical_operation_t lop, const gx_clip_path * pcpath)
- {
-     gx_device_vector const	*vdev = (gx_device_vector *) dev;
--    gx_device_escv const	*pdev = (gx_device_escv *) dev;
-+    gx_device_escv		*pdev = (gx_device_escv *) dev;
-     stream			*s = gdev_vector_stream(vdev);
- 
-     if (w <= 0 || h <= 0) return 0;
-     
-     if (depth > 1 ||
--	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- 	gdev_vector_update_log_op(vdev, lop) < 0
- 	) 
--- print/ghostscript-gpl/files/patch-src-dmp_site.ps
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/dmp_site.ps.orig	Tue May 27 09:57:00 1997
-+++ src/dmp_site.ps	Tue Apr  2 23:05:45 2002
-@@ -1,6 +1,6 @@
- BeginConfig
- %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
--/printer      (epsimage.src)
-+/printer      (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
- %               horizontal / vertical
- % /resolution   [ 160.0 180.0 ]
- %               horizontal / vertical
--- print/ghostscript-gpl/files/patch-alps__gdevalps.c
+++ /dev/null
@@ -1,22 +0,0 @@
---- alps/gdevalps.c.orig	Wed Nov 24 09:28:35 1999
-+++ alps/gdevalps.c	Fri Dec 17 19:12:35 2004
-@@ -173,7 +173,7 @@
- {
-   int lnum;
-   int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev);
--  byte *data = (byte *)gs_malloc(8, line_size, "md50_print_page(data)" );
-+  byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md50_print_page(data)" );
-   int skipping = 0;
-   int nbyte;
-   int nskip;
-@@ -232,8 +232,8 @@
- {
-   int lnum;
-   int line_size = gdev_mem_bytes_per_scan_line((gx_device *)pdev);
--  byte *data = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)");
--  byte *out_start = (byte *)gs_malloc(8, line_size, "md1xm_print_page(data)");
-+  byte *data = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)");
-+  byte *out_start = (byte *)gs_malloc(pdev->memory, 8, line_size, "md1xm_print_page(data)");
-   int skipping = 0;
-   int nbyte;
- 
--- /dev/null
+++ print/ghostscript-gpl/files/patch-lib-FAPIconfig
@@ -0,0 +1,21 @@
+--- lib/FAPIconfig.orig	2008-03-04 06:50:24.000000000 +0900
++++ lib/FAPIconfig	2008-03-04 06:51:30.000000000 +0900
+@@ -2,10 +2,14 @@
+ % $Id: FAPIconfig 6870 2006-06-20 16:31:15Z leonardo $
+ % This is configuration file for FAPI client.
+ 
+-/FontPath             (/Fonts)     % A default directory for FAPI-handled font files path in FAPIfontmap.
+-/CIDFontPath          (/CIDFonts)  % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
+-/HookDiskFonts        [1 2 9 11 42]  % FontType values for disk PS fonts to be redirected to FAPI.
+-/HookEmbeddedFonts    [1 2 9 11 42]  % FontType values for embedded PS fonts to be redirected to FAPI.
++%/FontPath             (/Fonts)     % A default directory for FAPI-handled font files path in FAPIfontmap.
++/FontPath             ()     % A default directory for FAPI-handled font files path in FAPIfontmap.
++%/CIDFontPath          (/CIDFonts)  % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
++/CIDFontPath          ()  % A default directory for FAPI-handled CID font files path in FAPIcidfmap.
++%/HookDiskFonts        [1 2 9 11 42]  % FontType values for disk PS fonts to be redirected to FAPI.
++/HookDiskFonts        [] % FontType values for disk PS fonts to be redirected to FAPI.
++%/HookEmbeddedFonts    [1 2 9 11 42]  % FontType values for embedded PS fonts to be redirected to FAPI.
++/HookEmbeddedFonts    []  % FontType values for embedded PS fonts to be redirected to FAPI.
+ 
+ % Values allowed for HookDiskFonts and HookEmbeddedFonts are 1, 2, 9, 11, 42.
+ % "Disk fonts" are fonts being installed to Ghostscript with 'lib/Fontmap' or with GS_FONTPATH,
--- print/ghostscript-gpl/files/patch-lips:gdevlips.mak
+++ /dev/null
@@ -1,59 +0,0 @@
---- lips/gdevlips.mak.orig	Thu Nov  2 12:12:13 2000
-+++ lips/gdevlips.mak	Sat Sep 27 22:16:20 2003
-@@ -1,17 +1,19 @@
- # ---------------- Laser Printer devices ---------------- #
- # $Id: gdevlips.mak $
- 
-+lips_opts=-DGS_VERSION_MAJOR=$(GS_VERSION_MAJOR)
-+
- $(GLOBJ)gdevlprn.$(OBJ): $(GLSRC)gdevlprn.c $(GLSRC)gdevlprn.h\
-  $(gdevprn_h) $(PDEVH)
--	$(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(GLSRC)gdevlprn.c
-+	$(GLCC) $(GLO_)gdevlprn.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlprn.c
- 
- ### --- The Canon LIPS II+/III/IVc/IV printer device --- ###
- 
- lipsr_=$(GLOBJ)gdevl4r.$(OBJ) $(GLOBJ)gdevlips.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
- $(GLOBJ)gdevl4r.$(OBJ): $(GLSRC)gdevl4r.c $(GLSRC)gdevlips.h $(PDEVH)
--	$(GLCC) -DA4 $(GLO_)gdevl4r.$(OBJ) $(C_) $(GLSRC)gdevl4r.c
-+	$(GLCC) -DA4 $(GLO_)gdevl4r.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevl4r.c
- $(GLOBJ)gdevlips.$(OBJ): $(GLSRC)gdevlips.c
--	$(GLCC) $(GLO_)gdevlips.$(OBJ) $(C_) $(GLSRC)gdevlips.c
-+	$(GLCC) $(GLO_)gdevlips.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevlips.c
- $(DD)lips2p.dev: $(lipsr_) $(DD)page.dev
- 	$(SETPDEV) $(DD)lips2p $(lipsr_)
- $(DD)lips3.dev: $(lipsr_) $(DD)page.dev
-@@ -29,13 +31,13 @@
- $(GLOBJ)gdevl4v.$(OBJ): $(GLSRC)gdevl4v.c $(GLSRC)gdevlips.h $(GDEV) $(math__h)\
-  $(gscspace_h) $(gsutil_h) $(gsparam_h) $(gsmatrix_h) $(gdevvec_h)\
-  $(ghost_h) $(gzstate_h) $(igstate_h)
--	$(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(C_) $(GLSRC)gdevl4v.c
-+	$(GLCC) -DA4 $(GLO_)gdevl4v.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevl4v.c
- 
- ### ------- Epson ESC/Page printer device ----------------- ###
- 
- escpage_=$(GLOBJ)gdevespg.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
- $(GLOBJ)gdevespg.$(OBJ): $(GLSRC)gdevespg.c $(GLSRC)gdevlprn.h $(PDEVH)
--	$(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(C_) $(GLSRC)gdevespg.c
-+	$(GLCC) -DA4 $(GLO_)gdevespg.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevespg.c
- 
- $(GLOBJ)escpage.dev: $(escpage_) $(DD)page.dev
- 	$(SETPDEV) $(DD)escpage $(escpage_)
-@@ -47,7 +49,7 @@
- 
- npdl_=$(GLOBJ)gdevnpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
- $(GLOBJ)gdevnpdl.$(OBJ): $(GLSRC)gdevnpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
--	$(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(GLSRC)gdevnpdl.c
-+	$(GLCC) -DA4 $(GLO_)gdevnpdl.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevnpdl.c
- 
- $(GLOBJ)npdl.dev: $(npdl_) $(DD)page.dev
- 	$(SETPDEV) $(DD)npdl $(npdl_)
-@@ -56,7 +58,7 @@
- 
- rpdl_=$(GLOBJ)gdevrpdl.$(OBJ) $(GLOBJ)gdevlprn.$(OBJ)
- $(GLOBJ)gdevrpdl.$(OBJ): $(GLSRC)gdevrpdl.c $(GLSRC)gdevlprn.h $(PDEVH)
--	$(GLCC) -DA4 $(GLO_)gdevrpdl.$(OBJ) $(C_) $(GLSRC)gdevrpdl.c
-+	$(GLCC) -DA4 $(GLO_)gdevrpdl.$(OBJ) $(C_) $(lips_opts) $(GLSRC)gdevrpdl.c
- 
- $(GLOBJ)rpdl.dev: $(rpdl_) $(DD)page.dev
- 	$(SETPDEV) $(DD)rpdl $(rpdl_)
--- print/ghostscript-gpl/files/patch-lib:gs_init.ps
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/gs_init.ps.orig	Sat Mar  5 07:02:23 2005
-+++ lib/gs_init.ps	Thu Apr 21 13:05:43 2005
-@@ -1440,7 +1440,7 @@
- % Set the default screen and BG/UCR.
- /.setdefaultbgucr {
-   systemdict /setblackgeneration known {
--    { pop 0 } dup setblackgeneration setundercolorremoval
-+    {} dup setblackgeneration setundercolorremoval
-   } if
- } bind def
- /.useloresscreen {	% - .useloresscreen 
-@@ -2241,3 +2241,7 @@
- ifelse
- 
- % The interpreter will run the initial procedure (start).
-+
-+% unofficial patch:
-+% make it possible to print from within acroread pdf viewer
-+/Default currenthalftone /Halftone defineresource pop
--- print/ghostscript-gpl/files/patch-gdev10v:gdev10v.mak
+++ /dev/null
@@ -1,22 +0,0 @@
---- gdev10v/gdev10v.mak.orig	Thu Oct 12 11:17:50 2000
-+++ gdev10v/gdev10v.mak	Thu Oct 12 11:21:12 2000
-@@ -1,12 +1,13 @@
- ### ----------------- The Canon BubbleJet BJ10v device ----------------- ###
- 
--bj10v_=gdev10v.$(OBJ) gdevprn.$(OBJ)
--bj10v.dev: $(bj10v_)
--	$(SHP)gssetdev bj10v $(bj10v_)
--bj10vh.dev: $(bj10v_)
--	$(SHP)gssetdev bj10vh $(bj10v_)
-+bj10v_=$(GLOBJ)gdev10v.$(OBJ) $(GLOBJ)gdevprn.$(OBJ)
-+$(DD)bj10v.dev: $(bj10v_) $(DD)page.dev
-+	$(SETPDEV) $(DD)bj10v $(bj10v_)
-+$(DD)bj10vh.dev: $(bj10v_) $(DD)page.dev
-+	$(SETPDEV) $(DD)bj10vh $(bj10v_)
- 
- # Uncomment the following line if you are using MS-DOS on PC9801 series.
- 
--gdev10v.$(OBJ): gdevbj10.c $(PDEVH)
-+$(GLOBJ)gdev10v.$(OBJ): $(GLSRC)gdevbj10.c $(PDEVH)
-+	$(GLCC) $(GLO_)gdev10v.$(OBJ) $(C_) $(GLSRC)gdev10v.c
- #	$(CCC) -DPC9801 gdev10v.c
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-Makefile.in
@@ -0,0 +1,75 @@
+--- src/Makefile.in.orig	2008-06-22 15:43:28.000000000 +0900
++++ src/Makefile.in	2008-11-03 00:09:12.000000000 +0900
+@@ -46,9 +46,8 @@
+ # the directories also define the default search path for the
+ # initialization files (gs_*.ps) and the fonts.
+ 
+-INSTALL = $(GLSRCDIR)/instcopy -c
+-INSTALL_PROGRAM = $(INSTALL) -m 755
+-INSTALL_DATA = $(INSTALL) -m 644
++INSTALL_PROGRAM = ${BSD_INSTALL_SCRIPT}
++INSTALL_DATA = ${BSD_INSTALL_DATA}
+ INSTALL_SHARED = @INSTALL_SHARED@
+ 
+ prefix = @prefix@
+@@ -164,7 +163,7 @@
+ # some older JPEG streams that violate the standard. If the JPEG
+ # library built from local sources, the patch will be applied.
+ 
+-SHARE_JPEG=@SHARE_LIBJPEG@
++SHARE_JPEG=1
+ JPEG_NAME=jpeg
+ 
+ # Define the directory where the PNG library sources are stored,
+@@ -172,14 +171,14 @@
+ # You may need to change this if the libpng version changes.
+ # See libpng.mak for more information.
+ 
+-SHARE_LIBPNG=@SHARE_LIBPNG@
++SHARE_LIBPNG=1
+ PNGSRCDIR=@LIBPNGDIR@
+ LIBPNG_NAME=png
+ 
+ # Define the directory where the zlib sources are stored.
+ # See zlib.mak for more information.
+ 
+-SHARE_ZLIB=@SHARE_ZLIB@
++SHARE_ZLIB=1
+ ZSRCDIR=@ZLIBDIR@
+ #ZLIB_NAME=gz
+ ZLIB_NAME=z
+@@ -250,7 +249,7 @@
+ # Define the added flags for standard, debugging, profiling 
+ # and shared object builds.
+ 
+-CFLAGS_STANDARD=@OPT_CFLAGS@
++CFLAGS_STANDARD?=@OPT_CFLAGS@
+ CFLAGS_DEBUG=-g -O0
+ CFLAGS_PROFILE=-pg @OPT_CFLAGS@
+ CFLAGS_SO=@DYNAMIC_CFLAGS@
+@@ -295,7 +294,7 @@
+ # Solaris may need -lnsl -lsocket -lposix4.
+ # (Libraries required by individual drivers are handled automatically.)
+ 
+-EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@
++EXTRALIBS=@LIBS@ @DYNAMIC_LIBS@ @FONTCONFIG_LIBS@ -Wl,-export-dynamic
+ 
+ # Define the standard libraries to search at the end of linking.
+ # Most platforms require -lpthread for the POSIX threads library;
+@@ -339,7 +338,7 @@
+ # the pthread library. Otherwise use SYNC=nosync
+ #SYNC=posync
+ #SYNC=nosync
+-SYNC=@SYNC@
++SYNC=posync
+ 
+ # programs we use
+ RM=rm -f
+@@ -498,6 +497,7 @@
+ # ---------------- End of platform-specific section ---------------- #
+ 
+ INSTALL_CONTRIB=@INSTALL_CONTRIB@
++include $(GLSRCDIR)/drivers.mak
+ include $(GLSRCDIR)/unixhead.mak
+ include $(GLSRCDIR)/gs.mak
+ # psromfs.mak must precede lib.mak
Index: patch-src__gdevperm.c
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-src__gdevperm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -L print/ghostscript-gpl/files/patch-src__gdevperm.c -L print/ghostscript-gpl/files/patch-src__gdevperm.c -u -r1.1 -r1.2
--- print/ghostscript-gpl/files/patch-src__gdevperm.c
+++ print/ghostscript-gpl/files/patch-src__gdevperm.c
@@ -1,9 +1,9 @@
---- src/gdevperm.c.orig	Fri Jun 18 16:00:47 2004
-+++ src/gdevperm.c	Fri Dec 31 18:06:42 2004
-@@ -289,7 +289,7 @@
+--- src/gdevperm.c.orig	Tue Sep 25 22:31:24 2007
++++ src/gdevperm.c	Sat Nov 24 15:11:12 2007
+@@ -286,7 +286,7 @@
  	(strncmp((const char *)name, (const char *)str, name_size) == 0))
  
- private int
+ static int
 -perm_get_color_comp_index(const gx_device *pdev, const char *pname,
 +perm_get_color_comp_index(gx_device *pdev, const char *pname,
  					int name_size, int component_type)
--- print/ghostscript-gpl/files/lx5000.contrib.mak
+++ /dev/null
@@ -1,11 +0,0 @@
-### ----------------- LexMark 5000 printer ----------------------------- ###
-### Note: this driver was contributed by users.  Please contact:         ###
-###   Peter B. West                                    ###
-
-lx5000_=$(GLOBJ)gdevlx50.$(OBJ)
-$(DD)lx5000.dev:    $(lx5000_)
-	$(SETPDEV) $(DD)lx5000 $(lx5000_)
-
-$(GLOBJ)gdevlx50.$(OBJ): $(GLSRC)gdevlx50.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevlx50.$(OBJ) $(C_) $(GLSRC)gdevlx50.c
-
--- print/ghostscript-gpl/files/gdevhl12-hl1250.mak
+++ /dev/null
@@ -1,16 +0,0 @@
-### -------------------- The Brother HL-1250 printer -------------------- ###
-### This printer is ljet4-compatible, plus support for source tray        ###
-### selection and special 1200x600 dpi mode.                              ###
-
-hl1250_=$(GLOBJ)gdevhl12.$(OBJ) $(HPDLJM)
-$(DD)hl1250.dev : $(hl1250_) $(DD)page.dev
-	$(SETPDEV) $(DD)hl1250 $(hl1250_)
-
-$(DD)hl1240.dev : $(hl1250_) $(DD)page.dev
-	$(SETPDEV) $(DD)hl1240 $(hl1250_)
-
-# Author: Marek Michalkiewicz 
-# Printer: Brother HL-1250 (may work with some other models too)
-$(GLOBJ)gdevhl12.$(OBJ) : $(GLSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h)
-	$(GLCC) $(GLO_)gdevhl12.$(OBJ) $(C_) $(GLSRC)gdevhl12.c
-
--- /dev/null
+++ print/ghostscript-gpl/files/Makefile.pcl3
@@ -0,0 +1,37 @@
+# $FreeBSD: ports/print/ghostscript8/files/Makefile.pcl3,v 1.1 2008/05/05 13:16:25 hrs Exp $
+
+PORTDOCS+=	pcl3
+PORTDOC_FILES+= pcl3/NEWS pcl3/BUGS pcl3/README pcl3/gs-pcl3.html	\
+	pcl3/how-to-report.txt pcl3/pcl3opts.html
+
+MAN1+=	gs-pcl3.1 pcl3opts.1
+
+post-build-pcl3:
+	cd ${WRKSRC} && \
+		${CC} ${CFLAGS} -I./obj -I./soobj -I./src \
+		-I./contrib/pcl3/eprn -o bin/pcl3opts \
+		contrib/pcl3/src/pcl3opts.c contrib/pcl3/src/pclscan.c \
+		contrib/pcl3/eprn/mediasize.c contrib/pcl3/src/pclsize.c
+
+post-install-pcl3:
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcl3opts ${PREFIX}/bin
+	${MKDIR} ${DATADIR}/${PORTVERSION}/pcl3
+	cd ${WRKSRC}/contrib/pcl3 && \
+		${INSTALL_DATA} lib/example.mcf lib/if-pcl3		\
+			ps/calign.ps ps/dumppdd.ps ps/levels-test.ps	\
+			ps/margins-A4.ps ps/margins-A4Rotated.ps	\
+			ps/margins-Env10Rotated.ps			\
+			ps/margins-EnvDLRotated.ps			\
+			ps/margins-Letter.ps				\
+			ps/margins-LetterRotated.ps			\
+			${DATADIR}/${PORTVERSION}/pcl3
+	cd ${WRKSRC}/contrib/pcl3/doc && \
+		${INSTALL_MAN} gs-pcl3.1 pcl3opts.1 ${MANPREFIX}/man/man1
+
+post-install-docs-pcl3:
+	${MKDIR} ${WRKSRC}/contrib/pcl3
+	${INSTALL_DATA} ${WRKSRC}/contrib/pcl3/doc/* ${WRKSRC}/contrib/pcl3
+
+post-build: post-build-pcl3
+post-install: post-install-pcl3
+post-install-docs: post-install-docs-pcl3
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-gdevvglb.c
@@ -0,0 +1,19 @@
+--- src/gdevvglb.c.orig	Tue Sep 25 22:31:24 2007
++++ src/gdevvglb.c	Sat Nov 24 23:00:49 2007
+@@ -149,10 +149,13 @@
+ }
+ 
+ static gx_color_index
+-vgalib_map_rgb_color(gx_device * dev, gx_color_value red,
+-		     gx_color_value green, gx_color_value blue)
++vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[])
+ {
+-    return pc_4bit_map_rgb_color(dev, red, green, blue);
++	gx_color_value r = cv[0];
++	gx_color_value g = cv[1];
++	gx_color_value b = cv[2];
++
++    return pc_4bit_map_rgb_color(dev, cv);
+ }
+ 
+ static int
--- /dev/null
+++ print/ghostscript-gpl/files/Makefile.epag
@@ -0,0 +1,23 @@
+# $FreeBSD: ports/print/ghostscript8/files/Makefile.epag,v 1.1 2008/05/05 13:16:25 hrs Exp $
+
+# EPAG - additional driver for Epson ESC/Page printers
+# http://www.humblesoft.com/gdevepag.html
+
+PORTDOCS+=	epag
+PORTDOC_FILES+= epag/ert.txt epag/gdevepag.txt epag/ChangeLog	\
+	epag/psprint epag/gsepagif.sh
+
+pre-build-epag:
+	${LN} -s -f ${WRKSRC}/${EPAG_NAME}/gdevepag.c ${WRKSRC}/src
+
+post-build-epag:
+	cd ${WRKSRC}/${EPAG_NAME} && \
+		${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} Makefile
+
+post-install-docs-epag:
+	${MKDIR} ${WRKSRC}/contrib/epag
+	${INSTALL_DATA} ${WRKSRC}/${EPAG_NAME}/* ${WRKSRC}/contrib/epag
+
+pre-build: pre-build-epag
+post-build: post-build-epag
+post-install-docs: post-install-docs-epag
--- print/ghostscript-gpl/files/patch-lxm3200:gdevlx32.c
+++ /dev/null
@@ -1,55 +0,0 @@
---- lxm3200/gdevlx32.c.orig	Wed Apr 23 01:06:20 2003
-+++ lxm3200/gdevlx32.c	Thu May 26 00:11:50 2005
-@@ -422,9 +422,11 @@
-  * of the nearest color.
-  */
- private gx_color_index
--lxm3200_map_rgb_color(gx_device *dev,	gx_color_value r, 
--											gx_color_value g, gx_color_value b)
-+lxm3200_map_rgb_color(gx_device *dev,	const gx_color_value cv[]) 
- {
-+	gx_color_value r = cv[0];
-+	gx_color_value g = cv[1];
-+	gx_color_value b = cv[2];
- 	gx_color_index col;
- 	int c, m, y;
- 
-@@ -479,7 +481,7 @@
- 			break;
- 
- 		default:
--			col = gdev_prn_map_rgb_color(dev, r, g, b);
-+			col = gdev_prn_map_rgb_color(dev, cv);
- 			break;
- 	}
- 
-@@ -732,10 +734,10 @@
- 	/* Allocate memory for the buffers and
- 	 * verify that the allocation was done properly.
- 	 */
--	gendata.scanbuf = (byte *)gs_malloc(gendata.numbytes, gendata.numblines, 
-+	gendata.scanbuf = (byte *)gs_malloc(pdev->memory, gendata.numbytes, gendata.numblines, 
- 																			"lxm3200_print_page(scanbuf)");
- 
--	gendata.outdata = (byte *)gs_malloc(gendata.numbytes, 30, 
-+	gendata.outdata = (byte *)gs_malloc(pdev->memory, gendata.numbytes, 30, 
- 																			"lxm3200_print_page(outdata)");
-  
- 	if(gendata.scanbuf == NULL || 
-@@ -943,12 +945,14 @@
- private void
- freeresources(void)
- {
-+	gx_device *pdev;
-+
- 	if(gendata.scanbuf)
--		gs_free((char *)gendata.scanbuf, gendata.numbytes, gendata.numblines,
-+		gs_free(pdev->memory, (char *)gendata.scanbuf, gendata.numbytes, gendata.numblines,
- 						"lxm3200:freeresources(scanbuf)");
- 
- 	if(gendata.outdata)
--		gs_free((char *)gendata.outdata, gendata.numbytes, 30, 
-+		gs_free(pdev->memory, (char *)gendata.outdata, gendata.numbytes, 30, 
- 						"lxm3200:freeresources(outdata)");
- }
- 
--- print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.h
+++ /dev/null
@@ -1,93 +0,0 @@
---- bjc250/src/gdevbjc_.h.orig	Fri Nov  8 06:15:15 2002
-+++ bjc250/src/gdevbjc_.h	Fri Nov  8 07:44:18 2002
-@@ -183,48 +183,48 @@
- 
- /* Put a BJL command to stream */
- 
--void bjc_put_bjl_command(P2(FILE * file, int bjl_command));
-+void bjc_put_bjl_command(FILE * file, int bjl_command);
- 
--void bjc_put_LF(P1(FILE *file));
--void bjc_put_FF(P1(FILE *file));
--void bjc_put_CR(P1(FILE *file));
--void bjc_put_initialize(P1(FILE *file));
--void bjc_put_set_initial(P1(FILE *file));
--void bjc_put_set_compression(P2(FILE *file, char compression));
--void bjc_put_print_method_short(P2(FILE *file, char color));
--void bjc_put_print_method(P5(FILE *file, char color, char media, char quality, char density));
--void bjc_put_raster_resolution(P3(FILE *file, int x_resolution, int y_resolution));
--void bjc_put_raster_skip(P2(FILE *file, int skip));
--void bjc_put_page_margins(P5(FILE *file, int length, int lm, int rm, int top));
--void bjc_put_media_supply(P3(FILE *file, char supply, char type));
--void bjc_put_cmyk_image(P4(FILE *file, char component, const char *data, int count));
--void bjc_put_move_lines(P2(FILE *file, int lines));
--void bjc_put_move_lines_unit(P2(FILE *file, int unit));
--void bjc_put_extended_margins(P5(FILE *file, int length, int lm, int rm, int top));
--void bjc_put_image_format(P4(FILE *file, char depth, char format, char ink));
--void bjc_put_page_id(P2(FILE *file, int id));
--void bjc_put_continue_image(P3(FILE *file, const char *data, int count));
--void bjc_put_indexed_image(P4(FILE *file, int dot_rows, int dot_cols, int layers));
--
--bool bjc_invert_bytes(P4(byte *row, uint raster, bool inverse, byte lastmask));
--bool bjc_invert_cmyk_bytes(P8(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster,
--                              bool inverse, byte lastmask, skip_t *skip));
--uint bjc_compress(P3(const byte *row, uint raster, byte *compressed));
--
--int  FloydSteinbergInitG(P1(gx_device_printer * pdev));
--void FloydSteinbergDitheringG(P5(byte *row, byte *dithered, uint width, uint raster, bool limit_extr));
--void FloydSteinbergCloseG(P1(gx_device_printer *pdev));
--
--int  FloydSteinbergForwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask));
--int  FloydSteinbergBckwardCut(P5(int error, int *Errors, int i, byte *dithered, byte bitmask));
--int  FloydSteinbergInitC(P1(gx_device_printer * pdev));
--void FloydSteinbergDitheringC(P6(byte *row, byte *dithered, uint width, uint raster,
--                                 bool limit_extr, bool composeK));
--void FloydSteinbergCloseC(P1(gx_device_printer *pdev));
--
--void bjc_build_gamma_table(P2(float gamma, char color));
--void bjc_rgb_to_cmy (P6(byte r, byte g, byte b, int *c, int *m, int *y));
--void bjc_rgb_to_gray(P4(byte r, byte g, byte b, int *k));
-+void bjc_put_LF(FILE *file);
-+void bjc_put_FF(FILE *file);
-+void bjc_put_CR(FILE *file);
-+void bjc_put_initialize(FILE *file);
-+void bjc_put_set_initial(FILE *file);
-+void bjc_put_set_compression(FILE *file, char compression);
-+void bjc_put_print_method_short(FILE *file, char color);
-+void bjc_put_print_method(FILE *file, char color, char media, char quality, char density);
-+void bjc_put_raster_resolution(FILE *file, int x_resolution, int y_resolution);
-+void bjc_put_raster_skip(FILE *file, int skip);
-+void bjc_put_page_margins(FILE *file, int length, int lm, int rm, int top);
-+void bjc_put_media_supply(FILE *file, char supply, char type);
-+void bjc_put_cmyk_image(FILE *file, char component, const char *data, int count);
-+void bjc_put_move_lines(FILE *file, int lines);
-+void bjc_put_move_lines_unit(FILE *file, int unit);
-+void bjc_put_extended_margins(FILE *file, int length, int lm, int rm, int top);
-+void bjc_put_image_format(FILE *file, char depth, char format, char ink);
-+void bjc_put_page_id(FILE *file, int id);
-+void bjc_put_continue_image(FILE *file, const char *data, int count);
-+void bjc_put_indexed_image(FILE *file, int dot_rows, int dot_cols, int layers);
-+
-+bool bjc_invert_bytes(byte *row, uint raster, bool inverse, byte lastmask);
-+bool bjc_invert_cmyk_bytes(byte *rowC,byte *rowM, byte *rowY, byte *rowK, uint raster,
-+                              bool inverse, byte lastmask, skip_t *skip);
-+uint bjc_compress(const byte *row, uint raster, byte *compressed);
-+
-+int  FloydSteinbergInitG(gx_device_printer * pdev);
-+void FloydSteinbergDitheringG(byte *row, byte *dithered, uint width, uint raster, bool limit_extr);
-+void FloydSteinbergCloseG(gx_device_printer *pdev);
-+
-+int  FloydSteinbergForwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask);
-+int  FloydSteinbergBckwardCut(int error, int *Errors, int i, byte *dithered, byte bitmask);
-+int  FloydSteinbergInitC(gx_device_printer * pdev);
-+void FloydSteinbergDitheringC(byte *row, byte *dithered, uint width, uint raster,
-+                                 bool limit_extr, bool composeK);
-+void FloydSteinbergCloseC(gx_device_printer *pdev);
-+
-+void bjc_build_gamma_table(float gamma, char color);
-+void bjc_rgb_to_cmy (byte r, byte g, byte b, int *c, int *m, int *y);
-+void bjc_rgb_to_gray(byte r, byte g, byte b, int *k);
- uint bjc_rand(void);
--void bjc_init_tresh(P1(int rnd));
-+void bjc_init_tresh(int rnd);
- #endif				/* gdevbjc_INCLUDED */
--- print/ghostscript-gpl/files/patch-lib::cidfmap
+++ /dev/null
@@ -1,41 +0,0 @@
---- lib/cidfmap.orig	Fri Feb  7 09:31:11 2003
-+++ lib/cidfmap	Sun Jun 13 23:58:08 2004
-@@ -26,3 +26,38 @@
- %   /ShinGo-Bold   /HeiseiKakuGo-W5 ;
- %   /Ryumin-Medium << /FileType /TrueType /Path (H:/AuxFiles/Fonts/BATANG.TTC) /SubfontID 3 /CSI [(Japan1) 2] >> ;
- %
-+/Ryumin-Light <<
-+/FileType /TrueType
-+/Path (kochi-mincho-subst.ttf)
-+/SubfontID 0
-+/CSI [(Japan1) 3]
-+>> ;
-+
-+/GothicBBB-Medium <<
-+/FileType /TrueType
-+/Path (kochi-gothic-subst.ttf)
-+/SubfontID 0
-+/CSI [(Japan1) 3]
-+>> ;
-+
-+/HeiseiMin-W3		/Ryumin-Light ;
-+%/HeiseiMin-W3		/WadaMin-Regular ;
-+/HeiseiKakuGo-W5	/GothicBBB-Medium ;
-+%/HeiseiKakuGo-W5	/WadaGo-Bold ;
-+/FutoMinA101-Bold	/Ryumin-Light ;
-+%/FutoMinA101-Bold	/WadaMin-Regular ;
-+/FutoGoB101-Bold	/GothicBBB-Medium ;
-+%/FutoGoB101-Bold	/WadaGo-Bold ;
-+/Jun101-Light		/Ryumin-Light ;
-+%/Jun101-Light		/WadaMin-Regular ;
-+/MidashiGo-MB31		/GothicBBB-Medium ;
-+%/MidashiGo-MB31	/WadaGo-Bold ;
-+
-+%/Munhwa-Regular	/Munhwa-Regular ;
-+%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
-+%/Munhwa-Bold		/Munhwa-Bold ;
-+%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
-+
-+/HYGoThic-Medium	/MunhwaGothic-Regular ;
-+/HYSMyeongJo-Medium	/Munhwa-Regular ;
-+/HYRGoThic-Medium	/MunhwaGothic-Bold ;
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-unixinst.mak
@@ -0,0 +1,11 @@
+--- src/unixinst.mak.orig	2007-08-15 05:48:29.000000000 +0900
++++ src/unixinst.mak	2008-05-05 16:48:06.000000000 +0900
+@@ -128,7 +128,7 @@
+ 	done'
+ 
+ # install the man pages for each locale
+-MAN_LCDIRS=. de
++MAN_LCDIRS=.
+ MAN1_LINKS_PS2PS=eps2eps
+ MAN1_LINKS_PS2PDF=ps2pdf12 ps2pdf13
+ MAN1_LINKS_GSLP=gsbj gsdj gsdj500 gslj
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src__zicc.c
@@ -0,0 +1,12 @@
+--- src/zicc.c
++++ src/zicc.c	2008-02-05 16:11:59.000000000 +0000
+@@ -77,6 +77,9 @@ zseticcspace(i_ctx_t * i_ctx_p)
+     dict_find_string(op, "N", &pnval);
+     ncomps = pnval->value.intval;
+ 
++    if (2*ncomps > sizeof(range_buff)/sizeof(float))
++	return_error(e_rangecheck);
++
+     /* verify the DataSource entry */
+     if (dict_find_string(op, "DataSource", &pstrmval) <= 0)
+         return_error(e_undefined);
--- /dev/null
+++ print/ghostscript-gpl/files/patch-contrib__japanese__dmp_site.ps
@@ -0,0 +1,11 @@
+--- contrib/japanese/dmp_site.ps.orig	Wed Nov 29 20:56:17 2006
++++ contrib/japanese/dmp_site.ps	Sun May 13 21:06:03 2007
+@@ -1,7 +1,7 @@
+ %!
+ BeginConfig
+ %%%%%%%%%%%%%%%%%%%%%% Standard user cusomizations %%%%%%%%%%%%%%%%%%%%%
+-/printer      (escp_24.src)
++/printer      (%%DATADIR%%/%%GS_VERSION%%/lib/escp_24.src)
+ %               horizontal / vertical
+ % /resolution   [ 180.0 180.0 ]
+ %               horizontal / vertical
--- print/ghostscript-gpl/files/patch-lips:gdevl4v.c
+++ /dev/null
@@ -1,173 +0,0 @@
---- lips/gdevl4v.c.orig	Thu Nov  2 05:09:18 2000
-+++ lips/gdevl4v.c	Sun Jun 11 15:57:43 2006
-@@ -230,41 +230,67 @@
- };
- 
- /* Vector device implementation */
--private int lips4v_beginpage(P1(gx_device_vector * vdev));
--private int lips4v_setfillcolor(P2(gx_device_vector * vdev,
--				   const gx_drawing_color * pdc));
--private int lips4v_setstrokecolor(P2(gx_device_vector * vdev,
--				     const gx_drawing_color * pdc));
--private int lips4v_setdash(P4(gx_device_vector * vdev, const float *pattern,
--			      uint count, floatp offset));
--private int lips4v_setflat(P2(gx_device_vector * vdev, floatp flatness));
-+#if GS_VERSION_MAJOR >= 8
-+private int lips4v_beginpage(gx_device_vector * vdev);
-+private int lips4v_setfillcolor(gx_device_vector * vdev,
-+				   const gx_drawing_color * pdc);
-+private int lips4v_setstrokecolor(gx_device_vector * vdev,
-+				     const gx_drawing_color * pdc);
-+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
-+			      uint count, floatp offset);
-+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
-+private int
-+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
-+		 gs_logical_operation_t diff);
-+private int
-+
-+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
-+private int
-+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
- private int
--lips4v_setlogop(P3
-+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
-+		floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
-+		gx_path_type_t type);
-+private int
-+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
-+		  floatp y_start, gx_path_type_t type);
- 
--		(gx_device_vector * vdev, gs_logical_operation_t lop,
--		 gs_logical_operation_t diff));
-+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#else
-+private int lips4v_beginpage(P1(gx_device_vector * vdev));
-+private int lips4v_setfillcolor(gx_device_vector * vdev,
-+				   const gx_drawing_color * pdc);
-+private int lips4v_setstrokecolor(gx_device_vector * vdev,
-+				     const gx_drawing_color * pdc);
-+private int lips4v_setdash(gx_device_vector * vdev, const float *pattern,
-+			      uint count, floatp offset);
-+private int lips4v_setflat(gx_device_vector * vdev, floatp flatness);
-+private int
-+lips4v_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop,
-+		 gs_logical_operation_t diff);
- private int
- 
--lips4v_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+lips4v_beginpath(gx_device_vector * vdev, gx_path_type_t type);
- private int
--lips4v_moveto(P6
--	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
--	       floatp y, gx_path_type_t type));
-+lips4v_moveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
- private int
--lips4v_lineto(P6
--	      (gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
--	       floatp y, gx_path_type_t type));
-+lips4v_lineto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x,
-+	       floatp y, gx_path_type_t type);
- private int
--lips4v_curveto(P10
--	       (gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
-+lips4v_curveto(gx_device_vector * vdev, floatp x0, floatp y0, floatp x1,
- 		floatp y1, floatp x2, floatp y2, floatp x3, floatp y3,
--		gx_path_type_t type));
-+		gx_path_type_t type);
- private int
--lips4v_closepath(P6
--		 (gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
--		  floatp y_start, gx_path_type_t type));
-+lips4v_closepath(gx_device_vector * vdev, floatp x, floatp y, floatp x_start,
-+		  floatp y_start, gx_path_type_t type);
- 
--private int lips4v_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+private int lips4v_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#endif
- private int lips4v_setlinewidth(gx_device_vector * vdev, floatp width);
- private int lips4v_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int lips4v_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -758,10 +784,26 @@
-     /* ?????????? */
-     if (pdev->prev_paper_size != paper_size) {
- 	if (paper_size == USER_SIZE) {
--	    sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10);
-+	    /* modified by shige 06/27 2003
-+	    sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+	    /* modified by shige 11/09 2003
-+	    sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+	    sprintf(paper, "%c80;%d;%dp", LIPS_CSI, 
-+		    (height * 10 > LIPS_HEIGHT_MAX_720)? 
-+		    LIPS_HEIGHT_MAX_720 : (height * 10),
-+		    (width * 10 > LIPS_WIDTH_MAX_720)? 
-+		    LIPS_WIDTH_MAX_720 : (width * 10));
- 	    lputs(s, paper);
- 	} else if (paper_size == USER_SIZE + LANDSCAPE) {
--	    sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10);
-+	    /* modified by shige 06/27 2003
-+	    sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+	    /* modified by shige 11/09 2003
-+	    sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+	    sprintf(paper, "%c80;%d;%dp", LIPS_CSI, 
-+		    (width * 10 > LIPS_HEIGHT_MAX_720)? 
-+		    LIPS_HEIGHT_MAX_720 : (width * 10),
-+		    (height * 10 > LIPS_WIDTH_MAX_720)? 
-+		    LIPS_WIDTH_MAX_720 : (height * 10));
- 	    lputs(s, paper);
- 	} else {
- 	    sprintf(paper, "%c%dp", LIPS_CSI, paper_size);
-@@ -770,12 +812,28 @@
-     } else if (paper_size == USER_SIZE) {
- 	if (pdev->prev_paper_width != width ||
- 	    pdev->prev_paper_height != height)
--		sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10);
-+	  	/* modified by shige 06/27 2003
-+		sprintf(paper, "%c80;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+		/* modified by shige 11/09 2003
-+		sprintf(paper, "%c80;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+		sprintf(paper, "%c80;%d;%dp", LIPS_CSI, 
-+		    (height * 10 > LIPS_HEIGHT_MAX_720)? 
-+		    LIPS_HEIGHT_MAX_720 : (height * 10),
-+		    (width * 10 > LIPS_WIDTH_MAX_720)? 
-+		    LIPS_WIDTH_MAX_720 : (width * 10));
- 	lputs(s, paper);
-     } else if (paper_size == USER_SIZE + LANDSCAPE) {
- 	if (pdev->prev_paper_width != width ||
- 	    pdev->prev_paper_height != height)
--		sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10);
-+		/* modified by shige 06/27 2003
-+		sprintf(paper, "%c81;%d;%dp", LIPS_CSI, height * 10, width * 10); */
-+	  	/* modified by shige 11/09 2003
-+		sprintf(paper, "%c81;%d;%dp", LIPS_CSI, width * 10, height * 10); */
-+		sprintf(paper, "%c80;%d;%dp", LIPS_CSI, 
-+		    (width * 10 > LIPS_HEIGHT_MAX_720)? 
-+		    LIPS_HEIGHT_MAX_720 : (width * 10),
-+		    (height * 10 > LIPS_WIDTH_MAX_720)? 
-+		    LIPS_WIDTH_MAX_720 : (height * 10));
- 	lputs(s, paper);
-     }
-     pdev->prev_paper_size = paper_size;
-@@ -1881,7 +1939,7 @@
- 	}
- 	color_set_pure(&color, one);
- 	code = gdev_vector_update_fill_color((gx_device_vector *) pdev,
--					     &color);
-+					     NULL, &color);
-     }
-     if (code < 0)
- 	return 0;
-@@ -2026,7 +2084,7 @@
-     if (w <= 0 || h <= 0)
- 	return 0;
-     if (depth > 1 ||
--	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- 	gdev_vector_update_log_op(vdev, lop) < 0)
- 	return gx_default_fill_mask(dev, data, data_x, raster, id,
--- print/ghostscript-gpl/files/stc740p.upp
+++ /dev/null
@@ -1,36 +0,0 @@
-# $ApsCVS: src/apsfilter/uniprint/stc740p.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
-#
--supModel="Epson Stylus Color 740, 720x720DpI, Plain Paper"
--sDEVICE=uniprint
--dNOPAUSE
--dSAFER
--dupColorModel=/DeviceCMYKgenerate
--dupRendering=/FSCMYK32
--dupOutputFormat=/EscP2
--r720x720
--dupMargins="{ 9.0 39.96 9.0 9.0}"
--dupBlackTransfer="{   0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupCyanTransfer="{    0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupMagentaTransfer="{ 0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupYellowTransfer="{  0.0000 0.0453 0.1058 0.1898 0.4321 1.0000 }"
--dupOutputComponentOrder="{ 1 2 3 0 }"
--dupWeaveYPasses=6
--dupOutputPins=48
--dupWeaveYFeeds="{47 47 47 53 47 47}"
--dupWeaveInitialYFeeds="{1  1  1  1  1  43}"
--dupWeaveInitialPins="{ 8 48 40 31 23 15}"
--dupBeginPageCommand="<
-   1b40   1b40
-   1b2847 0100 01
-   1b2855 0100 05
-   1b5500
-   1b2865 0200 0002
-   1b2843 0200 0000
-   1b2863 0400 0000 0000
->"
--dupAdjustPageLengthCommand
--dupAdjustTopMarginCommand
--dupAdjustBottomMarginCommand
--dupEndPageCommand="(\033@\014)"
--dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
-
--- /dev/null
+++ print/ghostscript-gpl/files/patch-lib-FAPIcidfmap
@@ -0,0 +1,61 @@
+--- lib/FAPIcidfmap.orig	2006-06-01 00:29:52.000000000 +0900
++++ lib/FAPIcidfmap	2008-03-04 07:05:55.000000000 +0900
+@@ -29,4 +29,58 @@
+ %
+ %  /Ryumin-Medium     << /Path (msgothic.ttc) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
+ %  /HeiseiKakuGo-W5   << /Path (F:/WIN2000/Fonts/BATANG.TTC) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/Ryumin-Light		<< /Path (Ryumin-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++%/GothicBBB-Medium	<< /Path (GothicBBB-Medium.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(Japan1) 2] >> ;
++
++/Ryumin-Medium		/Ryumin-Light ;
++/Ryumin-Regular		/Ryumin-Light ;
++/RyuminPro-Light	/Ryumin-Light ;
++
++/GothicBBBPro-Medium	/GothicBBB-Medium ;
++
++/KozGoPro-Bold		/GothicBBB-Medium ;
++/KozGoPro-Heavy		/GothicBBB-Medium ;
++/KozGoPro-Medium	/GothicBBB-Medium ;
++/KozGoPro-Regular	/GothicBBB-Medium ;
++
++/KozMinPro-Bold		/Ryumin-Light ;
++/KozMinPro-Light	/Ryumin-Light ;
++/KozMinPro-Medium	/Ryumin-Light ;
++/KozMinPro-Regular	/Ryumin-Light ;
++
++/HiraKakuPro-W3		/GothicBBB-Medium ;
++/HiraKakuPro-W6		/GothicBBB-Medium ;
++/HiraKakuStd-W8		/GothicBBB-Medium ;
++
++/HiraMaruPro-W4		/GothicBBB-Medium ;
++
++/HiraMinPro-W3		/Ryumin-Light ;
++
++/HeiseiMin-W3		/Ryumin-Light ;
++/HeiseiKakuGo-W5	/GothicBBB-Medium ;
++
++/FutoMinA101-Bold	/Ryumin-Light ;
++/FutoMinA101Pro-Bold	/Ryumin-Light ;
++/FutoGoB101-Bold	/GothicBBB-Medium ;
++/FutoGoB101Pro-Bold	/GothicBBB-Medium ;
+ 
++/Jun101-Light		/Ryumin-Light ;
++/Jun101Pro-Light	/Ryumin-Light ;
++
++/MidashiGo-MB31		/GothicBBB-Medium ;
++/MidashiGoPro-MB31	/GothicBBB-Medium ;
++
++/MidashiMinPro-MA31	/Ryumin-Light ;
++
++%/Munhwa-Regular	/Munhwa-Regular ;
++%/MunhwaGothic-Regular	/MunhwaGothic-Regular ;
++%/Munhwa-Bold		/Munhwa-Bold ;
++%/MunhwaGothic-Bold	/MunhwaGothic-Bold ;
++
++/HYGoThic-Medium	/MunhwaGothic-Regular ;
++/HYSMyeongJo-Medium	/Munhwa-Regular ;
++/HYRGoThic-Medium	/MunhwaGothic-Bold ;
++
++%/STHeiti-Regular << /Path (STHeiti-Regular.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(CNS1) 5] >> ;
++%/STSong-Light << /Path (STSong-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
++%/MSung-Light << /Path (MSung-Light.ttf) /CIDFontType 0 /FAPI /UFST /CSI [(GB1) 5] >> ;
--- print/ghostscript-gpl/files/stc740ih.upp
+++ /dev/null
@@ -1,60 +0,0 @@
-# $ApsCVS: src/apsfilter/uniprint/stc740ih.upp,v 1.2 2000/04/21 18:48:00 andreas Exp $
-#
--supModel="Epson Stylus Color 740, 1440x720DpI, Inkjet Paper"
--sDEVICE=uniprint
--dNOPAUSE
--dSAFER
--dupColorModel=/DeviceCMYKgenerate
--dupRendering=/FSCMYK32
--dupOutputFormat=/EscP2XY
--r1440x720
--dupMargins="{ 9.0 39.96 9.0 9.0}"
--dupBlackTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupCyanTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupMagentaTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupYellowTransfer="{
- 0.00000000 0.00627451 0.01254902 0.02196078 0.02980392 0.03764706 0.04549020
- 0.05490196 0.06431373 0.07215686 0.08156863 0.09098039 0.10196078 0.11450980
- 0.12862745 0.14588235 0.16313725 0.18509804 0.20862745 0.25411765 0.40000000
-}"
--dupOutputComponentOrder="{ 1 2 3 0 }"
--dupWeaveXPasses=2
--dupOutputXStep=2
--dupWeaveYPasses=6
--dupOutputPins=46
--dupWeaveYFeeds="{23 23 23 23 23 23 23 23 23 23 23 23}"
--dupWeaveXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
--dupWeaveYOffset=50
--dupWeaveInitialYFeeds="{ 5  5  5  5  5  5  5  5  5  5  5 23}"
--dupWeaveInitialXStarts="{0  1  0  1  0  1  1  0  1  0  1  0}"
--dupWeaveInitialPins="{ 13 16 19 22 25 28 31 34 37 40 43 46}"
--dupFormatYabsolute
--dupBeginPageCommand="<
-   1b40   1b40
-   1b2847 0100 01
-   1b2855 0100 05
-   1b2873 0100 02
-   1b5501
-   1b2865 0200 0001
-   1b2843 0200 0000
-   1b2863 0400 0000 0000
->"
--dupAdjustPageLengthCommand
--dupAdjustTopMarginCommand
--dupAdjustBottomMarginCommand
--dupXStepCommand="<1b285c 0400 a005 0100 0000>"
--dupEndPageCommand="(\033@\014)"
--dupAbortCommand="(\033@\15\12\12\12\12    Printout-Aborted\15\014)"
-
--- print/ghostscript-gpl/files/patch-bjc250:src:gdevbjc_.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- bjc250/src/gdevbjc_.c.orig	Fri Nov  8 06:15:15 2002
-+++ bjc250/src/gdevbjc_.c	Fri Nov  8 07:43:31 2002
-@@ -54,9 +54,9 @@
- private dev_proc_put_params(gdev_bjc_put_params);
- private dev_proc_get_params(gdev_bjc_get_params);
- const stringParamDescription *
-- paramValueToParam(P2(const stringParamDescription *, int));
-+ paramValueToParam(const stringParamDescription *, int);
- const stringParamDescription *
-- paramStringToParam(P3(const stringParamDescription *, const char *, uint));
-+ paramStringToParam(const stringParamDescription *, const char *, uint);
- 
- BJL_command BJL_command_set[] = {
-     { "@Cleaning=1",            BJC_BJL_CLEANING,      11},
--- print/ghostscript-gpl/files/dj970.contrib.mak
+++ /dev/null
@@ -1,9 +0,0 @@
-###- cdj970 - HP 970Cxi Driver under development -------- ###
-cdeskjet9_=$(GLOBJ)gdevdj9.$(OBJ) $(HPPCL)
-
-$(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev
-	$(SETPDEV2) $(DD)cdj970 $(cdeskjet9_)
-
-$(GLOBJ)gdevdj9.$(OBJ) : $(GLSRC)gdevdj9.c $(PDEVH) $(math__h) \
-		$(gsparam_h) $(gxlum_h) $(gdevpcl_h)
-	$(GLCC) $(GLO_)gdevdj9.$(OBJ) $(C_) $(GLSRC)gdevdj9.c
--- print/ghostscript-gpl/files/patch-lips__gdevespg.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lips/gdevespg.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevespg.c	Fri Dec 17 19:39:57 2004
-@@ -142,7 +142,7 @@
-     if (pdev->PageCount == 0)
- 	escpage_printer_initialize(pdev, fp, num_coipes);
- 
--    if (!(lprn->CompBuf = gs_malloc(bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)")))
-+    if (!(lprn->CompBuf = gs_malloc(pdev->memory, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)")))
- 	return_error(gs_error_VMerror);
- 
-     if (lprn->NegativePrint) {
-@@ -154,7 +154,7 @@
-     if (code < 0)
- 	return code;
- 
--    gs_free(lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)");
-+    gs_free(pdev->memory, lprn->CompBuf, bpl * 3 / 2 + 1, maxY, "lp2000_print_page_copies(CompBuf)");
- 
-     if (pdev->Duplex)
- 	fprintf(fp, "%c0dpsE", GS);
--- print/ghostscript-gpl/files/patch-eplaser:gdevesmv.c
+++ /dev/null
@@ -1,102 +0,0 @@
---- eplaser/gdevesmv.c.orig	Mon May 17 14:25:19 2004
-+++ eplaser/gdevesmv.c	Mon Aug  2 14:05:21 2004
-@@ -34,10 +34,6 @@
- 
-  */
- 
--#include 
--#include 
--#include 
--
- #include "math_.h"
- #include "gx.h"
- #include "gserrors.h"
-@@ -59,6 +55,10 @@
- #include "gspath.h"
- #include "gzpath.h"
- 
-+#include 
-+#include 
-+#include 
-+
- /* ---------------- Device definition ---------------- */
- 
- /* Device procedures */
-@@ -428,6 +428,16 @@
- 
- 
- /* Vector device implementation */
-+#if GS_VERSION_MAJOR >= 8
-+private int esmv_beginpage(gx_device_vector * vdev);
-+private int esmv_setfillcolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int esmv_setstrokecolor(gx_device_vector * vdev, const gx_drawing_color * pdc);
-+private int esmv_setdash(gx_device_vector * vdev, const float *pattern, 
-+			      uint count, floatp offset);
-+private int esmv_setflat(gx_device_vector * vdev, floatp flatness);
-+private int esmv_setlogop(gx_device_vector * vdev, gs_logical_operation_t lop, 
-+			       gs_logical_operation_t diff);
-+#else
- private int esmv_beginpage(P1(gx_device_vector * vdev));
- private int esmv_setfillcolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
- private int esmv_setstrokecolor(P2(gx_device_vector * vdev, const gx_drawing_color * pdc));
-@@ -436,10 +446,25 @@
- private int esmv_setflat(P2(gx_device_vector * vdev, floatp flatness));
- private int esmv_setlogop(P3(gx_device_vector * vdev, gs_logical_operation_t lop, 
- 			       gs_logical_operation_t diff));
-+#endif
- private int esmv_vector_dorect(gx_device_vector * vdev, fixed x0, fixed y0, fixed x1,
- 			       fixed y1, gx_path_type_t type);
- private int esmv_vector_dopath(gx_device_vector * vdev, const gx_path * ppath,
- 			       gx_path_type_t type);
-+#if GS_VERSION_MAJOR >= 8
-+private int esmv_beginpath(gx_device_vector * vdev, gx_path_type_t type);
-+private int esmv_moveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+			   floatp x, floatp y, gx_path_type_t type);
-+private int esmv_lineto(gx_device_vector * vdev, floatp x0, floatp y0,
-+			   floatp x, floatp y, gx_path_type_t type);
-+private int esmv_curveto(gx_device_vector * vdev, floatp x0, floatp y0,
-+			       floatp x1, floatp y1, floatp x2, floatp y2,
-+			       floatp x3, floatp y3, gx_path_type_t type);
-+private int esmv_closepath(gx_device_vector * vdev, floatp x, floatp y,
-+				floatp x_start, floatp y_start, gx_path_type_t type);
-+
-+private int esmv_endpath(gx_device_vector * vdev, gx_path_type_t type);
-+#else
- private int esmv_beginpath(P2(gx_device_vector * vdev, gx_path_type_t type));
- private int esmv_moveto(P6(gx_device_vector * vdev, floatp x0, floatp y0,
- 			   floatp x, floatp y, gx_path_type_t type));
-@@ -452,6 +477,7 @@
- 				floatp x_start, floatp y_start, gx_path_type_t type));
- 
- private int esmv_endpath(P2(gx_device_vector * vdev, gx_path_type_t type));
-+#endif
- private int esmv_setlinewidth(gx_device_vector * vdev, floatp width);
- private int esmv_setlinecap(gx_device_vector * vdev, gs_line_cap cap);
- private int esmv_setlinejoin(gx_device_vector * vdev, gs_line_join join);
-@@ -1688,7 +1714,7 @@
-             pdev->MaskState = 1;
-         }
- 	color_set_pure(&color, one);
--	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, &color);
-+	code = gdev_vector_update_fill_color((gx_device_vector *) pdev, NULL, &color);
- 
- 	/* ?????????????????????????????????????? */
-     }
-@@ -1771,7 +1797,7 @@
- 		 gs_logical_operation_t lop, const gx_clip_path * pcpath)
- {
-     gx_device_vector const	*vdev = (gx_device_vector *) dev;
--    gx_device_esmv const	*pdev = (gx_device_esmv *) dev;
-+    gx_device_esmv		*pdev = (gx_device_esmv *) dev;
-     stream			*s = gdev_vector_stream(vdev);
-     gx_color_index		color = gx_dc_pure_color(pdcolor);
-     char			obuf[64];
-@@ -1779,7 +1805,7 @@
-     if (w <= 0 || h <= 0) return 0;
-     
-     if (depth > 1 ||
--	gdev_vector_update_fill_color(vdev, pdcolor) < 0 ||
-+	gdev_vector_update_fill_color(vdev, NULL, pdcolor) < 0 ||
- 	gdev_vector_update_clip_path(vdev, pcpath) < 0 ||
- 	gdev_vector_update_log_op(vdev, lop) < 0
- 	) 
--- print/ghostscript-gpl/files/patch-md2k:gdevmd2k.mak
+++ /dev/null
@@ -1,19 +0,0 @@
---- md2k/gdevmd2k.mak-5.50.orig	Sun Nov 19 18:42:20 2000
-+++ md2k/gdevmd2k.mak-5.50	Sun Nov 19 18:52:14 2000
-@@ -3,11 +3,11 @@
- 
- md2k_=$(GLOBJ)gdevmd2k.$(OBJ)
- 
--md2k.dev: $(md2k_) page.dev
--	$(SETPDEV) md2k $(md2k_)
-+$(DD)md2k.dev: $(md2k_) $(DD)page.dev
-+	$(SETPDEV) $(DD)md2k $(md2k_)
- 
--md5k.dev: $(md2k_) page.dev
--	$(SETPDEV) md5k $(md2k_)
-+$(DD)md5k.dev: $(md2k_) $(DD)page.dev
-+	$(SETPDEV) $(DD)md5k $(md2k_)
- 
--$(GLOBJ)gdevmd2k.$(OBJ): gdevmd2k.c $(PDEVH) $(gsparam_h)
-+$(GLOBJ)gdevmd2k.$(OBJ): $(GLSRC)gdevmd2k.c $(PDEVH) $(gsparam_h)
- 	$(GLCC) $(GLO_)gdevmd2k.$(OBJ) $(C_) $(GLSRC)gdevmd2k.c
Index: patch-src:fapi_ft.c
===================================================================
RCS file: /home/cvs/mports/print/ghostscript-gpl/files/patch-src:fapi_ft.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -L print/ghostscript-gpl/files/patch-src:fapi_ft.c -L print/ghostscript-gpl/files/patch-src:fapi_ft.c -u -r1.2 -r1.3
--- print/ghostscript-gpl/files/patch-src:fapi_ft.c
+++ print/ghostscript-gpl/files/patch-src:fapi_ft.c
@@ -1,16 +1,20 @@
---- src/fapi_ft.c.orig	Mon Mar 13 17:18:19 2006
-+++ src/fapi_ft.c	Sun Mar 18 16:23:21 2007
-@@ -26,11 +26,14 @@
- #include "math_.h"
+--- src/fapi_ft.c.orig	Wed Jul 11 09:26:24 2007
++++ src/fapi_ft.c	Fri Aug 10 02:40:41 2007
+@@ -28,11 +28,14 @@
+ #include "gserror.h"
  
  /* FreeType headers */
 -#include "freetype/freetype.h"
+-#include "freetype/ftincrem.h"
+-#include "freetype/ftglyph.h"
+-#include "freetype/ftoutln.h"
+-#include "freetype/fttrigon.h"
 +#include "ft2build.h"
 +#include FT_FREETYPE_H
- #include "freetype/ftincrem.h"
- #include "freetype/ftglyph.h"
- #include "freetype/ftoutln.h"
- #include "freetype/fttrigon.h"
++#include FT_INCREMENTAL_H
++#include FT_GLYPH_H
++#include FT_OUTLINE_H
++#include FT_TRIGONOMETRY_H
 +#include "gserrors.h"
 +#include "gserror.h"
  
--- print/ghostscript-gpl/files/patch-lex7000__src__gdevlx7.c
+++ /dev/null
@@ -1,31 +0,0 @@
---- lex7000/src/gdevlx7.c.orig	Fri Dec 31 17:22:48 2004
-+++ lex7000/src/gdevlx7.c	Fri Dec 31 17:24:39 2004
-@@ -615,14 +615,14 @@
-    dprintf2("Current resolution is %f width x %f height dpi\n",
- 	 pdev->x_pixels_per_inch, pdev->y_pixels_per_inch );
- #endif
--   pbuf = (byte *)gs_malloc(rpbufsize, 1, "lxmgen_print_page(pbuf)");
-+   pbuf = (byte *)gs_malloc(pdev->memory, rpbufsize, 1, "lxmgen_print_page(pbuf)");
-    if (pbuf == NULL)
-       return_error(gs_error_VMerror);
- 
--   outbuf = (byte *)gs_malloc(OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
-+   outbuf = (byte *)gs_malloc(pdev->memory, OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
-    if (outbuf == NULL)
-    {
--      gs_free((char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)");
-+      gs_free(pdev->memory, (char*)pbuf,pbufsize, 1, "lxmgen_print_page(pbuf)");
-       return_error(gs_error_VMerror);
-    }
-    /* initialize begin of outbuf ... */
-@@ -799,8 +799,8 @@
- 
-    /* eject page */
-    lex_eject(prn_stream);
--   gs_free((char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)");
--   gs_free((char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
-+   gs_free(pdev->memory, (char*)pbuf,rpbufsize, 1, "lxmgen_print_page(pbuf)");
-+   gs_free(pdev->memory, (char*)outbuf,OUT_BUF_SIZE, 1, "lxmgen_print_page(outbuf)");
- 
- #ifdef DEBUG
-    dprintf1("[%s] print_page() end\n",pdev->dname);
--- print/ghostscript-gpl/files/patch-src:gdevhl12.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/gdevhl12.c.orig	Wed Mar 28 14:10:35 2007
-+++ src/gdevhl12.c	Wed Mar 28 14:13:21 2007
-@@ -472,7 +472,7 @@
-     for (y = ytop; y < ybottom; y++) {
- 	if (hl1250_compress_line(s, y))
- 	    continue;
--#if 1
-+#if 0
- 	/* XXX - please report if you ever see this, then change to #if 0 */
- 	fprintf(stderr,
- 		"hl1250: compression failed (y=%u), doing 1200x300 dpi\n",
--- print/ghostscript-gpl/files/patch-src:gdevlx50.c
+++ /dev/null
@@ -1,62 +0,0 @@
---- src/gdevlx50.c.orig	Fri Dec 17 19:31:43 2004
-+++ src/gdevlx50.c	Fri Dec 17 22:31:26 2004
-@@ -1120,18 +1120,18 @@
- 
- 				/* Allocate a buffer for a single scan line */
- 	    lineBuffer	= (byte *)gs_alloc_byte_array
--		( &gs_memory_default, lx5000dev->scanLineBytes, 1,
-+		( lx5000dev->memory, lx5000dev->scanLineBytes, 1,
- 		  "lx5000_print_page(lineBuffer)" );
- 
- 	    swipeBuf	= (byte *)gs_alloc_byte_array
--		( &gs_memory_default, lx5000dev->swipeBufSize, 1,
-+		( lx5000dev->memory, lx5000dev->swipeBufSize, 1,
- 		  "lx5000_print_page(swipeBuf)" );
- 
- 	    for ( colour = 0 ; colour < numColours; colour++ )
- 	    {
- 		if ( ( colourBufs[colour] =
- 		       (byte *)gs_alloc_byte_array
--		       ( &gs_memory_default, lx5000dev->penBufSize, 1,
-+		       ( lx5000dev->memory, lx5000dev->penBufSize, 1,
- 			 "lx5000_print_page(colourBufs)"
- 			 )
- 		       ) == NULL )
-@@ -1172,19 +1172,19 @@
- 	for ( colour = 0; colour < numColours; colour++ )
- 	{
- 	    if ( colourBufs[colour] != NULL )
--		gs_free_object( &gs_memory_default,
-+		gs_free_object( lx5000dev->memory,
- 				(char *)colourBufs[colour],
- 				"lx5000_print_page(colourBufs)" );
- 	    colourBufs[ colour ]	= NULL;
- 	    colourBufPtrs[ colour ]	= NULL;
- 	}
- 	if ( swipeBuf != NULL )
--	    gs_free_object( &gs_memory_default,
-+	    gs_free_object( lx5000dev->memory,
- 			    (char *)swipeBuf, "lx5000_print_page(swipeBuf)" );
- 	swipeBuf	= NULL;
- 	*swipeBufPtr	= NULL;
- 	if ( lineBuffer != NULL )
--	    gs_free_object( &gs_memory_default,
-+	    gs_free_object( lx5000dev->memory,
- 		    (char *)lineBuffer, "lx5000_print_page(lineBuffer)" );
- 	lineBuffer	= NULL;
- 	*lineBufferPtr	= NULL;
-@@ -2603,9 +2603,12 @@
- 
- /* Map CMYK to color. */
- private gx_color_index
--lx5000_map_cmyk_color(gx_device * dev, gx_color_value cyan,
--	gx_color_value magenta, gx_color_value yellow, gx_color_value black)
-+lx5000_map_cmyk_color(gx_device * dev, const gx_color_value cv[])
- {
-+    gx_color_value cyan = cv[0];
-+    gx_color_value magenta = cv[1];
-+    gx_color_value yellow = cv[2];
-+    gx_color_value black = cv[3];
-     int bpc = dev->color_info.depth / 4;
-     int drop = sizeof(gx_color_value) * 8 - bpc;
-     gx_color_index color =
--- print/ghostscript-gpl/files/patch-lib__pv.sh.CAN-2004-0967
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/pv.sh.orig	Mon Nov 28 02:18:26 2005
-+++ lib/pv.sh	Mon Nov 28 02:18:59 2005
-@@ -29,9 +29,10 @@
- PAGE=$1
- shift
- FILE=$1
-+TEMPFILE=`mktemp -t ${FILE}XXXXXX` || exit 1
- shift
--trap "rm -rf $TEMPDIR/$FILE.$$.pv" 0 1 2 15
-+trap "rm -rf $TEMPFILE" 0 1 2 15
- #dvips -D$RESOLUTION -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--dvips -p $PAGE -n 1 $FILE $* -o $FILE.$$.pv
--gs $FILE.$$.pv
-+dvips -p $PAGE -n 1 $FILE $* -o $TEMPFILE
-+gs $TEMPFILE
- exit 0
--- print/ghostscript-gpl/files/patch-gdev10v__gdev10v.c
+++ /dev/null
@@ -1,23 +0,0 @@
---- gdev10v/gdev10v.c.orig	Sat Dec 11 04:10:45 1993
-+++ gdev10v/gdev10v.c	Fri Dec 17 19:15:49 2004
-@@ -152,8 +152,8 @@
- 	int bytes_per_column = bits_per_column / 8;
- 	int x_skip_unit = bytes_per_column * (xres / 180);
- 	int y_skip_unit = (yres / 180);
--	byte *in = (byte *)gs_malloc(8, line_size, "bj10v_print_page(in)");
--	byte *out = (byte *)gs_malloc(bits_per_column, line_size, "bj10v_print_page(out)");
-+	byte *in = (byte *)gs_malloc(pdev->memory, 8, line_size, "bj10v_print_page(in)");
-+	byte *out = (byte *)gs_malloc(pdev->memory, bits_per_column, line_size, "bj10v_print_page(out)");
- 	int lnum = 0;
- 	int y_skip = 0;
- 	int code = 0;
-@@ -275,7 +275,7 @@
- 	/* Eject the page */
- xit:	prn_putc(pdev, 014);	/* form feed */
- 	prn_flush(pdev);
--	gs_free((char *)out, bits_per_column, line_size, "bj10v_print_page(out)");
--	gs_free((char *)in, 8, line_size, "bj10v_print_page(in)");
-+	gs_free(pdev->memory, (char *)out, bits_per_column, line_size, "bj10v_print_page(out)");
-+	gs_free(pdev->memory, (char *)in, 8, line_size, "bj10v_print_page(in)");
- 	return code;
- }
--- print/ghostscript-gpl/files/patch-src:gdevcd8.c
+++ /dev/null
@@ -1,303 +0,0 @@
---- src/gdevcd8.c.orig	Mon Feb 28 16:01:59 2000
-+++ src/gdevcd8.c	Fri Dec 17 19:42:52 2004
-@@ -406,19 +406,19 @@
- };
- 
- private int
--    rescale_byte_wise1x1(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise1x1(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- private int
--    rescale_byte_wise2x1(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise2x1(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- private int
--    rescale_byte_wise1x2(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise1x2(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- private int
--    rescale_byte_wise2x2(P4(int bytecount, const byte * inbytea,
--			    const byte * inbyteb, byte * outbyte));
-+    rescale_byte_wise2x2(int bytecount, const byte * inbytea,
-+			    const byte * inbyteb, byte * outbyte);
- 
--private int (* const rescale_color_plane[2][2]) (P4(int, const byte *, const byte *, byte *)) = {
-+private int (* const rescale_color_plane[2][2]) (int, const byte *, const byte *, byte *) = {
-     {
- 	rescale_byte_wise1x1, rescale_byte_wise1x2
-     },
-@@ -571,16 +571,16 @@
- };
- 
-     /* function pointer typedefs for device driver struct */
--typedef void (*StartRasterMode) (P3(gx_device_printer * pdev, int paper_size,
--				    FILE * prn_stream));
--typedef void (*PrintNonBlankLines) (P6(gx_device_printer * pdev,
-+typedef void (*StartRasterMode) (gx_device_printer * pdev, int paper_size,
-+				    FILE * prn_stream);
-+typedef void (*PrintNonBlankLines) (gx_device_printer * pdev,
- 				       struct ptr_arrays *data_ptrs,
- 				       struct misc_struct *misc_vars,
- 				       struct error_val_field *error_values,
- 				       const Gamma *gamma,
--				       FILE * prn_stream));
-+				       FILE * prn_stream);
- 
--typedef void (*TerminatePage) (P2(gx_device_printer * pdev, FILE * prn_stream));
-+typedef void (*TerminatePage) (gx_device_printer * pdev, FILE * prn_stream);
- 
- typedef struct gx_device_cdj850_s {
-     gx_device_common;
-@@ -699,52 +699,52 @@
-  *  functions.
-  */
- private void
--     cdj850_start_raster_mode(P3(gx_device_printer * pdev,
--				 int papersize, FILE * prn_stream));
-+     cdj850_start_raster_mode(gx_device_printer * pdev,
-+				 int papersize, FILE * prn_stream);
- 
- private void
--     cdj850_print_non_blank_lines(P6(gx_device_printer * pdev,
-+     cdj850_print_non_blank_lines(gx_device_printer * pdev,
- 				     struct ptr_arrays *data_ptrs,
- 				     struct misc_struct *misc_vars,
- 				     struct error_val_field *error_values,
- 				     const Gamma *gamma,
--				     FILE * prn_stream));
-+				     FILE * prn_stream);
- 
- private void
--     cdj850_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+     cdj850_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
- 
- /*  The 880C and siblings need a separate set of functions because they seem
-  *  to require a somewhat different version of PCL3+.
-  */
- private void
--     cdj880_start_raster_mode(P3(gx_device_printer * pdev,
--				 int papersize, FILE * prn_stream));
-+     cdj880_start_raster_mode(gx_device_printer * pdev,
-+				 int papersize, FILE * prn_stream);
- 
- private void
--     cdj880_print_non_blank_lines(P6(gx_device_printer * pdev,
-+     cdj880_print_non_blank_lines(gx_device_printer * pdev,
- 				     struct ptr_arrays *data_ptrs,
- 				     struct misc_struct *misc_vars,
- 				     struct error_val_field *error_values,
- 				     const Gamma *gamma,
--				     FILE * prn_stream));
-+				     FILE * prn_stream);
- 
- private void
--     cdj880_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+     cdj880_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
- 
- /*  Functions for the 1600C.
-  */
- private void
--     cdj1600_start_raster_mode(P3(gx_device_printer * pdev,
--				  int papersize, FILE * prn_stream));
-+     cdj1600_start_raster_mode(gx_device_printer * pdev,
-+				  int papersize, FILE * prn_stream);
- private void
--     cdj1600_print_non_blank_lines(P6(gx_device_printer * pdev,
-+     cdj1600_print_non_blank_lines(gx_device_printer * pdev,
- 				      struct ptr_arrays *data_ptrs,
- 				      struct misc_struct *misc_vars,
- 				      struct error_val_field *error_values,
- 				      const Gamma *gamma,
--				      FILE * prn_stream));
-+				      FILE * prn_stream);
- private void
--     cdj1600_terminate_page(P2(gx_device_printer * pdev, FILE * prn_stream));
-+     cdj1600_terminate_page(gx_device_printer * pdev, FILE * prn_stream);
- 
- 
- 
-@@ -804,12 +804,12 @@
- 		cdj1600_terminate_page);
- 
- /* Forward references */
--private int cdj_put_param_int(P6(gs_param_list *, gs_param_name,
--				 int *, int, int, int));
--private int cdj_put_param_float(P6(gs_param_list *, gs_param_name, float
--				   *, float, float, int));
--private int cdj_put_param_bpp(P5(gx_device *, gs_param_list *, int, int, int));
--private int cdj_set_bpp(P3(gx_device *, int, int));
-+private int cdj_put_param_int(gs_param_list *, gs_param_name,
-+				 int *, int, int, int);
-+private int cdj_put_param_float(gs_param_list *, gs_param_name, float
-+				   *, float, float, int);
-+private int cdj_put_param_bpp(gx_device *, gs_param_list *, int, int, int);
-+private int cdj_set_bpp(gx_device *, int, int);
- 
- 
- /*  hp_colour_open()
-@@ -1028,73 +1028,73 @@
- 
- /* internal functions */
- private void
--     FSDlinebw(P7(int scan, int plane_size,
-+     FSDlinebw(int scan, int plane_size,
- 		  struct error_val_field *error_values,
- 		  byte * kP,
--		  int n, int *ep, byte * dp));
-+		  int n, int *ep, byte * dp);
- private void
--     FSDlinec2(P9(int scan, int plane_size,
-+     FSDlinec2(int scan, int plane_size,
- 		  struct error_val_field *error_values,
- 		  byte * cPa, byte * mPa, byte * yPa, int n,
--		  byte * dp, int *ep));
-+		  byte * dp, int *ep);
- private void
--     FSDlinec3(P12(int scan, int plane_size,
-+     FSDlinec3(int scan, int plane_size,
- 		   struct error_val_field *error_values,
- 		   byte * cPa, byte * mPa, byte * yPa,
- 		   byte * cPb, byte * mPb, byte * yPb,
--		   int n, byte * dp, int *ep));
-+		   int n, byte * dp, int *ep);
- private void
--     FSDlinec4(P12(int scan, int plane_size,
-+     FSDlinec4(int scan, int plane_size,
- 		   struct error_val_field *error_values,
- 		   byte * cPa, byte * mPa, byte * yPa,
- 		   byte * cPb, byte * mPb, byte * yPb,
--		   int n, byte * dp, int *ep));
-+		   int n, byte * dp, int *ep);
- private void
-      init_error_buffer(struct misc_struct *misc_vars,
- 		       struct ptr_arrays *data_ptrs);
- private void
--     do_floyd_steinberg(P8(int scan, int cscan, int plane_size,
-+     do_floyd_steinberg(int scan, int cscan, int plane_size,
- 			   int plane_size_c, int n,
- 			   struct ptr_arrays *data_ptrs,
- 			   gx_device_printer * pdev,
--			   struct error_val_field *error_values));
-+			   struct error_val_field *error_values);
- private int
--    do_gcr(P8(int bytecount, byte * inbyte, const byte * kvalues,
-+    do_gcr(int bytecount, byte * inbyte, const byte * kvalues,
- 	      const byte * cvalues, const byte * mvalues,
- 	      const byte * yvalues, const int *kcorrect,
--	      word * inword));
-+	      word * inword);
- 
- /* UNUSED
-  *private int
-- *test_scan (P4(int size, 
-+ *test_scan (int size, 
-  *            byte * current,
-  *            byte * last, 
-- *            byte * control));
-+ *            byte * control);
-  *private void
-- *save_color_data(P3(int size,
-+ *save_color_data(int size,
-  *                 byte * current,
-- *                 byte * saved));
-+ *                 byte * saved);
-  *
-  */
- private void
--     send_scan_lines(P6(gx_device_printer * pdev,
-+     send_scan_lines(gx_device_printer * pdev,
- 			struct ptr_arrays *data_ptrs,
- 			struct misc_struct *misc_vars,
- 			struct error_val_field *error_values,
- 			const Gamma *gamma,
--			FILE * prn_stream));
-+			FILE * prn_stream);
- private void
--     do_gamma(P3(float mastergamma, float gammaval, byte * values));
-+     do_gamma(float mastergamma, float gammaval, byte * values);
- private void
--     do_black_correction(P2(float kvalue, int *kcorrect));
-+     do_black_correction(float kvalue, int *kcorrect);
- 
- private void
--     init_data_structure(P3(gx_device_printer * pdev,
-+     init_data_structure(gx_device_printer * pdev,
- 			    struct ptr_arrays *data_ptrs,
--			    struct misc_struct *misc_vars));
-+			    struct misc_struct *misc_vars);
- private void
--     calculate_memory_size(P2(gx_device_printer * pdev,
--			      struct misc_struct *misc_vars));
-+     calculate_memory_size(gx_device_printer * pdev,
-+			      struct misc_struct *misc_vars);
- 
- 
- private void
-@@ -1175,7 +1175,7 @@
-        2bpp feature of the hp850 someday, it is sized like storage.
-        storagee contains the errors from b/w fs-ditherng */
- 
--    data_ptrs.storage = (ulong *) gs_malloc(misc_vars.storage_size_words, W,
-+    data_ptrs.storage = (ulong *) gs_malloc(pdev->memory, misc_vars.storage_size_words, W,
- 					    "cdj850_print_page");
- 
-     /* if we can't allocate working area */
-@@ -1196,7 +1196,7 @@
-     (*cdj850->terminate_page) (pdev, prn_stream);
- 
-     /* Free Memory */
--    gs_free((char *)data_ptrs.storage, misc_vars.storage_size_words, W,
-+    gs_free(pdev->memory, (char *)data_ptrs.storage, misc_vars.storage_size_words, W,
- 	    "hp850_print_page");
- 
-     return 0;
-@@ -2744,13 +2744,14 @@
-     (y) = gx_bits_to_color_value((v) & ((1 << (b)) - 1), (b))
- 
- private gx_color_index
--gdev_cmyk_map_cmyk_color(gx_device * pdev,
--			 gx_color_value cyan, gx_color_value magenta,
--			 gx_color_value yellow,
--			 gx_color_value black)
-+gdev_cmyk_map_cmyk_color(gx_device * pdev, const gx_color_value cv[])
- {
- 
-     gx_color_index color;
-+    gx_color_value cyan = cv[0];
-+    gx_color_value magenta = cv[1];
-+    gx_color_value yellow = cv[2];
-+    gx_color_value black = cv[3];
- 
-     switch (pdev->color_info.depth) {
- 	case 1:
-@@ -2783,9 +2784,11 @@
- /* Mapping of RGB colors to gray values. */
- 
- private gx_color_index
--gdev_cmyk_map_rgb_color(gx_device * pdev, gx_color_value r, gx_color_value
--			g, gx_color_value b)
-+gdev_cmyk_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
- {
-+    gx_color_value r = cv[0];
-+    gx_color_value g = cv[1];
-+    gx_color_value b = cv[2];
-     if (gx_color_value_to_byte(r & g & b) == 0xff) {
- 	return (gx_color_index) 0;	/* White */
-     } else {
-@@ -2873,9 +2876,11 @@
- }
- 
- private gx_color_index
--gdev_pcl_map_rgb_color(gx_device * pdev, gx_color_value r,
--		       gx_color_value g, gx_color_value b)
-+gdev_pcl_map_rgb_color(gx_device * pdev, const gx_color_value cv[])
- {
-+    gx_color_value r = cv[0];
-+    gx_color_value g = cv[1];
-+    gx_color_value b = cv[2];
-     if (gx_color_value_to_byte(r & g & b) == 0xff)
- 	return (gx_color_index) 0;	/* white */
-     else {
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src-contrib.mak
@@ -0,0 +1,8 @@
+--- src/contrib.mak.orig	2008-03-04 06:06:45.000000000 +0900
++++ src/contrib.mak	2008-03-04 06:07:11.000000000 +0900
+@@ -858,3 +858,5 @@
+ 	$(SETPDEV) $(DD)picty180 $(cdeskjet_)
+ 
+ #########################################################################
++
++include $(GLSRCDIR)/epag.contrib.mak
--- print/ghostscript-gpl/files/patch-src-dviprlib.h
+++ /dev/null
@@ -1,38 +0,0 @@
---- src/dviprlib.h.orig	Tue May 13 16:10:34 1997
-+++ src/dviprlib.h	Tue May 24 21:41:14 2005
-@@ -337,23 +337,23 @@
- #ifdef dviprlib_implementation
- typedef struct {
-   int no;
--  long (*getworksize)(P2(dviprt_print *,long ));
--  long (*encode)(P3(dviprt_print *,long,int));
-+  long (*getworksize)(dviprt_print *,long);
-+  long (*encode)(dviprt_print *,long,int);
- } dviprt_encoder;
- 
- #define liblocal private
- 
--liblocal dviprt_encoder *dviprt_getencoder_(P1(int ));
--liblocal int dviprt_setcfgbuffer_(P3(dviprt_cfg_i *,int ,int ));
--liblocal int dviprt_resetcfgbuffer_(P1(dviprt_cfg_i *));
--liblocal int dviprt_initcfg_(P2(dviprt_cfg_t *,dviprt_cfg_i *));
--liblocal int dviprt_printmessage(P2(char *,int ));
--liblocal int dviprt_printerror(P2(char *,int ));
--liblocal int dviprt_printwarning(P2(char *,int ));
--liblocal int dviprt_printcfgerror(P3(dviprt_cfg_i *,char *,int ));
--liblocal int dviprt_printcfgwarning(P3(dviprt_cfg_i *,char *,int ));
-+liblocal dviprt_encoder *dviprt_getencoder_(int);
-+liblocal int dviprt_setcfgbuffer_(dviprt_cfg_i *,int ,int);
-+liblocal int dviprt_resetcfgbuffer_(dviprt_cfg_i *);
-+liblocal int dviprt_initcfg_(dviprt_cfg_t *,dviprt_cfg_i *);
-+liblocal int dviprt_printmessage(char *,int);
-+liblocal int dviprt_printerror(char *,int);
-+liblocal int dviprt_printwarning(char *,int);
-+liblocal int dviprt_printcfgerror(dviprt_cfg_i *,char *,int);
-+liblocal int dviprt_printcfgwarning(dviprt_cfg_i *,char *,int);
- 
--extern int dviprt_print_headercomment_(P4(char *,char *,char *,FILE *));
-+extern int dviprt_print_headercomment_(char *,char *,char *,FILE *);
- extern char dviprt_message_buffer[];
- #endif dviprlib_implementation
-  
--- print/ghostscript-gpl/files/patch-pcl3__eprn__gdeveprn.c
+++ /dev/null
@@ -1,180 +0,0 @@
---- pcl3/eprn/gdeveprn.c.orig	Mon Apr 30 14:15:51 2001
-+++ pcl3/eprn/gdeveprn.c	Sun Mar 25 22:22:54 2007
-@@ -142,11 +142,13 @@
-     if_debug0(EPRN_TRACE_CHAR,
-       "! eprn_get_initial_matrix(): code is still ms_none.\n");
- #endif
-+#if 0
-     if (eprn_set_page_layout(dev) != 0)
-       fputs("  Processing can't be stopped at this point although this error "
- 	"occurred.\n", stderr);
-       /* The current function has a signature without the ability to signal
- 	 an error condition. */
-+#endif
-   }
- 
-   quarters = dev->eprn.default_orientation +
-@@ -607,6 +609,7 @@
-     }
-   }
- 
-+#if 0
-   /*  Now the 'best_*match' variables indicate for each of the categories of
-       page descriptions to which extent the size is supported at all (non-NULL
-       value) and what the best flag match in the category is. Here we now check
-@@ -647,6 +650,7 @@
-       return -1;
-     }
-   }
-+#endif
-   /* Now we have: best_dmatch != NULL || best_cmatch != NULL &&
-      (eprn->media_overrides == NULL || best_cdmatch != NULL). */
- 
-@@ -692,7 +696,9 @@
-   }
-   /* If we've found a match, 'code' is no longer 'ms_none'. */
-   if (eprn->code == ms_none) {
-+#if 0
-     eprn_flag_mismatch(stderr, eprn, no_match);
-+#endif
-     return -1;
-   }
- 
-@@ -762,9 +768,11 @@
- 
-       rc = gdev_prn_open((gx_device *)dev);
-       if (rc < 0) {
-+#if 0
- 	fprintf(stderr, "%s" ERRPREF
- 	  "Failure of gdev_prn_open(), code is %d.\n",
- 	  epref, rc);
-+#endif
- 	return rc;
-       }
-     }
-@@ -875,7 +883,7 @@
-       &hres, &vres, &eprn->black_levels, &eprn->non_black_levels);
- 
-   if (eprn->pagecount_file != NULL) {
--    gs_free(eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
-+    gs_free(dev->memory, eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
-       sizeof(char), "eprn_init_device");
-     eprn->pagecount_file = NULL;
-   }
-@@ -944,17 +952,21 @@
-       &eprn->black_levels, &eprn->non_black_levels) != 0) {
-     gs_param_string str;
- 
-+#if 0
-     fprintf(stderr, "%s" ERRPREF "The requested combination of colour model (",
-       epref);
-+#endif
-     str.size = 0;
-     if (eprn_get_string(eprn->colour_model, eprn_colour_model_list, &str) != 0)
-       assert(0); /* Bug. No harm on NDEBUG because I've just set the size. */
-+#if 0
-     fwrite(str.data, str.size, sizeof(str.data[0]), stderr);
-     fprintf(stderr, "),\n"
-       "%s  resolution (%gx%g ppi) and intensity levels (%d, %d) is\n"
-       "%s  not supported by the %s.\n",
-       epref, device->HWResolution[0], device->HWResolution[1],
-       eprn->black_levels, eprn->non_black_levels, epref, eprn->cap->name);
-+#endif
-     return_error(gs_error_rangecheck);
-   }
- 
-@@ -1017,11 +1029,13 @@
- 	  inappropriate :-). Note that eprn does not use 'PageCount' for
- 	  updating the file. */
-     else {
-+#if 0
-       /* pcf_getcount() has issued an error message. */
-       fputs(
-         "  No further attempts will be made to access the page count file.\n",
- 	stderr);
--      gs_free(eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
-+#endif
-+      gs_free(device->memory, eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
- 	sizeof(char), "eprn_open_device");
-       eprn->pagecount_file = NULL;
-     }
-@@ -1034,31 +1048,33 @@
-   /* Just in case a previous open call failed in a derived device (note that
-      'octets_per_line' is still the same as then): */
-   if (eprn->scan_line.str != NULL)
--    gs_free(eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+    gs_free(device->memory, eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-       "eprn_open_device");
-   if (eprn->next_scan_line.str != NULL) {
--    gs_free(eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+    gs_free(device->memory, eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-       "eprn_open_device");
-     eprn->next_scan_line.str = NULL;
-   }
- 
-   /* Calls which might depend on prn having been initialized */
-   eprn->octets_per_line = gdev_prn_raster((gx_device_printer *)device);
--  eprn->scan_line.str = (eprn_Octet *) gs_malloc(eprn->octets_per_line,
-+  eprn->scan_line.str = (eprn_Octet *) gs_malloc(device->memory, eprn->octets_per_line,
-     sizeof(eprn_Octet), "eprn_open_device");
-   if (eprn->intensity_rendering == eprn_IR_FloydSteinberg) {
--    eprn->next_scan_line.str = (eprn_Octet *) gs_malloc(eprn->octets_per_line,
-+    eprn->next_scan_line.str = (eprn_Octet *) gs_malloc(device->memory, eprn->octets_per_line,
-       sizeof(eprn_Octet), "eprn_open_device");
-     if (eprn->next_scan_line.str == NULL && eprn->scan_line.str != NULL) {
--      gs_free(eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+      gs_free(device->memory, eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
- 	"eprn_open_device");
-       eprn->scan_line.str = NULL;
-     }
-   }
-   if (eprn->scan_line.str == NULL) {
-+#if 0
-     fprintf(stderr, "%s" ERRPREF
-       "Memory allocation failure from gs_malloc() in eprn_open_device().\n",
-       epref);
-+#endif
-     return_error(gs_error_VMerror);
-   }
- 
-@@ -1080,12 +1096,12 @@
- #endif
- 
-   if (eprn->scan_line.str != NULL) {
--    gs_free(eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+    gs_free(device->memory, eprn->scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-       "eprn_close_device");
-     eprn->scan_line.str = NULL;
-   }
-   if (eprn->next_scan_line.str != NULL) {
--    gs_free(eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-+    gs_free(device->memory, eprn->next_scan_line.str, eprn->octets_per_line, sizeof(eprn_Octet),
-       "eprn_close_device");
-     eprn->next_scan_line.str = NULL;
-   }
-@@ -1152,20 +1168,24 @@
-       accounting, this seems unfair.
-   */
-   if (rc == 0 && eprn->CUPS_accounting)
-+#if 0
-     fprintf(stderr, "PAGE: %ld %d\n", dev->ShowpageCount, num_copies);
-     /* The arguments are the number of the page, starting at 1, and the number
-        of copies of that page. */
-+#endif
- 
- #ifndef EPRN_NO_PAGECOUNTFILE
-   /* On success, record the number of pages printed */
-   if (rc == 0 && eprn->pagecount_file != NULL) {
-     assert(num_copies > 0);	/* because of signed/unsigned */
-     if (pcf_inccount(eprn->pagecount_file, num_copies) != 0) {
-+#if 0
-       /* pcf_inccount() has issued an error message. */
-       fputs(
- 	"  No further attempts will be made to access the page count file.\n",
- 	stderr);
--      gs_free(eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
-+#endif
-+      gs_free(dev->memory, eprn->pagecount_file, strlen(eprn->pagecount_file) + 1,
- 	sizeof(char), "eprn_output_page");
-       eprn->pagecount_file = NULL;
-     }
--- print/ghostscript-gpl/files/patch-alps:gdevalps.mak
+++ /dev/null
@@ -1,25 +0,0 @@
---- alps/gdevalps.mak-5.50.orig	Sat Jan 12 13:21:12 2002
-+++ alps/gdevalps.mak-5.50	Sat Jan 12 13:23:45 2002
-@@ -2,15 +2,15 @@
- 
- alps_=$(GLOBJ)gdevalps.$(OBJ)
- 
--md50Mono.dev: $(alps_) page.dev
--	$(SETPDEV) md50Mono $(alps_)
-+$(DD)md50Mono.dev: $(alps_) $(DD)page.dev
-+	$(SETPDEV) $(DD)md50Mono $(alps_)
- 
--md50Eco.dev: $(alps_) page.dev
--	$(SETPDEV) md50Eco $(alps_)
-+$(DD)md50Eco.dev: $(alps_) $(DD)page.dev
-+	$(SETPDEV) $(DD)md50Eco $(alps_)
- 
--md1xMono.dev: $(alps_) page.dev
--	$(SETPDEV) md1xMono $(alps_)
-+$(DD)md1xMono.dev: $(alps_) $(DD)page.dev
-+	$(SETPDEV) $(DD)md1xMono $(alps_)
- 
--$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c $(PDEVH)
-+$(GLOBJ)gdevalps.$(OBJ): $(GLSRC)gdevalps.c  $(gdevprn_h) $(PDEVH)
- 	$(GLCC) $(GLO_)gdevalps.$(OBJ) $(C_) $(GLSRC)gdevalps.c
- 
--- /dev/null
+++ print/ghostscript-gpl/files/Makefile.dmprt
@@ -0,0 +1,9 @@
+# $FreeBSD: ports/print/ghostscript8/files/Makefile.dmprt,v 1.1 2008/05/05 13:16:25 hrs Exp $
+
+post-install-dmprt:
+	${INSTALL_PROGRAM} ${WRKSRC}/${EPAG_NAME}/ert ${PREFIX}/bin
+	cd ${FILESDIR} && \
+		${INSTALL_DATA} lqx70ch.upp lqx70cl.upp lqx70cm.upp \
+		${DATADIR}/${PORTVERSION}/lib
+
+post-install: post-install-dmprt
--- print/ghostscript-gpl/files/patch-mjc:gdevmjc.mak
+++ /dev/null
@@ -1,43 +0,0 @@
---- mjc/gdevmjc.mak.orig	Tue May 23 19:19:13 2000
-+++ mjc/gdevmjc.mak	Tue May 23 19:19:40 2000
-@@ -4,25 +4,22 @@
- # Supports MJ-700V2C, MJ-5000C, MJ-900C, MJ-800C, MJ-500C
- #
- ##
--#
--#  Append this file to Makefile
--#
--##
--MJCSRC = gdevmjc.c mjmtx2.c mjbksep.c mjhtocmy.c mjvtbl.c \
--	mjgrnsp.c mjgrnsp2.c mjespdtc.c mjespdtm.c mjespdty.c mjbarrie.c
-+MJCSRC = $(GLSRC)gdevmjc.c $(GLSRC)mjmtx2.c $(GLSRC)mjbksep.c \
-+	$(GLSRC)mjhtocmy.c $(GLSRC)mjvtbl.c $(GLSRC)mjgrnsp.c \
-+	$(GLSRC)mjgrnsp2.c $(GLSRC)mjespdtc.c $(GLSRC)mjespdtm.c \
-+	$(GLSRC)mjespdty.c $(GLSRC)mjbarrie.c
- 
--mj700v2c_=gdevmjc.$(OBJ) $(HPPCL)
-+mj700v2c_=$(GLOBJ)gdevmjc.$(OBJ) $(HPPCL)
- 
- # To make A4 paper the default, change the second line below this to
--gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
--	$(CCC) -DA4 gdevmjc.c
--
--mjc180.dev: $(mj700v2c_)
--	$(SHP)gssetdev mjc180 $(mj700v2c_)
--mjc360.dev: $(mj700v2c_)
--	$(SHP)gssetdev mjc360 $(mj700v2c_)
--mjc720.dev: $(mj700v2c_)
--	$(SHP)gssetdev mjc720 $(mj700v2c_)
--mj500c.dev: $(mj700v2c_)
--	$(SHP)gssetdev mj500c $(mj700v2c_)
-+$(GLOBJ)gdevmjc.$(OBJ): $(MJCSRC) $(PDEVH) $(gdevpcl_h)
-+	$(GLCC) -DA4 $(GLO_)gdevmjc.$(OBJ) $(C_) $(GLSRC)gdevmjc.c
- 
-+$(GLOBJ)mjc180.dev: $(mj700v2c_) $(DD)page.dev
-+	$(SETPDEV) $(DD)mjc180 $(mj700v2c_)
-+$(GLOBJ)mjc360.dev: $(mj700v2c_) $(DD)page.dev
-+	$(SETPDEV) $(DD)mjc360 $(mj700v2c_)
-+$(GLOBJ)mjc720.dev: $(mj700v2c_) $(DD)page.dev
-+	$(SETPDEV) $(DD)mjc720 $(mj700v2c_)
-+$(GLOBJ)mj500c.dev: $(mj700v2c_) $(DD)page.dev
-+	$(SETPDEV) $(DD)mj500c $(mj700v2c_)
--- print/ghostscript-gpl/files/lex7000.contrib.mak
+++ /dev/null
@@ -1,21 +0,0 @@
-# ------ The Lexmark 5700 and 7000 devices ------ #
-
-lex7000_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex7000.dev: $(lex7000_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex7000 $(lex7000_)
-
-lex5700_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex5700.dev: $(lex5700_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex5700 $(lex5700_)
-
-lex3200_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex3200.dev: $(lex3200_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex3200 $(lex3200_)
-
-lex2050_=$(GLOBJ)gdevlx7.$(OBJ)
-$(DD)lex2050.dev: $(lex2050_) $(DD)page.dev
-	$(SETPDEV) $(DD)lex2050 $(lex2050_)
-
-$(GLOBJ)gdevlx7.$(OBJ): $(GLSRC)gdevlx7.c $(PDEVH)
-	$(GLCC) $(GLO_)gdevlx7.$(OBJ) $(C_) $(GLSRC)gdevlx7.c
-
--- print/ghostscript-gpl/files/patch-lib__ps2epsi.CAN-2004-0967
+++ /dev/null
@@ -1,19 +0,0 @@
---- lib/ps2epsi.orig	Thu May 25 02:19:27 2006
-+++ lib/ps2epsi	Fri Mar 23 10:55:11 2007
-@@ -5,14 +5,8 @@
- # executable name set in the makefile
- GS_EXECUTABLE=gs
- 
--# try to create a temporary file securely
--tmpdir=/tmp/ps2epsi.$$
--(umask 077 && mkdir $tmpdir)
--if test ! -d $tmpdir; then
--	echo "failed: could not create temporary file"
--	exit 1
--fi
--tmpfile=$tmpdir/ps2epsi$$
-+tmpfile=`mktemp -t ps2epsi.XXXXXX || exit 1`
-+trap "rm -rf $tmpfile" 0 1 2 3 7 13 15
- 
- export outfile
- 
--- print/ghostscript-gpl/files/lxm3200.contrib.mak
+++ /dev/null
@@ -1,10 +0,0 @@
-### ---------------- Lexmark 3200 device ----------------- ###
-
-lxm3200_=$(GLOBJ)gdevlx32.$(OBJ)
-
-$(DD)lxm3200.dev: $(lxm3200_) $(DD)page.dev
-	$(SETPDEV) $(DD)lxm3200 $(lxm3200_)
-
-$(GLOBJ)gdevlx32.$(OBJ): $(GLSRC)gdevlx32.c $(PDEVH) $(gsparam_h)
-	$(GLCC) $(GLO_)gdevlx32.$(OBJ) $(C_) $(GLSRC)gdevlx32.c
-
--- print/ghostscript-gpl/files/patch-mjc:gdevmjc.c
+++ /dev/null
@@ -1,413 +0,0 @@
---- mjc/gdevmjc.c.orig	Sat Nov  2 17:58:50 1996
-+++ mjc/gdevmjc.c	Fri Dec 31 16:24:50 2004
-@@ -43,7 +43,8 @@
- #include 
- #include "gdevprn.h"
- #include "gdevpcl.h"
--#include "gsprops.h"
-+#include "gsparam.h"
-+#include "gsstate.h"
- 
- #include "mjmtx2.c"
- #include "mjbksep.c"
-@@ -150,7 +151,9 @@
- 
- /* Undefined macros expected to be defined in gdevpcl.h */
- #define PAPER_SIZE_A3_NOBI 28
-+#ifndef PAPER_SIZE_A2
- #define PAPER_SIZE_A2 29
-+#endif
- #define PAPER_SIZE_B4 30
- #define PAPER_SIZE_B5 31
- 
-@@ -190,18 +193,16 @@
- private dev_proc_print_page(mjc720_print_page);
- private dev_proc_print_page(mj500c_print_page);
- 
--private dev_proc_get_props(mj_get_props);
--private dev_proc_put_props(mj_put_props);
--
--private void expand_line(P4(word*, int, int, int));
--private int put_prop_float(P5(gs_prop_item *, float *, float, float, int));
--private int put_prop_int(P5(gs_prop_item *, int *, int, int, int));
-+private dev_proc_get_params(mj_get_params);
-+private dev_proc_put_params(mj_put_params);
- 
--private void set_bpp(P2(gx_device *, int));
-+private void expand_line(word*, int, int, int);
-+private int mj_put_param_int(gs_param_list *, gs_param_name, int *, int, int, int);
-+private void mj_set_bpp(gx_device *, int);
- 
--private uint gdev_prn_rasterwidth(P2(const gx_device_printer *, int ));
-+private uint gdev_prn_rasterwidth(const gx_device_printer *, int );
- 
--private gx_color_index mjc_correct_color(P2(gx_device_printer *, gx_color_index));
-+private gx_color_index mjc_correct_color(gx_device_printer *, gx_color_index);
- 
- /* The device descriptors */
- struct gx_device_mj_s {
-@@ -224,7 +225,7 @@
- #define mj    ((gx_device_mj *) pdev)
- 
- #define prn_hp_colour_device(procs, dev_name, x_dpi, y_dpi, bpp, print_page)\
--    prn_device_body(gx_device_printer, procs, dev_name,\
-+    prn_device_body(gx_device_mj, procs, dev_name,\
-     WIDTH_10THS, HEIGHT_10THS, x_dpi, y_dpi, 0, 0, 0, 0, 0,\
-     bpp, 0, 0, 0, 0, print_page)
- 
-@@ -235,9 +236,9 @@
- }
- 
- 
--#define mj_colour_procs(proc_colour_open, proc_get_props, proc_put_props) {\
-+#define mj_colour_procs(proc_colour_open, proc_get_params, proc_put_params) {\
- 	proc_colour_open,\
--	gdev_pcl_get_initial_matrix,\
-+	gx_default_get_initial_matrix,\
- 	gx_default_sync_output,\
- 	gdev_prn_output_page,\
- 	gdev_prn_close,\
-@@ -249,15 +250,15 @@
- 	NULL,	/* copy_color */\
- 	NULL,	/* draw_line */\
- 	gx_default_get_bits,\
--	proc_get_props,\
--	proc_put_props\
-+	proc_get_params,\
-+	proc_put_params\
- }
- 
--private int mjc_open(P1(gx_device *));
--private int mj_colour_open(P1(gx_device *));
-+private int mjc_open(gx_device *);
-+private int mj_colour_open(gx_device *);
- 
- private gx_device_procs mj_procs =
--mj_colour_procs(mjc_open, mj_get_props, mj_put_props);
-+mj_colour_procs(mjc_open, mj_get_params, mj_put_params);
- 
- gx_device_mj far_data gs_mjc180_device =
- mj_device(mj_procs, "mjc180", 180, 180, BITSPERPIXEL,
-@@ -306,14 +307,14 @@
-   static const float mj_b4[4] = { MJ700V2C_MARGINS_B4 };
-   static const float mj_b5[4] = { MJ700V2C_MARGINS_B5 };
-   static const float mj_letter[4] = { MJ700V2C_MARGINS_LETTER };
--  const float _ds *m;
-+  const float *m;
-   int psize;
- 
-   int paper_size;
- 
-   /* Set up colour params if put_props has not already done so */
-   if (pdev->color_info.num_components == 0)
--    set_bpp(pdev, pdev->color_info.depth);
-+    mj_set_bpp(pdev, pdev->color_info.depth);
- 
-   paper_size = gdev_mjc_paper_size(pdev);
-   if (paper_size == PAPER_SIZE_A2 ) {
-@@ -332,10 +333,7 @@
-     m = mj_letter;
-   }
- 
--  pdev->l_margin = m[0];
--  pdev->b_margin = m[1];
--  pdev->r_margin = m[2];
--  pdev->t_margin = m[3];
-+  gx_device_set_margins(pdev, m, true);
- 
-   switch (mj->colorcomp) {
-   case 1:
-@@ -360,84 +358,78 @@
-  * and control over the bits-per-pixel used in output rendering */
- /* Added properties for DeskJet 5xxC */
- 
--private const gs_prop_item props_mj[] = {
--  /* Read-write properties. */
--  prop_def("Density", prt_int),
--  prop_def("Cyan", prt_int),
--  prop_def("Magenta", prt_int),
--  prop_def("Yellow", prt_int),
--  prop_def("Black", prt_int),
--  prop_def("Dither", prt_int),
--  prop_def("ColorComponent", prt_int),
--  prop_def("Direction", prt_int),
--  prop_def("MicroWeave", prt_int),
--  prop_def("DotSize", prt_int),
--};
--
- private int
--mj_get_props(gx_device *pdev, gs_prop_item *plist)
--{	int start = gdev_prn_get_props(pdev, plist);
--	if ( plist != 0 ) {
--		register gs_prop_item *pi = plist + start;
--		memcpy(pi, props_mj, sizeof(props_mj));
--		pi[0].value.i = mj->density;
--		pi[1].value.i = mj->cyan;
--		pi[2].value.i = mj->magenta;
--		pi[3].value.i = mj->yellow;
--		pi[4].value.i = mj->black;
--		pi[5].value.i = mj->dither;
-- 		pi[6].value.i = mj->colorcomp;
--		pi[7].value.i = mj->direction;
--		pi[8].value.i = mj->microweave;
--		pi[9].value.i = mj->dotsize;
--	}
--	return start + sizeof(props_mj) / sizeof(gs_prop_item);
-+mj_get_params(gx_device *pdev, gs_param_list *plist)
-+{	int code = gdev_prn_get_params(pdev, plist);
-+	if ( code < 0 ||
-+	    (code = param_write_int(plist, "Density", &mj->density)) < 0 ||
-+	    (code = param_write_int(plist, "Cyan", &mj->cyan)) < 0 ||
-+	    (code = param_write_int(plist, "Magenta", &mj->magenta)) < 0 ||
-+	    (code = param_write_int(plist, "Yellow", &mj->yellow)) < 0 ||
-+	    (code = param_write_int(plist, "Black", &mj->black)) < 0 ||
-+	    (code = param_write_int(plist, "Dither", &mj->dither)) < 0 ||
-+	    (code = param_write_int(plist, "ColorComponent", &mj->colorcomp)) < 0 ||
-+	    (code = param_write_int(plist, "Direction", &mj->direction)) < 0 ||
-+	    (code = param_write_int(plist, "MicroWeave", &mj->microweave)) < 0 ||
-+	    (code = param_write_int(plist, "DotSize", &mj->dotsize)) < 0
-+	   )
-+	  return code;
-+	return code;
- }
- 
- /* Put properties. */
- private int
--mj_put_props(gx_device *pdev,  gs_prop_item *plist,  int count)
-+mj_put_params(gx_device *pdev, gs_param_list *plist)
- {
--	static const argn = 10;
--/* 	gs_prop_item *known[argn]; */
-- 	gs_prop_item *known[10];
- 	int old_bpp = mj->color_info.depth;
- 	int bpp = 0;
- 	int code = 0;
--
--	props_extract(plist, count, props_mj, argn, known, 0);
--	code = gdev_prn_put_props(pdev, plist, count);
--	if ( code < 0 ) return code;
--
--	code = put_prop_int(known[0], &mj->density, 0, INT_MAX, code);
--	code = put_prop_int(known[1], &mj->cyan, 0, INT_MAX, code);
--	code = put_prop_int(known[2], &mj->magenta, 0, INT_MAX, code);
--	code = put_prop_int(known[3], &mj->yellow, 0, INT_MAX, code);
--	code = put_prop_int(known[4], &mj->black, 0, INT_MAX, code);
--	code = put_prop_int(known[5], &mj->dither, 0, 1, code);
-- 	code = put_prop_int(known[6], &mj->colorcomp, 1, 4, code);
--	code = put_prop_int(known[7], &mj->direction, 1, 2, code);
--	code = put_prop_int(known[8], &mj->microweave, 0, 1, code);
--	code = put_prop_int(known[9], &mj->dotsize, 0, 1, code);
--
-+	int density = mj->density;
-+	int cyan = mj->cyan;
-+	int magenta = mj->magenta;
-+	int yellow = mj->yellow;
-+	int black = mj->black;
-+	int dither = mj->dither;
-+	int colorcomp = mj->colorcomp;
-+	int direction = mj->direction;
-+	int microweave = mj->microweave;
-+	int dotsize = mj->dotsize;
-+	code = mj_put_param_int(plist, "Density", &density, 0, INT_MAX, code);
-+	code = mj_put_param_int(plist, "Cyan", &cyan, 0, INT_MAX, code);
-+	code = mj_put_param_int(plist, "Magenta", &magenta, 0, INT_MAX, code);
-+	code = mj_put_param_int(plist, "Yellow", &yellow, 0, INT_MAX, code);
-+	code = mj_put_param_int(plist, "Black", &black, 0, INT_MAX, code);
-+	code = mj_put_param_int(plist, "Dither", &dither, 0, 1, code);
-+	code = mj_put_param_int(plist, "ColorComponent", &colorcomp, 1, 4, code);
-+	code = mj_put_param_int(plist, "Direction", &direction, 1, 2, code);
-+	code = mj_put_param_int(plist, "MicroWeave", µweave, 0, 1, code);
-+	code = mj_put_param_int(plist, "DotSize", &dotsize, 0, 1, code);
-+	code = mj_put_param_int(plist, "BitsPerPixel", &bpp, 1, 32, code);
- 	if ( code < 0 )
--	  return_error(code);
--
--	if (bpp != 0) {
--	  set_bpp(pdev, bpp);
--	  
--	  /* Close the device; gs_putdeviceprops will reopen it. */
-+	  return code;
-+	mj->density = density;
-+	mj->cyan = cyan;
-+	mj->magenta = magenta;
-+	mj->yellow = yellow;
-+	mj->black = black;
-+	mj->dither = dither;
-+	mj->colorcomp = colorcomp;
-+	mj->direction = direction;
-+	mj->microweave = microweave;
-+	mj->dotsize = dotsize;
-+	if ( bpp != 0 ) {
-+	  mj_set_bpp(pdev, bpp);
-+	  gdev_prn_put_params(pdev, plist);
- 	  if ( bpp != old_bpp && pdev->is_open )
--	    { int ccode = gs_closedevice(pdev);
--	      if ( ccode < 0 ) return ccode;
--	    }
-+	    return gs_closedevice(pdev);
-+	  return 0;
- 	}
--
--	return code;
-+	else
-+	  return gdev_prn_put_params(pdev, plist);
- }
- 
- /* ------ Internal routines ------ */
--private int mj_colour_print_page(P3(gx_device_printer *, FILE *, int));
-+private int mj_colour_print_page(gx_device_printer *, FILE *, int);
- 
- 
- private int
-@@ -988,7 +980,7 @@
- 
- /* NOZ */
-   xtalbuff_size = plane_size*8 + 64;
--  xtalbuff = (short *) gs_malloc( xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
-+  xtalbuff = (short *) gs_malloc(pdev->memory, xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
-   memset(xtalbuff, 0, xtalbuff_size*(16*4+2*4) * W);
-   {
-   	int i;
-@@ -1027,12 +1019,12 @@
-   	p += xtalbuff_size;
-   }
- 
--  storage = (word *) gs_malloc(storage_size_words, W, "mj_colour_print_page");
-+  storage = (word *) gs_malloc(pdev->memory, storage_size_words, W, "mj_colour_print_page");
- 
- /* prepare a temporary buffer for mj_raster_cmd */
- 
-   mj_tmp_buf_size = plane_size;
--  mj_tmp_buf = (byte *) gs_malloc(mj_tmp_buf_size, W ,"mj_raster_buffer");
-+  mj_tmp_buf = (byte *) gs_malloc(pdev->memory, mj_tmp_buf_size, W ,"mj_raster_buffer");
- 
- #if 0
-   fprintf(stderr, "storage_size_words :%d\n", storage_size_words);
-@@ -1163,7 +1155,8 @@
- 
-   /* Send each scan line in turn */
-   {
--    long int lend = pdev->height - (pdev->t_margin + pdev->b_margin) * y_dpi;
-+    long int lend = pdev->height - 
-+	(dev_t_margin_points(pdev) + dev_b_margin_points(pdev));
-     int cErr, mErr, yErr, kErr;
-     int this_pass, i;
-     long int lnum;
-@@ -1403,19 +1396,19 @@
-     fflush(prn_stream);
-   }
-   /* free temporary storage */
--  gs_free((char *) storage, storage_size_words, W, "mj_colour_print_page");
--  gs_free((char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer");
--  gs_free((char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
-+  gs_free(pdev->memory, (char *) storage, storage_size_words, W, "mj_colour_print_page");
-+  gs_free(pdev->memory, (char *) mj_tmp_buf, mj_tmp_buf_size, W, "mj_raster_buffer");
-+  gs_free(pdev->memory, (char *) xtalbuff , xtalbuff_size*(16*4+2*4) , W, "mj_colour_print_barrier");
- 
-   return 0;
- }
- 
- void 
- mj_color_correct(gx_color_value *Rptr ,gx_color_value *Gptr , gx_color_value *Bptr )
--								/* R,G,B : 0?`255 */
-+								/* R,G,B : 0)B?`255 */
- {
--	short	R,G,B;				/* R,G,B : 0?`255  */
--	short	C,M,Y;				/* C,M,Y : 0?`1023 */
-+	short	R,G,B;				/* R,G,B : 0)B?`255  */
-+	short	C,M,Y;				/* C,M,Y : 0)B?`1023 */
- 	short	H,D,Wa;				/* ese-HSV         */
- 	long	S;					/*     HSV         */
- 
-@@ -1517,9 +1510,11 @@
-  * c, m, y, inks by reducing the cyan component to give a truer black.
-  */
- private gx_color_index
--gdev_mjc_map_rgb_color(gx_device *pdev, gx_color_value r,
--				 gx_color_value g, gx_color_value b)
-+gdev_mjc_map_rgb_color(gx_device *pdev, const gx_color_value cv[])
- {
-+  gx_color_value r = cv[0];
-+  gx_color_value g = cv[1];
-+  gx_color_value b = cv[2];
-   if (gx_color_value_to_byte(r & g & b) == 0xff)
-     return (gx_color_index)0;         /* white */
-   else {
-@@ -1685,39 +1680,25 @@
- }
- 
- private int
--put_prop_int(gs_prop_item *pi, int *property, int minval, int maxval, int code)
--{
--  if ( pi == 0 )
--    return (code);
--  
--  if ( pi->value.i < minval || pi->value.i > maxval )
--    { pi->status = pv_rangecheck;
--      return (gs_error_rangecheck);
--    }
--  else
--    { *property = pi->value.i;
--      return (code ? code : 1);
--    }
--}	
--
--private int
--put_prop_float(gs_prop_item *pi, float *property, float minval, float maxval, int code)
--{
--  if ( pi == 0 )
--    return (code);
--  
--  if ( pi->value.f < minval || pi->value.f > maxval )
--    { pi->status = pv_rangecheck;
--      return (gs_error_rangecheck);
--    }
--  else
--    { *property = pi->value.f;
--      return (code ? code : 1);
--    }
-+mj_put_param_int(gs_param_list *plist, gs_param_name pname, int *pvalue,
-+  int minval, int maxval, int ecode)
-+{	int code, value;
-+	switch ( code = param_read_int(plist, pname, &value) )
-+	{
-+	default:
-+		return code;
-+	case 1:
-+		return ecode;
-+	case 0:
-+		if ( value < minval || value > maxval )
-+		   param_signal_error(plist, pname, gs_error_rangecheck);
-+		*pvalue = value;
-+		return (ecode < 0 ? ecode : 1);
-+	}
- }	
- 
- private void
--set_bpp(gx_device *pdev, int bits_per_pixel)
-+mj_set_bpp(gx_device *pdev, int bits_per_pixel)
- { gx_device_color_info *ci = &pdev->color_info;
-   /* Only valid bits-per-pixel are 1, 3, 8, 16, 24, 32 */
-   int bpp = bits_per_pixel < 3 ? 1 : bits_per_pixel < 8 ? 3 : 
-@@ -1725,9 +1706,9 @@
-   ci->num_components = ((bpp == 1) || (bpp == 8) ? 1 : 3);
-   ci->depth = ((bpp > 1) && (bpp < 8) ? 8 : bpp);
-   ci->max_gray = (bpp >= 8 ? 255 : 1);
--  ci->max_rgb = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
--  ci->dither_gray = (bpp >= 8 ? 5 : 2);
--  ci->dither_rgb = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
-+  ci->max_color = (bpp >= 8 ? 255 : bpp > 1 ? 1 : 0);
-+  ci->dither_grays = (bpp >= 8 ? 5 : 2);
-+  ci->dither_colors = (bpp >= 8 ? 5 : bpp > 1 ? 2 : 0);
- }
- 
- /* This returns either the number of pixels in a scan line, or the number
-@@ -1736,7 +1717,7 @@
- gdev_prn_rasterwidth(const gx_device_printer *pdev, int pixelcount)
- {
-   word raster_width =
--    pdev->width - pdev->x_pixels_per_inch * (pdev->l_margin + pdev->r_margin);
-+    pdev->width - (pdev->HWMargins[0] + pdev->HWMargins[2]);
-   return (pixelcount ?
-           (uint)raster_width :
-           (uint)((raster_width * pdev->color_info.depth + 7) >> 3));
--- print/ghostscript-gpl/files/patch-pcl3_eprn_eprnrend.c
+++ /dev/null
@@ -1,182 +0,0 @@
---- pcl3/eprn/eprnrend.c.orig	Wed Aug  1 14:12:56 2001
-+++ pcl3/eprn/eprnrend.c	Tue May 24 20:19:18 2005
-@@ -161,8 +161,11 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_rgb_color_for_RGB(gx_device *device,
--  gx_color_value red, gx_color_value green, gx_color_value blue)
-+  const gx_color_value cv[])
- {
-+  gx_color_value red = cv[0]; 
-+  gx_color_value green = cv[1]; 
-+  gx_color_value blue = cv[2];
-   static const gx_color_value half = gx_max_color_value/2;
-   gx_color_index value = 0;
-   const eprn_Device *dev = (eprn_Device *)device;
-@@ -197,8 +200,11 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_rgb_color_for_CMY_or_K(gx_device *device,
--  gx_color_value red, gx_color_value green, gx_color_value blue)
-+  const gx_color_value cv[])
- {
-+  gx_color_value red = cv[0];
-+  gx_color_value green = cv[1];
-+  gx_color_value blue = cv[2];
-   static const gx_color_value half = gx_max_color_value/2;
-   gx_color_index value = (CYAN_BIT | MAGENTA_BIT | YELLOW_BIT);
-   const eprn_Device *dev = (eprn_Device *)device;
-@@ -240,8 +246,11 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_rgb_color_for_RGB_flex(gx_device *device,
--  gx_color_value red, gx_color_value green, gx_color_value blue)
-+  const gx_color_value cv[])
- {
-+  gx_color_value red = cv[0]; 
-+  gx_color_value green = cv[1]; 
-+  gx_color_value blue = cv[2];
-   gx_color_index value = 0;
-   gx_color_value step;
-   unsigned int level;
-@@ -284,8 +293,12 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_rgb_color_for_CMY_or_K_flex(gx_device *device,
--  gx_color_value red, gx_color_value green, gx_color_value blue)
-+  const gx_color_value cv[])
- {
-+  gx_color_value red = cv[0];
-+  gx_color_value green = cv[1];
-+  gx_color_value blue = cv[2];
-+  gx_color_value tmpcv[4];
-   const eprn_Device *dev = (eprn_Device *)device;
- 
- #ifdef EPRN_TRACE
-@@ -298,11 +311,17 @@
-   /* Treat pure grey levels differently if we have black. This implies that for
-      CMY+K only "true" grey shades will be printed with black ink, all others
-      will be mixed from CMY. */
--  if (dev->eprn.colour_model != eprn_DeviceCMY && red == green && green == blue)
--    return eprn_map_cmyk_color_flex(device, 0, 0, 0, gx_max_color_value - red);
-+  if (dev->eprn.colour_model != eprn_DeviceCMY && red == green && green == blue) {
-+    tmpcv[0] = 0; tmpcv[1] = 0; tmpcv[2] = 0;
-+    tmpcv[3] = gx_max_color_value - red;
-+    return eprn_map_cmyk_color_flex(device, tmpcv);
- 
--  return eprn_map_cmyk_color_flex(device, gx_max_color_value - red,
--    gx_max_color_value - green, gx_max_color_value - blue, 0);
-+  }
-+  tmpcv[0] = gx_max_color_value - red; 
-+  tmpcv[1] = gx_max_color_value - green; 
-+  tmpcv[2] = gx_max_color_value - blue; 
-+  tmpcv[3] = 0;
-+  return eprn_map_cmyk_color_flex(device, tmpcv);
- }
- 
- /******************************************************************************
-@@ -315,8 +334,11 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_rgb_color_for_RGB_max(gx_device *device,
--  gx_color_value red, gx_color_value green, gx_color_value blue)
-+  const gx_color_value cv[])
- {
-+  gx_color_value red = cv[0]; 
-+  gx_color_value green = cv[1];
-+  gx_color_value blue = cv[2];
-   gx_color_index value;
- 
- #ifdef EPRN_TRACE
-@@ -345,8 +367,12 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_rgb_color_for_CMY_or_K_max(gx_device *device,
--  gx_color_value red, gx_color_value green, gx_color_value blue)
-+  const gx_color_value cv[])
- {
-+  gx_color_value red = cv[0];
-+  gx_color_value green = cv[1];
-+  gx_color_value blue = cv[2];
-+  gx_color_value tmpcv[4];
-   const eprn_Device *dev = (eprn_Device *)device;
- 
- #ifdef EPRN_TRACE
-@@ -356,13 +382,18 @@
-     red, green, blue);
- #endif
- 
--  if (dev->eprn.colour_model == eprn_DeviceGray)
--    return eprn_map_cmyk_color_max(device, 0, 0, 0, gx_max_color_value - red);
--
-+  if (dev->eprn.colour_model == eprn_DeviceGray) {
-+    tmpcv[0] = 0; tmpcv[1] = 0; tmpcv[2] = 0;
-+    tmpcv[3] = gx_max_color_value - red;
-+    return eprn_map_cmyk_color_max(device, tmpcv);
-+  }
-   /* Note that the conversion from composite black to true black for CMY+K can
-      only happen at the output pixel level, not here. */
--  return eprn_map_cmyk_color_max(device, gx_max_color_value - red,
--    gx_max_color_value - green, gx_max_color_value - blue, 0);
-+  tmpcv[0] = gx_max_color_value - red; 
-+  tmpcv[1] = gx_max_color_value - green; 
-+  tmpcv[2] = gx_max_color_value - blue; 
-+  tmpcv[3] = 0;
-+  return eprn_map_cmyk_color_max(device, tmpcv);
- }
- 
- /******************************************************************************
-@@ -389,7 +420,7 @@
- ******************************************************************************/
- 
- int eprn_map_color_rgb(gx_device *device, gx_color_index color,
--  gx_color_value rgb[3])
-+  gx_color_value rgb[])
- {
- #ifdef EPRN_TRACE
-   if_debug1(EPRN_TRACE_CHAR,
-@@ -415,9 +446,12 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_cmyk_color(gx_device *device,
--  gx_color_value cyan, gx_color_value magenta, gx_color_value yellow,
--  gx_color_value black)
-+  const gx_color_value cv[])
- {
-+  gx_color_value cyan = cv[0];
-+  gx_color_value magenta = cv[1];
-+  gx_color_value yellow = cv[2];
-+  gx_color_value black = cv[3];
-   gx_color_index value = 0;
-   static const gx_color_value threshold = gx_max_color_value/2;
- 
-@@ -449,9 +483,12 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_cmyk_color_flex(gx_device *device,
--  gx_color_value cyan, gx_color_value magenta, gx_color_value yellow,
--  gx_color_value black)
-+  const gx_color_value cv[])
- {
-+  gx_color_value cyan = cv[0];
-+  gx_color_value magenta = cv[1];
-+  gx_color_value yellow = cv[2];
-+  gx_color_value black = cv[3];
-   gx_color_index value = 0;
-   gx_color_value step;
-   unsigned int level;
-@@ -530,9 +567,12 @@
- ******************************************************************************/
- 
- gx_color_index eprn_map_cmyk_color_max(gx_device *device,
--  gx_color_value cyan, gx_color_value magenta, gx_color_value yellow,
--  gx_color_value black)
-+  const gx_color_value cv[])
- {
-+  gx_color_value cyan = cv[0];
-+  gx_color_value magenta = cv[1];
-+  gx_color_value yellow = cv[2];
-+  gx_color_value black = cv[3];
-   gx_color_index value;
- 
- #ifdef EPRN_TRACE
--- print/ghostscript-gpl/files/patch-src:gdevlbp8.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- src/gdevlbp8.c.orig	Wed Aug  1 09:48:23 2001
-+++ src/gdevlbp8.c	Thu Mar 14 20:56:05 2002
-@@ -22,6 +22,8 @@
- 
- /* 
-   Modifications:
-+    3.10.00 Johnny Lam
-+            Removed LIPS III code, as it's obsoleted by gdevlips driver.
-     2.2.97  Lauri Paatero
-             Changed CSI command into ESC [. DCS commands may still need to be changed
-             (to ESC P).
-@@ -49,7 +51,6 @@
- 
- /* The device descriptors */
- private dev_proc_print_page(lbp8_print_page);
--private dev_proc_print_page(lips3_print_page);
- 
- const gx_device_printer far_data gs_lbp8_device =
-   prn_device(prn_std_procs, "lbp8",
-@@ -58,14 +59,6 @@
- 	0.16, 0.2, 0.32, 0.21,		/* margins: left, bottom, right, top */
- 	1, lbp8_print_page);
- 
--const gx_device_printer far_data gs_lips3_device =
--  prn_device(prn_std_procs, "lips3",
--	82,				/* width_10ths, 8.3" */
--	117,				/* height_10ths, 11.7" */
--	X_DPI, Y_DPI,
--	0.16, 0.27, 0.23, 0.27,		/* margins */
--	1, lips3_print_page);
--
- /* ------ Internal routines ------ */
- 
- #define ESC 0x1b
-@@ -84,23 +77,6 @@
- 
- static const char *lbp8_end = NULL;
- 
--static const char lips3_init[] = {
--  ESC, '<', /* soft reset */
--  DCS, '0', 'J', ST, /* JOB END */
--  DCS, '3', '1', ';', '3', '0', '0', ';', '2', 'J', ST, /* 300dpi, LIPS3 JOB START */
--  ESC, '<',  /* soft reset */
--  DCS, '2', 'y', 'P', 'r', 'i', 'n', 't', 'i', 'n', 'g', '(', 'g', 's', ')', ST,  /* Printing (gs) display */
--  ESC, '[', '?', '1', 'l',  /* auto cr-lf disable */
--  ESC, '[', '?', '2', 'h', /* auto ff disable */
--  ESC, '[', '1', '1', 'h', /* set mode */
--  ESC, '[', '7', ' ', 'I', /* select unit size (300dpi)*/
--  ESC, '[', 'f' /* move to home position */
--};
--
--static const char lips3_end[] = {
--  DCS, '0', 'J', ST  /* JOB END */
--};
--
- /* Send the page to the printer.  */
- private int
- can_print_page(gx_device_printer *pdev, FILE *prn_stream,
-@@ -203,11 +179,4 @@
- lbp8_print_page(gx_device_printer *pdev, FILE *prn_stream)
- {	return can_print_page(pdev, prn_stream, lbp8_init, sizeof(lbp8_init),
- 			      lbp8_end, sizeof(lbp8_end));
--}
--
--/* Print a LIPS III page. */
--private int
--lips3_print_page(gx_device_printer *pdev, FILE *prn_stream)
--{	return can_print_page(pdev, prn_stream, lips3_init, sizeof(lips3_init),
--			      lips3_end, sizeof(lips3_end));
- }
--- /dev/null
+++ print/ghostscript-gpl/files/pkg-message.in
@@ -0,0 +1,8 @@
+Note: in order to use the script dvipdf, dvips must be installed.
+This program may be provided by either print/dvips or print/dvipsk-tetex
+(print/dvipsk-tetex may be preferable since it doesn't conflict with
+tetex things).
+
+Also note that FAPIfontmap and FAPIcidfmap in
+%%DATADIR%%/%%PORTVERSION%%/lib have to be configured first if
+WITH_FT_BRIDGE is enabled.
--- print/ghostscript-gpl/files/patch-src:gdevvglb.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/gdevvglb.c.orig	Fri Feb 22 07:24:52 2002
-+++ src/gdevvglb.c	Tue May 20 23:57:29 2003
-@@ -152,10 +152,12 @@
- }
- 
- private gx_color_index
--vgalib_map_rgb_color(gx_device * dev, gx_color_value red,
--		     gx_color_value green, gx_color_value blue)
-+vgalib_map_rgb_color(gx_device * dev, const gx_color_value cv[])
- {
--    return pc_4bit_map_rgb_color(dev, red, green, blue);
-+    gx_color_value red = cv[0];
-+    gx_color_value green = cv[1];
-+    gx_color_value blue = cv[2];
-+    return pc_4bit_map_rgb_color(dev, cv);
- }
- 
- private int
--- /dev/null
+++ print/ghostscript-gpl/files/patch-src__devs.mak
@@ -0,0 +1,25 @@
+--- src/devs.mak.orig	Thu Jun  7 07:03:27 2007
++++ src/devs.mak	Wed Aug  8 23:26:52 2007
+@@ -426,11 +426,11 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)lvga256.so: $(lvga256_)
+-	$(CCLD) -shared -Wl,'-solvga256.so' $(lvga256_) -lvga -lvgagl
++	$(CCLD) -shared -Wl,'-solvga256.so' $(lvga256_) -lvga -lvgagl $(XLDFLAGS)
+ 	mv lvga256.so $(GLOBJ)lvga256.so
+ 
+ $(GLOBJ)vgalib.so: $(vgalib_)
+-	$(CCLD) -shared -Wl,'-sovgalib.so' $(vgalib_) -lvga -lvgagl
++	$(CCLD) -shared -Wl,'-sovgalib.so' $(vgalib_) -lvga -lvgagl $(XLDFLAGS)
+ 	mv vgalib.so $(GLOBJ)vgalib.so
+ 
+ ### -------------------------- The X11 device -------------------------- ###
+@@ -534,7 +534,7 @@
+ ### NON PORTABLE, ONLY UNIX WITH GCC SUPPORT
+ 
+ $(GLOBJ)X11.so: $(x11alt_) $(x11_)
+-	$(CCLD) -shared -Wl,'-soX11.so' $(x11alt_) $(x11_) -L/usr/X11R6/lib -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
++	$(CCLD) -shared -Wl,'-soX11.so' $(x11alt_) $(x11_) -lXt -lSM -lICE -lXext -lX11 $(XLIBDIRS)
+ 	mv X11.so $(GLOBJ)X11.so
+ 
+ ###### --------------- Memory-buffered printer devices --------------- ######
--- print/ghostscript-gpl/files/patch-lips__gdevnpdl.c
+++ /dev/null
@@ -1,20 +0,0 @@
---- lips/gdevnpdl.c.orig	Thu Nov  2 12:09:18 2000
-+++ lips/gdevnpdl.c	Fri Dec 31 17:32:52 2004
-@@ -582,7 +582,7 @@
-     int code;
-     int maxY = lprn->BlockLine / lprn->nBh * lprn->nBh;
- 
--    if (!(lprn->CompBuf = gs_malloc(line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)")))
-+    if (!(lprn->CompBuf = gs_malloc(pdev->memory, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)")))
- 	return_error(gs_error_VMerror);
- 
- 
-@@ -680,7 +680,7 @@
-     /* Form Feed */
-     fputs("\014", prn_stream);
- 
--    gs_free(lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)");
-+    gs_free(pdev->memory, lprn->CompBuf, line_size * maxY, sizeof(byte), "npdl_print_page_copies(CompBuf)");
-     return 0;
- }
- 

From laffer1 at midnightbsd.org  Sun Jan  4 13:53:34 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 13:53:34 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: Enable JRE 6 on CURRENT.
Message-ID: <200901041853.n04IrYq1064298@stargazer.midnightbsd.org>

Log Message:
-----------
Enable JRE 6 on CURRENT.  Require compat6x as we can't use the freebsd 7 binary due to the GCC 3 vs GCC 4 situation.

Modified Files:
--------------
    mports/java/diablo-jre16:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/java/diablo-jre16/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L java/diablo-jre16/Makefile -L java/diablo-jre16/Makefile -u -r1.3 -r1.4
--- java/diablo-jre16/Makefile
+++ java/diablo-jre16/Makefile
@@ -8,6 +8,7 @@
 
 PORTNAME=	jre
 PORTVERSION=	${JRE_VERSION}.${RELEASE_VERSION}.${BUILD_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 MASTER_SITES=	#
 PKGNAMEPREFIX=	diablo-
@@ -52,7 +53,9 @@
 .include 
 
 .if ${OSVERSION} >= 3000
-JRE_OSREL=	freebsd7
+#JRE_OSREL=	freebsd7 borked until GCC 4
+LIB_DEPENDS+=	c.6:${PORTSDIR}/misc/compat6x
+JRE_OSREL=	freebsd6
 PLIST_SUB+=	RELEASENOTE="@comment "
 .elif ${OSVERSION} >= 1000
 BROKEN=		required gethostbyname_r

From ctriv at midnightbsd.org  Sun Jan  4 14:35:46 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 14:35:46 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: audio/vorbis-tools: Added
	vorbis-tools-1.2.0
Message-ID: <200901041935.n04JZk5f068612@stargazer.midnightbsd.org>

Log Message:
-----------
Added vorbis-tools-1.2.0

Added Files:
-----------
    mports/audio/vorbis-tools:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/audio/vorbis-tools/files:
        patch-configure (r1.1)
        patch-ogg123_Makefile.in (r1.1)
        patch-ogg123_speex_format.c (r1.1)

-------------- next part --------------
--- /dev/null
+++ audio/vorbis-tools/pkg-descr
@@ -0,0 +1,13 @@
+Vorbis is a general-purpose audio and music encoding format
+contemporary to MPEG-4's AAC and TwinVQ, the next generation beyond
+MPEG audio layer 3.  Unlike the MPEG sponsored formats (and other
+proprietary formats such as RealAudio G2 and Windows' flavor of the
+month), the Vorbis CODEC specification belongs to the public domain.
+All the technical details are published and documented, and any
+software entity may make full use of the format without royalty or
+patent concerns.
+
+This package contains utilities to encode, decode, and cut vorbis
+streams, and to add comments to them.
+
+WWW: http://www.vorbis.com/
--- /dev/null
+++ audio/vorbis-tools/pkg-plist
@@ -0,0 +1,21 @@
+ at comment $FreeBSD: ports/audio/vorbis-tools/pkg-plist,v 1.8 2005/07/05 13:38:19 naddy Exp $
+bin/ogg123
+bin/oggdec
+bin/oggenc
+bin/ogginfo
+bin/vcut
+bin/vorbiscomment
+share/examples/vorbis-tools/ogg123rc
+share/locale/be/LC_MESSAGES/vorbis-tools.mo
+share/locale/cs/LC_MESSAGES/vorbis-tools.mo
+share/locale/da/LC_MESSAGES/vorbis-tools.mo
+share/locale/es/LC_MESSAGES/vorbis-tools.mo
+share/locale/fr/LC_MESSAGES/vorbis-tools.mo
+share/locale/hr/LC_MESSAGES/vorbis-tools.mo
+share/locale/hu/LC_MESSAGES/vorbis-tools.mo
+share/locale/nl/LC_MESSAGES/vorbis-tools.mo
+share/locale/ro/LC_MESSAGES/vorbis-tools.mo
+share/locale/ru/LC_MESSAGES/vorbis-tools.mo
+share/locale/sv/LC_MESSAGES/vorbis-tools.mo
+share/locale/uk/LC_MESSAGES/vorbis-tools.mo
+ at dirrm share/examples/vorbis-tools
--- /dev/null
+++ audio/vorbis-tools/Makefile
@@ -0,0 +1,37 @@
+#
+# $MidnightBSD: mports/audio/vorbis-tools/Makefile,v 1.1 2009/01/04 19:35:44 ctriv Exp $
+#
+
+PORTNAME=	vorbis-tools
+PORTVERSION=	1.2.0
+CATEGORIES=	audio
+MASTER_SITES=	http://downloads.xiph.org/releases/vorbis/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Play, encode, and manage Ogg Vorbis files
+LICENSE=	gpl2
+
+LIB_DEPENDS=	ao.3:${PORTSDIR}/audio/libao \
+		curl.4:${PORTSDIR}/ftp/curl \
+		FLAC.10:${PORTSDIR}/audio/flac \
+		speex.1:${PORTSDIR}/audio/speex \
+		vorbis.4:${PORTSDIR}/audio/libvorbis
+
+USE_GETTEXT=	yes
+
+GNU_CONFIGURE=	yes
+CONFIGURE_TARGET= --build=${ARCH}-portbld-freebsd6.0
+CONFIGURE_ARGS=	--enable-vcut
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib" \
+		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
+		PTHREAD_LIBS="${PTHREAD_LIBS}"
+
+MAN1=		ogg123.1 oggdec.1 oggenc.1 ogginfo.1 vcut.1 vorbiscomment.1
+
+post-install:
+	${MKDIR} ${PREFIX}/share/examples/vorbis-tools
+	${INSTALL_DATA} ${WRKSRC}/ogg123/ogg123rc-example \
+		${PREFIX}/share/examples/vorbis-tools/ogg123rc
+
+.include 
--- /dev/null
+++ audio/vorbis-tools/distinfo
@@ -0,0 +1,3 @@
+MD5 (vorbis-tools-1.2.0.tar.gz) = df976d24e51ef3d87cd462edf747bf9a
+SHA256 (vorbis-tools-1.2.0.tar.gz) = dbe753ce0ae0797f25117720bb2ba0d848388d3f47af8db31ebc35552c3de07b
+SIZE (vorbis-tools-1.2.0.tar.gz) = 1076814
--- /dev/null
+++ audio/vorbis-tools/files/patch-configure
@@ -0,0 +1,22 @@
+--- configure.orig	2008-03-03 06:48:08.000000000 +0100
++++ configure	2008-03-12 19:43:37.000000000 +0100
+@@ -27301,7 +27301,7 @@
+                 ;;
+         *)
+                 DEBUG="-g"
+-                CFLAGS="-O"
++                CFLAGS=""
+                 PROFILE="-g -p"
+                 ;;
+         esac
+@@ -27324,8 +27324,8 @@
+                 ;;
+         *)
+                 DEBUG="-g -Wall -fsigned-char"
+-                CFLAGS="-O2 -fsigned-char"
+-                PROFILE="-O2 -g -pg -fsigned-char"
++                CFLAGS="-fsigned-char"
++                PROFILE="-g -pg -fsigned-char"
+                 ;;
+         esac
+ fi
--- /dev/null
+++ audio/vorbis-tools/files/patch-ogg123_Makefile.in
@@ -0,0 +1,11 @@
+--- ogg123/Makefile.in.orig	2008-03-03 06:47:58.000000000 +0100
++++ ogg123/Makefile.in	2008-03-12 19:43:37.000000000 +0100
+@@ -605,7 +605,7 @@
+ 
+ info-am:
+ 
+-install-data-am: install-docDATA install-man
++install-data-am: install-man
+ 
+ install-dvi: install-dvi-am
+ 
--- /dev/null
+++ audio/vorbis-tools/files/patch-ogg123_speex_format.c
@@ -0,0 +1,11 @@
+--- ogg123/speex_format.c.orig	2008-05-11 17:57:48.000000000 +0200
++++ ogg123/speex_format.c	2008-05-11 17:58:19.000000000 +0200
+@@ -475,7 +475,7 @@ void *process_header(ogg_packet *op, int
+            cb->printf_error(callback_arg, ERROR, _("Cannot read header"));
+      return NULL;
+    }
+-   if ((*header)->mode >= SPEEX_NB_MODES) {
++   if ((*header)->mode >= SPEEX_NB_MODES || (*header)->mode < 0) {
+      cb->printf_error(callback_arg, ERROR, 
+ 		      _("Mode number %d does not (any longer) exist in this version"),
+ 	      (*header)->mode);

From ctriv at midnightbsd.org  Sun Jan  4 14:37:18 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 14:37:18 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: vorbis-tools.
Message-ID: <200901041937.n04JbImx068741@stargazer.midnightbsd.org>

Log Message:
-----------
added: vorbis-tools.

Modified Files:
--------------
    mports/audio:
        Makefile (r1.71 -> r1.72)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/audio/Makefile,v
retrieving revision 1.71
retrieving revision 1.72
diff -L audio/Makefile -L audio/Makefile -u -r1.71 -r1.72
--- audio/Makefile
+++ audio/Makefile
@@ -75,9 +75,10 @@
     SUBDIR += sdl_mixer
     SUBDIR += shoutcast
     SUBDIR += sound-juicer
+    SUBDIR += speex
     SUBDIR += taglib
     SUBDIR += twolame
-    SUBDIR += speex
+    SUBDIR += vorbis-tools
     SUBDIR += wavpack
     SUBDIR += wmmp3
     SUBDIR += wmsmixer

From laffer1 at midnightbsd.org  Sun Jan  4 14:47:31 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 14:47:31 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: www/mozilla: change the include path for
	bsd.gecko.mk
Message-ID: <200901041947.n04JlVev069775@stargazer.midnightbsd.org>

Log Message:
-----------
change the include path for bsd.gecko.mk

Modified Files:
--------------
    mports/www/mozilla:
        Makefile (r1.7 -> r1.8)
        bsd.gecko.mk (r1.5 -> r1.6)

-------------- next part --------------
Index: bsd.gecko.mk
===================================================================
RCS file: /home/cvs/mports/www/mozilla/bsd.gecko.mk,v
retrieving revision 1.5
retrieving revision 1.6
diff -L www/mozilla/bsd.gecko.mk -L www/mozilla/bsd.gecko.mk -u -r1.5 -r1.6
--- www/mozilla/bsd.gecko.mk
+++ www/mozilla/bsd.gecko.mk
@@ -1 +1 @@
-.include "${PORTSDIR}/Mk/bsd.gecko.mk"
+.include "${PORTSDIR}/Mk/extensions/gecko.mk"
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/mozilla/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L www/mozilla/Makefile -L www/mozilla/Makefile -u -r1.7 -r1.8
--- www/mozilla/Makefile
+++ www/mozilla/Makefile
@@ -9,7 +9,7 @@
 
 PORTNAME=	mozilla
 PORTVERSION=	1.7.13
-PORTREVISION?=	3
+PORTREVISION?=	4
 PORTEPOCH=	2
 CATEGORIES?=	www
 MASTER_SITES=	${MASTER_SITE_MOZILLA} \

From ctriv at midnightbsd.org  Sun Jan  4 15:03:32 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 15:03:32 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: devel/nasm: update to latest version,
	2.05.01
Message-ID: <200901042003.n04K3WiN071432@stargazer.midnightbsd.org>

Log Message:
-----------
update to latest version, 2.05.01

Modified Files:
--------------
    mports/devel/nasm:
        Makefile (r1.8 -> r1.9)
        distinfo (r1.5 -> r1.6)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/nasm/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L devel/nasm/Makefile -L devel/nasm/Makefile -u -r1.8 -r1.9
--- devel/nasm/Makefile
+++ devel/nasm/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	nasm
-PORTVERSION=	2.03
+PORTVERSION=	2.05.01
 PORTEPOCH=	1
 CATEGORIES=	devel lang
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/devel/nasm/distinfo,v
retrieving revision 1.5
retrieving revision 1.6
diff -L devel/nasm/distinfo -L devel/nasm/distinfo -u -r1.5 -r1.6
--- devel/nasm/distinfo
+++ devel/nasm/distinfo
@@ -1,6 +1,6 @@
-MD5 (nasm-2.03.tar.bz2) = b017d5ac344fa2c0893bc67eddc72459
-SHA256 (nasm-2.03.tar.bz2) = bdeb99c84fcc7bc7655394387d86261c711794e38f87791960636e45bfbd9943
-SIZE (nasm-2.03.tar.bz2) = 765408
-MD5 (nasm-2.03-xdoc.tar.bz2) = 617fbe44de22fc7223d17f48ccef0e2d
-SHA256 (nasm-2.03-xdoc.tar.bz2) = 3406fb6c52017c0801682efe1161db2d97646614482e1c41fa068bfbaa9c7b26
-SIZE (nasm-2.03-xdoc.tar.bz2) = 674100
+MD5 (nasm-2.05.01.tar.bz2) = da4977f6d9d9b8f00527f2c62109453b
+SHA256 (nasm-2.05.01.tar.bz2) = 9206ef45c650fdbad8e9907d7c6ff799f7fc0021e44bafef81a222d3a0a6595c
+SIZE (nasm-2.05.01.tar.bz2) = 791984
+MD5 (nasm-2.05.01-xdoc.tar.bz2) = f2cc41f0ee3554ef9ab6fedc67af5d93
+SHA256 (nasm-2.05.01-xdoc.tar.bz2) = 3221e944be87bec66dab89b2144101ebf269670c057d8cddc23c67611e824dad
+SIZE (nasm-2.05.01-xdoc.tar.bz2) = 799497

From ctriv at midnightbsd.org  Sun Jan  4 15:18:31 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 15:18:31 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: nasm hasn't had a -r switch for
	a while, use -v to get
Message-ID: <200901042018.n04KIVDD072990@stargazer.midnightbsd.org>

Log Message:
-----------
nasm hasn't had a -r switch for a while, use -v to get the version.

Modified Files:
--------------
    mports/multimedia/mpeg4ip-libmp4v2:
        Makefile (r1.3 -> r1.4)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/multimedia/mpeg4ip-libmp4v2/Makefile,v
retrieving revision 1.3
retrieving revision 1.4
diff -L multimedia/mpeg4ip-libmp4v2/Makefile -L multimedia/mpeg4ip-libmp4v2/Makefile -u -r1.3 -r1.4
--- multimedia/mpeg4ip-libmp4v2/Makefile
+++ multimedia/mpeg4ip-libmp4v2/Makefile
@@ -29,13 +29,13 @@
 .include 
 
 post-patch:
-	${TOUCH} -f ${WRKSRC}/bootstrapped
+	@${TOUCH} -f ${WRKSRC}/bootstrapped
 # Speed up configure by not using 2 unneeded configure scripts.
 	@${ECHO_CMD} "" > ${WRKSRC}/lib/rtp/configure
 	@${ECHO_CMD} "" > ${WRKSRC}/lib/SDLAudio/configure
 	@${REINPLACE_CMD} \
 		-e 's|>&/|>/|; s|-Wmissing-declarations||; \
-			s|-Wmissing-prototypes||' \
+			s|-Wmissing-prototypes||; s|nasm -r|nasm -v|' \
 			${WRKSRC}/configure
 do-build:
 .for dir in lib/gnu lib/mp4av lib/mp4v2

From laffer1 at midnightbsd.org  Sun Jan  4 15:30:11 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 15:30:11 -0500 (EST)
Subject: [Midnightbsd-cvs] src: ObsoleteFiles.inc: List several obsolete
	files so we can remove
Message-ID: <200901042030.n04KUBE9074446@stargazer.midnightbsd.org>

Log Message:
-----------
List several obsolete files so we can remove them from upgraded systems

Modified Files:
--------------
    src:
        ObsoleteFiles.inc (r1.15 -> r1.16)

-------------- next part --------------
Index: ObsoleteFiles.inc
===================================================================
RCS file: /home/cvs/src/ObsoleteFiles.inc,v
retrieving revision 1.15
retrieving revision 1.16
diff -L ObsoleteFiles.inc -L ObsoleteFiles.inc -u -r1.15 -r1.16
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -15,6 +15,138 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20090104:
+.if ${TARGET_ARCH} != "sparc64"
+OLD_FILES+=sbin/sunlabel
+OLD_FILES+=usr/share/man/man8/sunlabel.8.gz
+.endif
+OLD_FILES+=usr/share/man/man4/card.4.gz
+OLD_FILES+=usr/share/man/man4/oldcard.4.gz
+.if ${DEFAULT_THREAD_LIB} != "libkse" && ${MK_LIBTHR} != "no"
+OLD_FILES+=usr/lib/libkse.a
+OLD_FILES+=usr/lib/libkse_p.a
+OLD_FILES+=usr/lib/libkse_pic.a
+.endif
+OLD_FILES+=etc/cached.conf
+OLD_FILES+=etc/rc.d/cached
+OLD_FILES+=usr/sbin/cached
+OLD_FILES+=usr/share/man/man5/cached.conf.5.gz
+OLD_FILES+=usr/share/man/man8/cached.8.gz
+OLD_FILES+=usr/share/man/man4/fast_ipsec.4.gz
+OLD_FILES+=rescue/atm
+OLD_FILES+=rescue/fore_dnld
+OLD_FILES+=rescue/ilmid
+OLD_FILES+=sbin/atm
+OLD_FILES+=sbin/fore_dnld
+OLD_FILES+=sbin/ilmid
+OLD_FILES+=usr/include/libatm.h
+OLD_FILES+=usr/include/netatm/atm.h
+OLD_FILES+=usr/include/netatm/atm_cm.h
+OLD_FILES+=usr/include/netatm/atm_if.h
+OLD_FILES+=usr/include/netatm/atm_ioctl.h
+OLD_FILES+=usr/include/netatm/atm_pcb.h
+OLD_FILES+=usr/include/netatm/atm_sap.h
+OLD_FILES+=usr/include/netatm/atm_sigmgr.h
+OLD_FILES+=usr/include/netatm/atm_stack.h
+OLD_FILES+=usr/include/netatm/atm_sys.h
+OLD_FILES+=usr/include/netatm/atm_var.h
+OLD_FILES+=usr/include/netatm/atm_vc.h
+OLD_FILES+=usr/include/netatm/ipatm/ipatm.h
+OLD_FILES+=usr/include/netatm/ipatm/ipatm_serv.h
+OLD_FILES+=usr/include/netatm/ipatm/ipatm_var.h
+OLD_FILES+=usr/include/netatm/port.h
+OLD_FILES+=usr/include/netatm/queue.h
+OLD_FILES+=usr/include/netatm/sigpvc/sigpvc_var.h
+OLD_FILES+=usr/include/netatm/spans/spans_cls.h
+OLD_FILES+=usr/include/netatm/spans/spans_kxdr.h
+OLD_FILES+=usr/include/netatm/spans/spans_var.h
+OLD_FILES+=usr/include/netatm/uni/sscf_uni.h
+OLD_FILES+=usr/include/netatm/uni/sscf_uni_var.h
+OLD_FILES+=usr/include/netatm/uni/sscop.h
+OLD_FILES+=usr/include/netatm/uni/sscop_misc.h
+OLD_FILES+=usr/include/netatm/uni/sscop_pdu.h
+OLD_FILES+=usr/include/netatm/uni/sscop_var.h
+OLD_FILES+=usr/include/netatm/uni/uni.h
+OLD_FILES+=usr/include/netatm/uni/uniip_var.h
+OLD_FILES+=usr/include/netatm/uni/unisig.h
+OLD_FILES+=usr/include/netatm/uni/unisig_decode.h
+OLD_FILES+=usr/include/netatm/uni/unisig_mbuf.h
+OLD_FILES+=usr/include/netatm/uni/unisig_msg.h
+OLD_FILES+=usr/include/netatm/uni/unisig_print.h
+OLD_FILES+=usr/include/netatm/uni/unisig_var.h
+OLD_FILES+=usr/lib/libatm.a
+OLD_FILES+=usr/lib/libatm_p.a
+OLD_FILES+=usr/sbin/atmarpd
+OLD_FILES+=usr/sbin/scspd
+OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atm.8.gz
+OLD_FILES+=usr/share/man/en.ISO8859-1/man8/atmarpd.8.gz
+OLD_FILES+=usr/share/man/en.ISO8859-1/man8/fore_dnld.8.gz
+OLD_FILES+=usr/share/man/en.ISO8859-1/man8/ilmid.8.gz
+OLD_FILES+=usr/share/man/en.ISO8859-1/man8/scspd.8.gz
+OLD_FILES+=usr/share/man/man8/atm.8.gz
+OLD_FILES+=usr/share/man/man8/atmarpd.8.gz
+OLD_FILES+=usr/share/man/man8/fore_dnld.8.gz
+OLD_FILES+=usr/share/man/man8/ilmid.8.gz
+OLD_FILES+=usr/share/man/man8/scspd.8.gz
+OLD_FILES+=usr/share/examples/atm/NOTES
+OLD_FILES+=usr/share/examples/atm/README
+OLD_FILES+=usr/share/examples/atm/Startup
+OLD_FILES+=usr/share/examples/atm/atm-config.sh
+OLD_FILES+=usr/share/examples/atm/atm-sockets.txt
+OLD_FILES+=usr/share/examples/atm/cpcs-design.txt
+OLD_FILES+=usr/share/examples/atm/fore-microcode.txt
+OLD_FILES+=usr/share/examples/atm/sscf-design.txt
+OLD_FILES+=usr/share/examples/atm/sscop-design.txt
+OLD_LIBS+=lib/libatm.so.5
+OLD_LIBS+=usr/lib/libatm.so
+OLD_DIRS+=usr/include/netatm/sigpvc
+OLD_DIRS+=usr/include/netatm/spans
+OLD_DIRS+=usr/include/netatm/ipatm
+OLD_DIRS+=usr/include/netatm/uni
+OLD_DIRS+=usr/include/netatm
+OLD_DIRS+=usr/share/examples/atm
+.if ${TARGET_ARCH} == "i386"
+OLD_FILES+=usr/include/machine/i4b_cause.h
+OLD_FILES+=usr/include/machine/i4b_debug.h
+OLD_FILES+=usr/include/machine/i4b_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_rbch_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_tel_ioctl.h
+OLD_FILES+=usr/include/machine/i4b_trace.h
+OLD_FILES+=usr/share/man/man4/i4bing.4.gz
+OLD_FILES+=usr/share/man/man4/i4bipr.4.gz
+OLD_FILES+=usr/share/man/man4/i4bisppp.4.gz
+.endif
+OLD_FILES+=usr/libexec/ftp-proxy
+OLD_FILES+=usr/include/netinet6/ah.h
+OLD_FILES+=usr/include/netinet6/ah6.h
+OLD_FILES+=usr/include/netinet6/ah_aesxcbcmac.h
+OLD_FILES+=usr/include/netinet6/esp.h
+OLD_FILES+=usr/include/netinet6/esp6.h
+OLD_FILES+=usr/include/netinet6/esp_aesctr.h
+OLD_FILES+=usr/include/netinet6/esp_camellia.h
+OLD_FILES+=usr/include/netinet6/esp_rijndael.h
+OLD_FILES+=usr/include/netinet6/ipsec.h
+OLD_FILES+=usr/include/netinet6/ipsec6.h
+OLD_FILES+=usr/include/netinet6/ipcomp.h
+OLD_FILES+=usr/include/netinet6/ipcomp6.h
+OLD_FILES+=usr/include/netkey/key.h
+OLD_FILES+=usr/include/netkey/key_debug.h
+OLD_FILES+=usr/include/netkey/key_var.h
+OLD_FILES+=usr/include/netkey/keydb.h
+OLD_FILES+=usr/include/netkey/keysock.h
+OLD_DIRS+=usr/include/netkey
+OLD_FILES+=usr/sbin/wicontrol
+OLD_FILES+=usr/share/man/man8/wicontrol.8.gz
+OLD_FILES+=rescue/mount_umapfs
+OLD_FILES+=sbin/mount_umapfs
+OLD_FILES+=usr/include/fs/umapfs/umap.h
+OLD_FILES+=usr/share/man/man8/mount_umapfs.8.gz
+OLD_DIRS+=usr/include/fs/umapfs
+OLD_FILES+=etc/namedb/PROTO.localhost-v6.rev
+OLD_FILES+=etc/namedb/PROTO.localhost.rev
+OLD_FILES+=etc/namedb/make-localhost
+OLD_FILES+=usr/include/netipx/ipx_ip.h
+OLD_FILES+=usr/share/man/man4/sched_core.4.gz
 # 20081204:
 OLD_FILES+=/usr/sbin/usbd
 OLD_FILES+=/usr/share/man/man8/usbd.8.gz
@@ -42,7 +174,6 @@
 OLD_FILES+=usr/share/man/cat8/portsnap.8.gz
 OLD_FILES+=usr/share/man/man5/portsnap.conf.5.gz
 OLD_FILES+=usr/share/man/man8/portsnap.8.gz
-
 # 20061226: Remove FreeBSD CVSup files
 OLD_FILES+=usr/share/examples/cvsup/cvs-supfile
 OLD_FILES+=usr/share/examples/cvsup/doc-supfile
@@ -2685,6 +2816,174 @@
 OLD_FILES+=usr/games/worms
 OLD_FILES+=usr/games/wump
 
+# 20090104: Shared lib bump for 0.3-CURRENT MidnightBSD
+OLD_LIBS+=lib/libalias.so.5
+OLD_LIBS+=lib/libbsnmp.so.3
+OLD_LIBS+=lib/libncurses.so.6
+OLD_LIBS+=lib/libncursesw.so.6
+OLD_LIBS+=lib/libreadline.so.6
+OLD_LIBS+=usr/lib/libdialog.so.5
+OLD_LIBS+=usr/lib/libgnuregex.so.3
+OLD_LIBS+=usr/lib/libhistory.so.6
+OLD_LIBS+=usr/lib/libpam.so.3
+OLD_LIBS+=usr/lib/libssh.so.3
+OLD_LIBS+=usr/lib/pam_chroot.so.3
+OLD_LIBS+=usr/lib/pam_deny.so.3
+OLD_LIBS+=usr/lib/pam_echo.so.3
+OLD_LIBS+=usr/lib/pam_exec.so.3
+OLD_LIBS+=usr/lib/pam_ftpusers.so.3
+OLD_LIBS+=usr/lib/pam_group.so.3
+OLD_LIBS+=usr/lib/pam_guest.so.3
+OLD_LIBS+=usr/lib/pam_krb5.so.3
+OLD_LIBS+=usr/lib/pam_ksu.so.3
+OLD_LIBS+=usr/lib/pam_lastlog.so.3
+OLD_LIBS+=usr/lib/pam_login_access.so.3
+OLD_LIBS+=usr/lib/pam_nologin.so.3
+OLD_LIBS+=usr/lib/pam_opie.so.3
+OLD_LIBS+=usr/lib/pam_opieaccess.so.3
+OLD_LIBS+=usr/lib/pam_passwdqc.so.3
+OLD_LIBS+=usr/lib/pam_permit.so.3
+OLD_LIBS+=usr/lib/pam_radius.so.3
+OLD_LIBS+=usr/lib/pam_rhosts.so.3
+OLD_LIBS+=usr/lib/pam_rootok.so.3
+OLD_LIBS+=usr/lib/pam_securetty.so.3
+OLD_LIBS+=usr/lib/pam_self.so.3
+OLD_LIBS+=usr/lib/pam_ssh.so.3
+OLD_LIBS+=usr/lib/pam_tacplus.so.3
+OLD_LIBS+=usr/lib/pam_unix.so.3
+OLD_LIBS+=usr/lib/snmp_atm.so.4
+OLD_LIBS+=usr/lib/snmp_bridge.so.4
+OLD_LIBS+=usr/lib/snmp_hostres.so.4
+OLD_LIBS+=usr/lib/snmp_mibII.so.4
+OLD_LIBS+=usr/lib/snmp_netgraph.so.4
+OLD_LIBS+=usr/lib/snmp_pf.so.4
+OLD_LIBS+=lib/liblwres.so.10
+OLD_LIBS+=lib/libatm.so.4
+OLD_LIBS+=lib/libbegemot.so.2
+OLD_LIBS+=lib/libbsdxml.so.2
+OLD_LIBS+=lib/libcam.so.3
+OLD_LIBS+=lib/libcrypt.so.3
+OLD_LIBS+=lib/libdevstat.so.5
+OLD_LIBS+=lib/libedit.so.5
+OLD_LIBS+=lib/libgeom.so.3
+OLD_LIBS+=lib/libipsec.so.2
+OLD_LIBS+=lib/libipx.so.3
+OLD_LIBS+=lib/libkiconv.so.2
+OLD_LIBS+=lib/libkse.so.2
+OLD_LIBS+=lib/libkvm.so.3
+OLD_LIBS+=lib/libm.so.4
+OLD_LIBS+=lib/libmd.so.3
+OLD_LIBS+=lib/libpcap.so.4
+OLD_LIBS+=lib/libpthread.so.2
+OLD_LIBS+=lib/libsbuf.so.3
+OLD_LIBS+=lib/libthr.so.2
+OLD_LIBS+=lib/libufs.so.3
+OLD_LIBS+=lib/libutil.so.6
+OLD_LIBS+=lib/libz.so.3
+OLD_LIBS+=usr/lib/libbluetooth.so.2
+OLD_LIBS+=usr/lib/libbsm.so.1
+OLD_LIBS+=usr/lib/libbz2.so.2
+OLD_LIBS+=usr/lib/libcalendar.so.3
+OLD_LIBS+=usr/lib/libcom_err.so.3
+OLD_LIBS+=usr/lib/libdevinfo.so.3
+OLD_LIBS+=usr/lib/libfetch.so.4
+OLD_LIBS+=usr/lib/libform.so.3
+OLD_LIBS+=usr/lib/libformw.so.3
+OLD_LIBS+=usr/lib/libftpio.so.6
+OLD_LIBS+=usr/lib/libgpib.so.1
+OLD_LIBS+=usr/lib/libkse.so.2
+OLD_LIBS+=usr/lib/libmagic.so.2
+OLD_LIBS+=usr/lib/libmemstat.so.1
+OLD_LIBS+=usr/lib/libmenu.so.3
+OLD_LIBS+=usr/lib/libmenuw.so.3
+OLD_LIBS+=usr/lib/libmilter.so.3
+OLD_LIBS+=usr/lib/libmp.so.5
+OLD_LIBS+=usr/lib/libncp.so.2
+OLD_LIBS+=usr/lib/libnetgraph.so.2
+OLD_LIBS+=usr/lib/libngatm.so.2
+OLD_LIBS+=usr/lib/libopie.so.4
+OLD_LIBS+=usr/lib/libpanel.so.3
+OLD_LIBS+=usr/lib/libpanelw.so.3
+OLD_LIBS+=usr/lib/libpmc.so.3
+OLD_LIBS+=usr/lib/libradius.so.2
+OLD_LIBS+=usr/lib/librpcsvc.so.3
+OLD_LIBS+=usr/lib/libsdp.so.2
+OLD_LIBS+=usr/lib/libsmb.so.2
+OLD_LIBS+=usr/lib/libstdc++.so.5
+OLD_LIBS+=usr/lib/libtacplus.so.2
+OLD_LIBS+=usr/lib/libthr.so.2
+OLD_LIBS+=usr/lib/libthread_db.so.2
+OLD_LIBS+=usr/lib/libugidfw.so.2
+OLD_LIBS+=usr/lib/libusbhid.so.2
+OLD_LIBS+=usr/lib/libvgl.so.4
+OLD_LIBS+=usr/lib/libwrap.so.4
+OLD_LIBS+=usr/lib/libypclnt.so.2
+OLD_LIBS+=usr/lib/snmp_atm.so.3
+OLD_LIBS+=usr/lib/snmp_bridge.so.3
+OLD_LIBS+=usr/lib/snmp_hostres.so.3
+OLD_LIBS+=usr/lib/snmp_mibII.so.3
+OLD_LIBS+=usr/lib/snmp_netgraph.so.3
+OLD_LIBS+=usr/lib/snmp_pf.so.3
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libatm.so.4
+OLD_LIBS+=usr/lib32/libbegemot.so.2
+OLD_LIBS+=usr/lib32/libbluetooth.so.2
+OLD_LIBS+=usr/lib32/libbsdxml.so.2
+OLD_LIBS+=usr/lib32/libbsm.so.1
+OLD_LIBS+=usr/lib32/libbz2.so.2
+OLD_LIBS+=usr/lib32/libcalendar.so.3
+OLD_LIBS+=usr/lib32/libcam.so.3
+OLD_LIBS+=usr/lib32/libcom_err.so.3
+OLD_LIBS+=usr/lib32/libcrypt.so.3
+OLD_LIBS+=usr/lib32/libdevinfo.so.3
+OLD_LIBS+=usr/lib32/libdevstat.so.5
+OLD_LIBS+=usr/lib32/libedit.so.5
+OLD_LIBS+=usr/lib32/libfetch.so.4
+OLD_LIBS+=usr/lib32/libform.so.3
+OLD_LIBS+=usr/lib32/libformw.so.3
+OLD_LIBS+=usr/lib32/libftpio.so.6
+OLD_LIBS+=usr/lib32/libgeom.so.3
+OLD_LIBS+=usr/lib32/libgpib.so.1
+OLD_LIBS+=usr/lib32/libipsec.so.2
+OLD_LIBS+=usr/lib32/libipx.so.3
+OLD_LIBS+=usr/lib32/libkiconv.so.2
+OLD_LIBS+=usr/lib32/libkse.so.2
+OLD_LIBS+=usr/lib32/libkvm.so.3
+OLD_LIBS+=usr/lib32/libm.so.4
+OLD_LIBS+=usr/lib32/libmagic.so.2
+OLD_LIBS+=usr/lib32/libmd.so.3
+OLD_LIBS+=usr/lib32/libmemstat.so.1
+OLD_LIBS+=usr/lib32/libmenu.so.3
+OLD_LIBS+=usr/lib32/libmenuw.so.3
+OLD_LIBS+=usr/lib32/libmilter.so.3
+OLD_LIBS+=usr/lib32/libmp.so.5
+OLD_LIBS+=usr/lib32/libncp.so.2
+OLD_LIBS+=usr/lib32/libnetgraph.so.2
+OLD_LIBS+=usr/lib32/libngatm.so.2
+OLD_LIBS+=usr/lib32/libopie.so.4
+OLD_LIBS+=usr/lib32/libpanel.so.3
+OLD_LIBS+=usr/lib32/libpanelw.so.3
+OLD_LIBS+=usr/lib32/libpcap.so.4
+OLD_LIBS+=usr/lib32/libpmc.so.3
+OLD_LIBS+=usr/lib32/libpthread.so.2
+OLD_LIBS+=usr/lib32/libradius.so.2
+OLD_LIBS+=usr/lib32/librpcsvc.so.3
+OLD_LIBS+=usr/lib32/libsbuf.so.3
+OLD_LIBS+=usr/lib32/libsdp.so.2
+OLD_LIBS+=usr/lib32/libsmb.so.2
+OLD_LIBS+=usr/lib32/libstdc++.so.5
+OLD_LIBS+=usr/lib32/libtacplus.so.2
+OLD_LIBS+=usr/lib32/libthr.so.2
+OLD_LIBS+=usr/lib32/libthread_db.so.2
+OLD_LIBS+=usr/lib32/libufs.so.3
+OLD_LIBS+=usr/lib32/libugidfw.so.2
+OLD_LIBS+=usr/lib32/libusbhid.so.2
+OLD_LIBS+=usr/lib32/libutil.so.6
+OLD_LIBS+=usr/lib32/libvgl.so.4
+OLD_LIBS+=usr/lib32/libwrap.so.4
+OLD_LIBS+=usr/lib32/libypclnt.so.2
+OLD_LIBS+=usr/lib32/libz.so.3
+.endif
 # 20050722: bump for 6.0-RELEASE
 OLD_LIBS+=lib/libalias.so.4
 OLD_LIBS+=lib/libatm.so.2

From laffer1 at midnightbsd.org  Sun Jan  4 15:42:20 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 15:42:20 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: www/linux-seamonkey: 1.1.14
Message-ID: <200901042042.n04KgKSH075594@stargazer.midnightbsd.org>

Log Message:
-----------
1.1.14

Modified Files:
--------------
    mports/www/linux-seamonkey:
        Makefile (r1.16 -> r1.17)
        distinfo (r1.15 -> r1.16)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/linux-seamonkey/Makefile,v
retrieving revision 1.16
retrieving revision 1.17
diff -L www/linux-seamonkey/Makefile -L www/linux-seamonkey/Makefile -u -r1.16 -r1.17
--- www/linux-seamonkey/Makefile
+++ www/linux-seamonkey/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	seamonkey
-PORTVERSION=	1.1.12
+PORTVERSION=	1.1.14
 DISTVERSIONSUFFIX=	.en-US.linux-i686
 CATEGORIES=	www
 MASTER_SITE_SUBDIR=	${PORTNAME}/releases/${PORTVERSION}
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/www/linux-seamonkey/distinfo,v
retrieving revision 1.15
retrieving revision 1.16
diff -L www/linux-seamonkey/distinfo -L www/linux-seamonkey/distinfo -u -r1.15 -r1.16
--- www/linux-seamonkey/distinfo
+++ www/linux-seamonkey/distinfo
@@ -1,3 +1,3 @@
-MD5 (seamonkey-1.1.12.en-US.linux-i686.tar.gz) = d2ba88c876fd1cf89ca45e32a70c7f2c
-SHA256 (seamonkey-1.1.12.en-US.linux-i686.tar.gz) = e67593587015907bd6ade2e675243c6439c1818e96289808fe54baa6b9704e20
-SIZE (seamonkey-1.1.12.en-US.linux-i686.tar.gz) = 14808322
+MD5 (seamonkey-1.1.14.en-US.linux-i686.tar.gz) = c81160b549236840fcdb724851de7ae5
+SHA256 (seamonkey-1.1.14.en-US.linux-i686.tar.gz) = 9f70ab58f40bddae45cd6334f2bcb2b7d8c59b2a6bed96680dcef70fee94f45e
+SIZE (seamonkey-1.1.14.en-US.linux-i686.tar.gz) = 14819360

From laffer1 at midnightbsd.org  Sun Jan  4 15:45:17 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 15:45:17 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: sites.mk: Add fedora archive site.
Message-ID: <200901042045.n04KjHNB076000@stargazer.midnightbsd.org>

Log Message:
-----------
Add fedora archive site.  We'll have to tweak this list later as many mirrors do not have files, but when we go to a newer linux base it could get interesting. Perhaps a fedora archive list vs a current fedora list?

Modified Files:
--------------
    mports/Mk/components:
        sites.mk (r1.3 -> r1.4)

-------------- next part --------------
Index: sites.mk
===================================================================
RCS file: /home/cvs/mports/Mk/components/sites.mk,v
retrieving revision 1.3
retrieving revision 1.4
diff -L Mk/components/sites.mk -L Mk/components/sites.mk -u -r1.3 -r1.4
--- Mk/components/sites.mk
+++ Mk/components/sites.mk
@@ -250,6 +250,7 @@
 
 .if !defined(IGNORE_MASTER_SITE_FEDORA_LINUX)
 MASTER_SITE_FEDORA_LINUX+= \
+	http://archives.fedoraproject.org/pub/archive/fedora/linux/core/%SUBDIR%/ \
 	http://mirrors.kernel.org/fedora/core/%SUBDIR%/ \
 	ftp://mirrors.kernel.org/fedora/core/%SUBDIR%/ \
 	http://mirror.web-ster.com/fedora/core/%SUBDIR%/ \

From ctriv at midnightbsd.org  Sun Jan  4 16:03:18 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 16:03:18 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: multimedia/kdemultimedia4: Added
	kdemultimedia-4.1.3
Message-ID: <200901042103.n04L3Ixg077560@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdemultimedia-4.1.3

Added Files:
-----------
    mports/multimedia/kdemultimedia4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/multimedia/kdemultimedia4/files:
        patch-CMakeLists.txt (r1.1)
        patch-doc-CMakeLists.txt (r1.1)

-------------- next part --------------
--- /dev/null
+++ multimedia/kdemultimedia4/pkg-descr
@@ -0,0 +1 @@
+Multimedia tools for KDE4.
--- /dev/null
+++ multimedia/kdemultimedia4/pkg-plist
@@ -0,0 +1,202 @@
+bin/dragon
+bin/juk
+bin/kmix
+bin/kmixctrl
+bin/kscd
+bin/workman2cddb.pl
+include/audiocdencoder.h
+include/libkcddb/cdinfo.h
+include/libkcddb/cdinfodialog.h
+include/libkcddb/client.h
+include/libkcddb/configbase.h
+include/libkcddb/genres.h
+include/libkcddb/kcddb.h
+include/libkcddb/kcddb_export.h
+include/libkcddb/kcddbconfig.h
+include/libkcompactdisc/kcompactdisc.h
+lib/kde4/dragonpart.so
+lib/kde4/kcm_audiocd.so
+lib/kde4/kcm_cddb.so
+lib/kde4/kio_audiocd.so
+lib/kde4/libaudiocd_encoder_flac.so
+lib/kde4/libaudiocd_encoder_lame.so
+lib/kde4/libaudiocd_encoder_vorbis.so
+lib/kde4/libaudiocd_encoder_wav.so
+lib/libaudiocdplugins.so
+lib/libaudiocdplugins.so.5
+lib/libaudiocdplugins.so.5.0.0
+lib/libkcddb.so
+lib/libkcddb.so.5
+lib/libkcddb.so.5.0.0
+lib/libkcompactdisc.so
+lib/libkcompactdisc.so.5
+lib/libkcompactdisc.so.5.0.0
+lib/libkdeinit4_kmix.so
+lib/libkdeinit4_kmixctrl.so
+share/applications/kde4/dragonplayer.desktop
+share/applications/kde4/juk.desktop
+share/applications/kde4/kmix.desktop
+share/applications/kde4/kscd.desktop
+share/apps/dragonplayer/dragonlogo.png
+share/apps/dragonplayer/dragonplayerui.rc
+share/apps/juk/jukui-rtl.rc
+share/apps/juk/jukui.rc
+share/apps/juk/pics/playing.png
+share/apps/juk/pics/splash.png
+share/apps/juk/pics/yahoo_credit.png
+share/apps/kconf_update/audiocd.upd
+share/apps/kconf_update/kcmcddb-emailsettings.upd
+share/apps/kconf_update/upgrade-metadata.sh
+share/apps/kmix/kmixui.rc
+share/apps/kmix/pics/kmixdocked.png
+share/apps/kmix/pics/kmixdocked_error.png
+share/apps/kmix/pics/kmixdocked_mute.png
+share/apps/kmix/pics/mix_ac97.png
+share/apps/kmix/pics/mix_audio.png
+share/apps/kmix/pics/mix_bass.png
+share/apps/kmix/pics/mix_cd.png
+share/apps/kmix/pics/mix_digital.png
+share/apps/kmix/pics/mix_ext.png
+share/apps/kmix/pics/mix_headphone.png
+share/apps/kmix/pics/mix_microphone.png
+share/apps/kmix/pics/mix_midi.png
+share/apps/kmix/pics/mix_recmon.png
+share/apps/kmix/pics/mix_record.png
+share/apps/kmix/pics/mix_surround.png
+share/apps/kmix/pics/mix_treble.png
+share/apps/kmix/pics/mix_unknown.png
+share/apps/kmix/pics/mix_video.png
+share/apps/kmix/pics/mix_volume.png
+share/apps/kmix/profiles/ALSA.default.xml
+share/apps/kmix/profiles/OSS.default.xml
+share/apps/konqsidebartng/virtual_folders/services/audiocd.desktop
+share/apps/profiles/kscd.profile.xml
+share/autostart/kmix_autostart.desktop
+share/autostart/restore_kmix_volumes.desktop
+share/config.kcfg/audiocd_lame_encoder.kcfg
+share/config.kcfg/audiocd_vorbis_encoder.kcfg
+share/config.kcfg/kscd.kcfg
+share/config.kcfg/libkcddb.kcfg
+share/config/dragonplayerrc
+share/dbus-1/interfaces/org.kde.KMix.xml
+share/dbus-1/interfaces/org.kde.juk.collection.xml
+share/dbus-1/interfaces/org.kde.juk.player.xml
+share/dbus-1/interfaces/org.kde.juk.search.xml
+share/doc/HTML/en/dragonplayer/common
+share/doc/HTML/en/dragonplayer/index.cache.bz2
+share/doc/HTML/en/dragonplayer/index.docbook
+share/doc/HTML/en/dragonplayer/main.png
+share/doc/HTML/en/juk/common
+share/doc/HTML/en/juk/history-playlist.png
+share/doc/HTML/en/juk/index.cache.bz2
+share/doc/HTML/en/juk/index.docbook
+share/doc/HTML/en/juk/juk-adv-search.png
+share/doc/HTML/en/juk/juk-file-renamer.png
+share/doc/HTML/en/juk/juk-main.png
+share/doc/HTML/en/juk/juk-tag-guesser.png
+share/doc/HTML/en/juk/normal-playlist.png
+share/doc/HTML/en/juk/search-playlist.png
+share/doc/HTML/en/juk/toolbar.png
+share/doc/HTML/en/kmix/common
+share/doc/HTML/en/kmix/index.cache.bz2
+share/doc/HTML/en/kmix/index.docbook
+share/doc/HTML/en/kmix/kmix-channel-playback.png
+share/doc/HTML/en/kmix/kmix-channel-record.png
+share/doc/HTML/en/kmix/kmix-channel-switches.png
+share/doc/HTML/en/kmix/kmix-window.png
+share/doc/HTML/en/kscd/common
+share/doc/HTML/en/kscd/index.cache.bz2
+share/doc/HTML/en/kscd/index.docbook
+share/doc/HTML/en/kscd/kscd.png
+share/doc/HTML/en/kscd/kscd11.png
+share/doc/HTML/en/kscd/kscd12.png
+share/doc/HTML/en/kscd/kscd13.png
+share/doc/HTML/en/kscd/kscd14.png
+share/doc/HTML/en/kscd/kscd16.png
+share/doc/HTML/en/kscd/kscd18.png
+share/doc/HTML/en/kscd/kscd19.png
+share/doc/HTML/en/kscd/kscd2.png
+share/doc/HTML/en/kscd/kscd3.png
+share/doc/HTML/en/kscd/kscd5.png
+share/doc/HTML/en/kscd/kscd6.png
+share/doc/HTML/en/kscd/kscd9.png
+share/doc/HTML/en/kscd/kscdannounc.png
+share/icons/hicolor/128x128/apps/dragonplayer.png
+share/icons/hicolor/128x128/apps/juk.png
+share/icons/hicolor/128x128/apps/kmix.png
+share/icons/hicolor/128x128/apps/kscd.png
+share/icons/hicolor/16x16/apps/dragonplayer.png
+share/icons/hicolor/16x16/apps/juk.png
+share/icons/hicolor/16x16/apps/kmix.png
+share/icons/hicolor/16x16/apps/kscd.png
+share/icons/hicolor/22x22/apps/dragonplayer.png
+share/icons/hicolor/32x32/apps/dragonplayer.png
+share/icons/hicolor/32x32/apps/juk.png
+share/icons/hicolor/32x32/apps/kmix.png
+share/icons/hicolor/32x32/apps/kscd.png
+share/icons/hicolor/48x48/apps/dragonplayer.png
+share/icons/hicolor/48x48/apps/juk.png
+share/icons/hicolor/48x48/apps/kmix.png
+share/icons/hicolor/48x48/apps/kscd.png
+share/icons/hicolor/64x64/apps/dragonplayer.png
+share/icons/hicolor/64x64/apps/juk.png
+share/icons/hicolor/64x64/apps/kmix.png
+share/icons/hicolor/64x64/apps/kscd.png
+share/icons/hicolor/scalable/apps/dragonplayer.svgz
+share/icons/oxygen/16x16/actions/player-volume-muted.png
+share/icons/oxygen/22x22/actions/player-volume-muted.png
+share/icons/oxygen/32x32/actions/player-volume-muted.png
+share/icons/oxygen/48x48/actions/player-volume-muted.png
+share/icons/oxygen/scalable/actions/player-volume-muted.svgz
+share/kde4/services/ServiceMenus/audiocd_play.desktop
+share/kde4/services/ServiceMenus/dragonplayer_play_dvd.desktop
+share/kde4/services/ServiceMenus/jukservicemenu.desktop
+share/kde4/services/audiocd.desktop
+share/kde4/services/audiocd.protocol
+share/kde4/services/dragonplayer_part.desktop
+share/kde4/services/kmixctrl_restore.desktop
+share/kde4/services/libkcddb.desktop
+ at dirrmtry share/kde4/services/ServiceMenus
+ at dirrmtry share/kde4/services
+ at dirrmtry share/kde4
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrmtry share/doc/HTML/en/kscd
+ at dirrmtry share/doc/HTML/en/kmix
+ at dirrmtry share/doc/HTML/en/juk
+ at dirrm share/doc/HTML/en/dragonplayer
+ at dirrmtry share/doc/HTML/en
+ at dirrmtry share/doc/HTML
+ at dirrmtry share/doc
+ at dirrmtry share/dbus-1/interfaces
+ at dirrmtry share/dbus-1
+ at dirrmtry share/config.kcfg
+ at dirrmtry share/autostart
+ at dirrmtry share/apps/profiles
+ at dirrmtry share/apps/konqsidebartng/virtual_folders/services
+ at dirrmtry share/apps/konqsidebartng/virtual_folders
+ at dirrmtry share/apps/konqsidebartng
+ at dirrmtry share/apps/kmix/profiles
+ at dirrmtry share/apps/kmix/pics
+ at dirrmtry share/apps/kmix
+ at dirrmtry share/apps/kconf_update
+ at dirrmtry share/apps/juk/pics
+ at dirrmtry share/apps/juk
+ at dirrm share/apps/dragonplayer
+ at dirrmtry share/apps
+ at dirrmtry share/applications/kde4
+ at dirrmtry share/applications
+ at dirrmtry lib/kde4
+ at dirrmtry include/libkcompactdisc
+ at dirrmtry include/libkcddb
+ at dirrmtry include
--- /dev/null
+++ multimedia/kdemultimedia4/Makefile
@@ -0,0 +1,46 @@
+#
+# $MidnightBSD: mports/multimedia/kdemultimedia4/Makefile,v 1.1 2009/01/04 21:03:15 ctriv Exp $
+#
+
+PORTNAME=	kdemultimedia
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	multimedia kde ipv6
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	KDE Multimedia applications
+LICENSE=	gpl2
+
+LIB_DEPENDS+=	audiofile:${PORTSDIR}/audio/libaudiofile \
+		FLAC:${PORTSDIR}/audio/flac \
+		cdda_paranoia:${PORTSDIR}/audio/cdparanoia \
+		ogg:${PORTSDIR}/audio/libogg \
+		tag:${PORTSDIR}/audio/taglib \
+		theora:${PORTSDIR}/multimedia/libtheora \
+		vorbis:${PORTSDIR}/audio/libvorbis \
+		mp3lame:${PORTSDIR}/audio/lame \
+		tunepimp.5:${PORTSDIR}/audio/libtunepimp \
+		xine.1:${PORTSDIR}/multimedia/libxine
+RUN_DEPENDS=	oggenc:${PORTSDIR}/audio/vorbis-tools
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_BZIP2=	yes
+USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib opengl moc rcc uic dbus qt3support designer network svg qtestlib
+USE_OPENLDAP=	yes
+
+.include 
+
+.if ${OSVERSION} < 3000
+CMAKE_USE_PTHREAD+= yes
+.endif
+
+post-extract:
+	${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ multimedia/kdemultimedia4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdemultimedia-4.1.3.tar.bz2) = 5ccc4ff4b5a53c85db36e05bfdb2f01a
+SHA256 (KDE/kdemultimedia-4.1.3.tar.bz2) = ddab2230dd2cd6a1e8b56ee27b6192128f18450ad6980db5bb8e106d3546dcb0
+SIZE (KDE/kdemultimedia-4.1.3.tar.bz2) = 1443949
--- /dev/null
+++ multimedia/kdemultimedia4/files/patch-CMakeLists.txt
@@ -0,0 +1,19 @@
+--- ../CMakeLists.txt.orgi	2008-07-24 15:05:33.000000000 +0200
++++ ../CMakeLists.txt	2008-07-24 15:05:59.000000000 +0200
+@@ -40,10 +40,11 @@
+ macro_optional_add_subdirectory(strigi-analyzer)
+ macro_optional_add_subdirectory(kioslave)
+ macro_optional_add_subdirectory(kmix)
+-if(XINE_XCB_FOUND)
+-  macro_optional_add_subdirectory(dragonplayer)
+-else(XINE_XCB_FOUND)
+-  message( STATUS "Xine and phonon-xine must be compiled with XCB support.")
+-endif(XINE_XCB_FOUND)
++#if(XINE_XCB_FOUND)
++#  macro_optional_add_subdirectory(dragonplayer)
++#else(XINE_XCB_FOUND)
++#  message( STATUS "Xine and phonon-xine must be compiled with XCB support.")
++#endif(XINE_XCB_FOUND)
++add_subdirectory(dragonplayer)
+ 
+ macro_display_feature_log()
--- /dev/null
+++ multimedia/kdemultimedia4/files/patch-doc-CMakeLists.txt
@@ -0,0 +1,13 @@
+--- ../doc/CMakeLists.txt.orgi	2008-07-24 15:24:33.000000000 +0200
++++ ../doc/CMakeLists.txt	2008-07-24 15:24:55.000000000 +0200
+@@ -3,9 +3,7 @@
+ endif(TAGLIB_FOUND)
+ add_subdirectory(kioslave)
+ add_subdirectory(kmix)
+-if(XINE_XCB_FOUND)
+-  add_subdirectory(dragonplayer)
+-endif(XINE_XCB_FOUND)
++add_subdirectory(dragonplayer)
+ if (NOT APPLE)
+   add_subdirectory(kscd)
+ endif (NOT APPLE)

From ctriv at midnightbsd.org  Sun Jan  4 16:03:25 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 16:03:25 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: kdemultimedia4.
Message-ID: <200901042103.n04L3PRe077606@stargazer.midnightbsd.org>

Log Message:
-----------
added: kdemultimedia4.

Modified Files:
--------------
    mports/multimedia:
        Makefile (r1.49 -> r1.50)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/multimedia/Makefile,v
retrieving revision 1.49
retrieving revision 1.50
diff -L multimedia/Makefile -L multimedia/Makefile -u -r1.49 -r1.50
--- multimedia/Makefile
+++ multimedia/Makefile
@@ -23,6 +23,7 @@
     SUBDIR += gstreamer-plugins-ugly
     SUBDIR += gstreamer-plugins-xvid
     SUBDIR += kaffeine
+    SUBDIR += kdemultimedia4
     SUBDIR += libdca
     SUBDIR += libdts
     SUBDIR += libdv

From laffer1 at midnightbsd.org  Sun Jan  4 17:30:17 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 17:30:17 -0500 (EST)
Subject: [Midnightbsd-cvs] src: ObsoleteFiles.inc: Back out part of this list
Message-ID: <200901042230.n04MUHFC084804@stargazer.midnightbsd.org>

Log Message:
-----------
Back out part of this list

Modified Files:
--------------
    src:
        ObsoleteFiles.inc (r1.16 -> r1.17)

-------------- next part --------------
Index: ObsoleteFiles.inc
===================================================================
RCS file: /home/cvs/src/ObsoleteFiles.inc,v
retrieving revision 1.16
retrieving revision 1.17
diff -L ObsoleteFiles.inc -L ObsoleteFiles.inc -u -r1.16 -r1.17
--- ObsoleteFiles.inc
+++ ObsoleteFiles.inc
@@ -2824,7 +2824,6 @@
 OLD_LIBS+=lib/libreadline.so.6
 OLD_LIBS+=usr/lib/libdialog.so.5
 OLD_LIBS+=usr/lib/libgnuregex.so.3
-OLD_LIBS+=usr/lib/libhistory.so.6
 OLD_LIBS+=usr/lib/libpam.so.3
 OLD_LIBS+=usr/lib/libssh.so.3
 OLD_LIBS+=usr/lib/pam_chroot.so.3
@@ -2909,7 +2908,6 @@
 OLD_LIBS+=usr/lib/librpcsvc.so.3
 OLD_LIBS+=usr/lib/libsdp.so.2
 OLD_LIBS+=usr/lib/libsmb.so.2
-OLD_LIBS+=usr/lib/libstdc++.so.5
 OLD_LIBS+=usr/lib/libtacplus.so.2
 OLD_LIBS+=usr/lib/libthr.so.2
 OLD_LIBS+=usr/lib/libthread_db.so.2

From laffer1 at midnightbsd.org  Sun Jan  4 17:38:00 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 17:38:00 -0500 (EST)
Subject: [Midnightbsd-cvs] src: Makefile: bump shared library version for
	libssh
Message-ID: <200901042238.n04Mc0RP085306@stargazer.midnightbsd.org>

Log Message:
-----------
bump shared library version for libssh

Modified Files:
--------------
    src/secure/lib/libssh:
        Makefile (r1.7 -> r1.8)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/lib/libssh/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L secure/lib/libssh/Makefile -L secure/lib/libssh/Makefile -u -r1.7 -r1.8
--- secure/lib/libssh/Makefile
+++ secure/lib/libssh/Makefile
@@ -1,8 +1,10 @@
 # $MidnightBSD$
 # $FreeBSD: src/secure/lib/libssh/Makefile,v 1.34.2.2 2005/09/11 16:50:33 des Exp $
 
+.include 
+
 LIB=	ssh
-SHLIB_MAJOR=	3
+SHLIB_MAJOR=	4
 SRCS=	acss.c authfd.c authfile.c bufaux.c bufbn.c buffer.c \
 	canohost.c channels.c cipher.c cipher-acss.c cipher-aes.c \
 	cipher-bf1.c cipher-ctr.c cipher-3des1.c cleanup.c \
@@ -12,13 +14,13 @@
 	atomicio.c key.c dispatch.c kex.c mac.c uidswap.c uuencode.c misc.c \
 	monitor_fdpass.c rijndael.c ssh-dss.c ssh-rsa.c dh.c kexdh.c \
 	kexgex.c kexdhc.c kexgexc.c scard.c msg.c progressmeter.c dns.c \
-	entropy.c scard-opensc.c umac.c
+	entropy.c scard-opensc.c
 
 # gss-genr.c should be in $SRCS but causes linking problems, so it is
 # compiled directly into sshd instead.
 
 # Portability layer
-SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c openssl-compat.c \
+SRCS+=	bsd-closefrom.c bsd-misc.c getrrsetbyname.c \
 	port-tun.c vis.c xcrypt.c xmmap.c
 # MidnightBSD additions
 SRCS+=	version.c
@@ -31,8 +33,8 @@
 DPADD=	${LIBZ}
 LDADD=	-lz
 
-.if !defined(NO_KERBEROS)
-CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_H=1 -DKRB5 -DHEIMDAL
+.if ${MK_KERBEROS_SUPPORT} != "no"
+CFLAGS+= -DGSSAPI -DHAVE_GSSAPI_GSSAPI_H=1 -DKRB5 -DHEIMDAL
 DPADD+=	${LIBGSSAPI} ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR} ${LIBMD} ${LIBROKEN}
 LDADD+=	-lgssapi -lkrb5 -lasn1 -lcom_err -lmd -lroken
 .endif

From laffer1 at midnightbsd.org  Sun Jan  4 17:47:06 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 17:47:06 -0500 (EST)
Subject: [Midnightbsd-cvs] src: Makefile: tag
Message-ID: <200901042247.n04Ml6OM086054@stargazer.midnightbsd.org>

Log Message:
-----------
tag

Modified Files:
--------------
    src/secure/libexec/ssh-keysign:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/secure/libexec/ssh-keysign/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L secure/libexec/ssh-keysign/Makefile -L secure/libexec/ssh-keysign/Makefile -u -r1.2 -r1.3
--- secure/libexec/ssh-keysign/Makefile
+++ secure/libexec/ssh-keysign/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/secure/libexec/ssh-keysign/Makefile,v 1.6 2005/06/07 09:31:26 des Exp $
 
 PROG=	ssh-keysign

From laffer1 at midnightbsd.org  Sun Jan  4 17:51:39 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 17:51:39 -0500 (EST)
Subject: [Midnightbsd-cvs] src: src/sbin: Only need sunlabel on the sparc.
Message-ID: <200901042251.n04Mpd4H086432@stargazer.midnightbsd.org>

Log Message:
-----------
Only need sunlabel on the sparc.

Modified Files:
--------------
    src/sbin:
        Makefile (r1.8 -> r1.9)
    src/sbin/sunlabel:
        Makefile (r1.1.1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -L sbin/Makefile -L sbin/Makefile -u -r1.8 -r1.9
--- sbin/Makefile
+++ sbin/Makefile
@@ -84,7 +84,7 @@
 	slattach \
 	spppcontrol \
 	startslip \
-	sunlabel \
+	${_sunlabel} \
 	swapon \
 	sysctl \
 	tunefs \
@@ -121,4 +121,8 @@
 _fdisk=		fdisk
 .endif
 
+.if ${MACHINE_ARCH} == "sparc64"
+_sunlabel=	sunlabel
+.endif
+
 .include 
Index: Makefile
===================================================================
RCS file: /home/cvs/src/sbin/sunlabel/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -L sbin/sunlabel/Makefile -L sbin/sunlabel/Makefile -u -r1.1.1.1 -r1.2
--- sbin/sunlabel/Makefile
+++ sbin/sunlabel/Makefile
@@ -1,3 +1,4 @@
+# $MidnightBSD$
 # $FreeBSD: src/sbin/sunlabel/Makefile,v 1.12 2004/02/01 13:09:26 ceri Exp $
 
 .PATH: ${.CURDIR}/../../sys/geom

From laffer1 at midnightbsd.org  Sun Jan  4 17:53:45 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 17:53:45 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: mports/net-p2p: add frostwire.
Message-ID: <200901042253.n04MrjDL086565@stargazer.midnightbsd.org>

Log Message:
-----------
add frostwire.  This port is almost identical to limewire

Modified Files:
--------------
    mports/net-p2p:
        Makefile (r1.7 -> r1.8)

Added Files:
-----------
    mports/net-p2p/frostwire:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/net-p2p/frostwire/files:
        frostwire.sh.in (r1.1)

-------------- next part --------------
--- /dev/null
+++ net-p2p/frostwire/pkg-descr
@@ -0,0 +1,20 @@
+FrostWire is an open-source peer-to-peer (P2P) file-sharing program. It uses
+the Gnutella network and is heavily based on the better-known LimeWire
+program. It also recently included BitTorrent support.
+
+Features:
+
+* Completely free & open-source.
+* Firewall-to-firewall transfers.
+* Built-in community chat.
+* No bundled software of any kind!
+* Connects to more sources.
+* Creative commons license support.
+* Max. speed network connections.
+* Junk result filters.
+* Turbo-Charged download speeds.
+* iTunes integration.
+* BitTorrent support.
+* Proxy Support.
+
+WWW: http://www.frostwire.com/
--- /dev/null
+++ net-p2p/frostwire/pkg-plist
@@ -0,0 +1,53 @@
+bin/frostwire
+%%PORTDOCS%%%%DOCSDIR%%/changelog
+%%DATADIR%%/EULA.txt
+%%DATADIR%%/FrostWire.icns
+%%DATADIR%%/FrostWire.jar
+%%DATADIR%%/ProgressTabs.jar
+%%DATADIR%%/aopalliance.jar
+%%DATADIR%%/clink.jar
+%%DATADIR%%/commons-codec-1.3.jar
+%%DATADIR%%/commons-logging.jar
+%%DATADIR%%/daap.jar
+%%DATADIR%%/forms.jar
+%%DATADIR%%/foxtrot.jar
+%%DATADIR%%/fw-irc.jar
+%%DATADIR%%/gettext-commons.jar
+%%DATADIR%%/guice-1.0.jar
+%%DATADIR%%/hashes
+%%DATADIR%%/httpclient-4.0-alpha3.jar
+%%DATADIR%%/httpcore-4.0-beta2.jar
+%%DATADIR%%/httpcore-nio-4.0-beta2.jar
+%%DATADIR%%/httpcore-niossl-4.0-alpha7.jar
+%%DATADIR%%/icu4j.jar
+%%DATADIR%%/jaudiotagger.jar
+%%DATADIR%%/jcraft.jar
+%%DATADIR%%/jdic.jar
+%%DATADIR%%/jdic_stub.jar
+%%DATADIR%%/jflac.jar
+%%DATADIR%%/jl.jar
+%%DATADIR%%/jogg.jar
+%%DATADIR%%/jorbis.jar
+%%DATADIR%%/jmdns.jar
+%%DATADIR%%/log4j.jar
+%%DATADIR%%/log4j.properties
+%%DATADIR%%/looks.jar
+%%DATADIR%%/lw-all.jar
+%%DATADIR%%/messages.jar
+%%DATADIR%%/mp3spi.jar
+%%DATADIR%%/onion-common.jar
+%%DATADIR%%/onion-fec.jar
+%%DATADIR%%/vorbisspi.jar
+%%DATADIR%%/root/magnet10/badge.img
+%%DATADIR%%/root/magnet10/canHandle.img
+%%DATADIR%%/root/magnet10/limewire.gif
+%%DATADIR%%/root/magnet10/options.js
+%%DATADIR%%/root/magnet10/silentdetect.js
+%%DATADIR%%/spacer.gif
+%%DATADIR%%/themes.jar
+%%DATADIR%%/tritonus.jar
+%%DATADIR%%/update.ver
+ at dirrm %%DATADIR%%/root/magnet10
+ at dirrm %%DATADIR%%/root
+ at dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
--- /dev/null
+++ net-p2p/frostwire/Makefile
@@ -0,0 +1,39 @@
+# $MidnightBSD: mports/net-p2p/frostwire/Makefile,v 1.1 2009/01/04 22:53:42 laffer1 Exp $
+
+PORTNAME=	frostwire
+PORTVERSION=	4.17.0
+CATEGORIES=	net-p2p java
+MASTER_SITES=	http://main2.frostwire.com/frostwire/${PORTVERSION}/ \
+		http://main3.frostwire.com/frostwire/${PORTVERSION}/
+DISTNAME=	${PORTNAME}-${PORTVERSION}.noarch
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	A Java based Gnutella and Bittorrent client
+LICENSE=	gpl2
+
+RUN_DEPENDS=	java:${PORTSDIR}/java/javavmwrapper
+
+USE_JAVA=	yes
+JAVA_VERSION=	1.5+
+NO_BUILD=	yes
+WRKSRC=		${WRKDIR}/${DISTNAME:S/.7/.6/}
+
+DATADIR=	${JAVASHAREDIR}/${PORTNAME}
+
+SUB_FILES=	${PORTNAME}.sh
+
+post-extract:
+	@cd ${WRKSRC} && ${RM} -f *.so *.sh COPYING && \
+		${MV} changelog frostwire.desktop ..
+	@${FIND} ${WRKSRC} -type d -name .svn -print0 | ${XARGS} -0 ${RM} -rf
+
+do-install:
+	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${PREFIX}/bin/${PORTNAME}
+	${MKDIR} ${DATADIR}
+	${CP} -R ${WRKSRC}/* ${DATADIR}
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKDIR}/changelog ${DOCSDIR}
+.endif
+
+.include 
--- /dev/null
+++ net-p2p/frostwire/distinfo
@@ -0,0 +1,3 @@
+MD5 (frostwire-4.17.0.noarch.tar.gz) = 7aa83a23729a4938a512d07654cccf26
+SHA256 (frostwire-4.17.0.noarch.tar.gz) = b3818c46a6fd03c29a8464ab007f2d4914c4a77ca11b7641cd50b4eb03c33404
+SIZE (frostwire-4.17.0.noarch.tar.gz) = 13645321
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/net-p2p/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -L net-p2p/Makefile -L net-p2p/Makefile -u -r1.7 -r1.8
--- net-p2p/Makefile
+++ net-p2p/Makefile
@@ -4,6 +4,7 @@
     COMMENT = peer-to-peer network applications
 
     SUBDIR += ctorrent
+    SUBDIR += frostwire
     SUBDIR += gift
     SUBDIR += gift-fasttrack
     SUBDIR += gift-gnutella
--- /dev/null
+++ net-p2p/frostwire/files/frostwire.sh.in
@@ -0,0 +1,6 @@
+#!/bin/sh
+
+export J2SE_PREEMPTCLOSE=1
+export JAVA_VERSION="1.5+"
+
+cd "%%DATADIR%%" && exec "%%LOCALBASE%%/bin/java" -jar FrostWire.jar "$@"

From laffer1 at midnightbsd.org  Sun Jan  4 17:58:16 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 17:58:16 -0500 (EST)
Subject: [Midnightbsd-cvs] src: man/man4: Remove fast ipsec man page
Message-ID: <200901042258.n04MwG1Q086946@stargazer.midnightbsd.org>

Log Message:
-----------
Remove fast ipsec man page

Modified Files:
--------------
    src/share/man/man4:
        Makefile (r1.10 -> r1.11)

Removed Files:
-------------
    src/share/man/man4:
        fast_ipsec.4

-------------- next part --------------
--- share/man/man4/fast_ipsec.4
+++ /dev/null
@@ -1,116 +0,0 @@
-.\" Copyright (c) 2003
-.\"	Sam Leffler . All rights reserved.
-.\"
-.\" Redistribution and use in source and binary forms, with or without
-.\" modification, are permitted provided that the following conditions
-.\" are met:
-.\" 1. Redistributions of source code must retain the above copyright
-.\"    notice, this list of conditions and the following disclaimer.
-.\" 2. Redistributions in binary form must reproduce the above copyright
-.\"    notice, this list of conditions and the following disclaimer in the
-.\"    documentation and/or other materials provided with the distribution.
-.\"
-.\" THIS SOFTWARE IS PROVIDED BY Sam Leffler AND CONTRIBUTORS ``AS IS'' AND
-.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-.\" ARE DISCLAIMED.  IN NO EVENT SHALL Bill Paul OR THE VOICES IN HIS HEAD
-.\" BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-.\" CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-.\" SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-.\" INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
-.\" CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
-.\" THE POSSIBILITY OF SUCH DAMAGE.
-.\"
-.\" $FreeBSD: src/share/man/man4/fast_ipsec.4,v 1.3 2005/01/21 08:36:37 ru Exp $
-.\"
-.Dd January 20, 2003
-.Dt FAST_IPSEC 4
-.Os
-.Sh NAME
-.Nm "Fast IPsec"
-.Nd hardware-accelerated IP Security Protocols
-.Sh SYNOPSIS
-.Cd "options FAST_IPSEC"
-.Cd "device crypto"
-.Pp
-.Bl -item -compact
-.It
-.Va net.inet.esp.enable
-.It
-.Va net.inet.ah.enable
-.It
-.Va net.inet.ipcomp.enable
-.El
-.Sh DESCRIPTION
-.Tn IPsec
-is a set of protocols,
-.Tn ESP
-(for Encapsulating Security Payload)
-.Tn AH
-(for Authentication Header),
-and
-.Tn IPComp
-(for IP Payload Compression Protocol)
-that provide security services for IP datagrams.
-.Nm
-is an experimental implementation of these protocols that uses the
-.Xr crypto 4
-subsystem to carry out cryptographic operations.
-This means, in particular, that cryptographic hardware devices are
-employed whenever possible to optimize the performance of these protocols.
-.Pp
-In general, the
-.Nm
-implementation is intended to be compatible with the
-.Tn KAME IPsec
-implementation.
-This documentation concentrates on differences from that software.
-The user should refer to
-.Xr ipsec 4
-for basic information on setting up and using these protocols.
-.Pp
-System configuration requires the
-.Xr crypto 4
-subsystem.
-When the
-.Nm
-protocols are configured for use, all protocols are included in the system.
-To selectively enable/disable protocols, use
-.Xr sysctl 8 .
-.Sh DIAGNOSTICS
-To be added.
-.Sh SEE ALSO
-.Xr crypto 4 ,
-.Xr ipsec 4 ,
-.Xr setkey 8 ,
-.Xr sysctl 8
-.Sh HISTORY
-The protocols draw heavily on the
-.Ox
-implementation of the
-.Tn IPsec
-protocols.
-The policy management code is derived from the
-.Tn KAME
-implementation found
-in their
-.Tn IPsec
-protocols.
-The
-.Nm
-protocols first appeared in
-.Fx 5.0 .
-.Sh BUGS
-There is presently no support for IPv6.
-.Pp
-The
-.Tn IPcomp
-protocol support does not work.
-.Pp
-Certain legacy authentication algorithms are not supported because of
-issues with the
-.Xr crypto 4
-subsystem.
-.Pp
-This documentation is incomplete.
Index: Makefile
===================================================================
RCS file: /home/cvs/src/share/man/man4/Makefile,v
retrieving revision 1.10
retrieving revision 1.11
diff -L share/man/man4/Makefile -L share/man/man4/Makefile -u -r1.10 -r1.11
--- share/man/man4/Makefile
+++ share/man/man4/Makefile
@@ -73,7 +73,6 @@
 	esp.4 \
 	exca.4 \
 	faith.4 \
-	fast_ipsec.4 \
 	fatm.4 \
 	fd.4 \
 	fdc.4 \

From laffer1 at midnightbsd.org  Sun Jan  4 17:59:17 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 17:59:17 -0500 (EST)
Subject: [Midnightbsd-cvs] src: share/examples: Atm isn't connected to the
	build anymore (mpsafe
Message-ID: <200901042259.n04MxHpF087050@stargazer.midnightbsd.org>

Log Message:
-----------
Atm isn't connected to the build anymore (mpsafe issues)

Modified Files:
--------------
    src/share/examples:
        Makefile (r1.4 -> r1.5)

Removed Files:
-------------
    src/share/examples/atm:
        NOTES
        README
        Startup
        atm-config.sh
        atm-sockets.txt
        cpcs-design.txt
        fore-microcode.txt
        sscf-design.txt
        sscop-design.txt

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/share/examples/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L share/examples/Makefile -L share/examples/Makefile -u -r1.4 -r1.5
--- share/examples/Makefile
+++ share/examples/Makefile
@@ -5,7 +5,6 @@
 
 LDIRS=	IPv6 \
 	MidnightBSD_version \
-	atm \
 	bootforth \
 	cvsup \
 	diskless \
--- share/examples/atm/Startup
+++ /dev/null
@@ -1,127 +0,0 @@
-HARP ATM Startup Configuration Instructions
-===========================================
-
-The following steps are required in order to use the HARP ATM software.
-See the file atm-config.sh for an example ATM startup script.
-
-1.  Each ATM physical interface must be configured with one or more network
-    interfaces.  The physical interfaces are named:
-
-	FORE Systems: hfa0, hfa1, ...
-	Efficient Networks: hea0, hea1, ...
-
-    The network interface names and the number of network interfaces for a
-    particular physical interface are specified via the atm command.  The
-    network interface name prefix may be any alphabetic string, but the 
-    generated network interface names must be unique amongst all network
-    interfaces, including non-ATM interfaces.
-
-    To configure the network interfaces, type:
-
-	atm set netif   
-
-    For example, the command:
-
-	atm set netif hfa0 ni 3
-
-    will generate the network interfaces ni0, ni1 and ni2 on the physical
-    interface hfa0.
-
-    For further details, see the man page atm(8).
-
-
-2.  Each ATM network interface (netif) must be configured with an IP network
-    address.  Each network interface must be on a different IP subnet.
-
-    To configure the network interface, type:
-
-	ifconfig   up
-
-
-3.  Each ATM physical interface must have a signalling manager attached.  The
-    interfaces may have the same or different signalling managers.
- 
-    To attach a signalling manager, type:
-
-	atm attach  
-
-	where  may be:
-
-		sigpvc - to only support PVCs on the interface;
-		spans - to run FORE Systems SPANS signalling protocol across 
-			the interface, plus support of PVCs;
-		uni30 - to run ATM Forum UNI 3.0 signalling protocol across 
-			the interface, plus support of PVCs;
-		uni31 - to run ATM Forum UNI 3.1 signalling protocol across 
-			the interface, plus support of PVCs;
-
-    For further details, see the man page atm(8).
-
-
-4.  Each of the host's PVCs (if any) must be defined.  
- 
-    To define a PVC, type:
-
-	atm add pvc       ....
-
-	where  is the name of the ATM physical interface 
-			over which the PVC is being defined;
-	       is the VPI value for the PVC;
-	       is the VCI value for the PVC;
-	       is the AAL type which the PVC endpoints will use;
-	       is the encapsulation which the PVC endpoints will use;
-	       specifies the the owner of the PVC, which may be:
-			ip - the PVC is used for IP traffic;
-
-	additional parameters may be required, depending on the PVC owner:
-
-	for owner=ip,
-	       is the name of the PVC's network interface;
-	       specifies the IP address at the remote end of this PVC;
-
-    For further details, see the man page atm(8).
-
-
-5.  HARP includes an ILMI daemon, which will perform host address registration
-    with the ATM switch for ATM Forum UNI interfaces.  If ILMI support is
-    available and activated in the ATM switch and the ILMI daemon is running
-    (see ilmid(8)), no further registration procedures are required.  
-    The 'atm set prefix' command is not needed in this case.
-
-    If ILMI address registration support is not available or activated, then
-    the host must be manually registered with its switch.  There should be
-    a user command available on the switch in order to do the registration.
-
-    For example, if you are using a FORE Systems switch, you should enter
-    the following AMI command:
-
-	> conf nsap route new  152  0 
-
-    If you are using a Cisco LightStream 1010 switch, you would use the
-    following configuration command:
-
-       > atm route  atm  internal
-
-    For ATM Forum UNI interfaces, the 'atm set prefix' command must also
-    be issued when not using ILMI address registration.
-
-
-6.  HARP includes support for the Server Cache Synchronization Protocol (SCSP),
-    which can synchronize the ATMARP caches of multiple ATMARP servers.
-    Obviously, this is only useful on hosts which are ATMARP servers.
-
-    To run SCSP between servers, two daemons, scspd and atmarpd, must be
-    started.  Scspd implements the SCSP protocol and atmarpd provides an
-    interface between scspd and the ATMARP server in the kernel.  Scspd
-    requires a configuration file.  It will look for a configuration
-    file at /etc/scspd.conf unless told otherwise.
-    
-    An example of commands to start the two daemons is:
-
-	# scspd
-	# atmarpd 
-
-    See the man pages scspd(8) and atmarpd(8) for further information.
-
-	@(#) $FreeBSD: src/share/examples/atm/Startup,v 1.2 1999/08/28 00:19:07 peter Exp $
-
--- share/examples/atm/sscop-design.txt
+++ /dev/null
@@ -1,220 +0,0 @@
-
-	SSCOP Design
-	============
-
-SAP_SSCOP Interface
--------------------
-This is the stack SAP interface between the SSCOP module and an SSCOP user 
-module (eg. SSCF).  The stack commands defined for this interface are modeled 
-after the SSCOP protocol specification primitives AA-xxx.  See the protocol 
-specification documents referenced below for full descriptions of the SSCOP 
-interface presented to an SSCF.
-
-
-o The following stack commands are sent from an SSCF to SSCOP:
-
-Stack Command:	SSCOP_INIT
-Description:	Initialize a SAP instance.  This should be the first stack
-		command issued across the SAP instance after the service stack 
-		has been successfully instantiated.
-Argument 1:	Specifies the SSCOP version to be used for this stack instance.
-		(enum sscop_vers) 
-Argument 2:	Pointer to a structure containing the SSCOP protocol parameter
-		values to be used for this instance. (struct sscop_parms *)
-
-
-Stack Command:	SSCOP_TERM
-Description:	Terminate a SAP instance.  This must be the last stack command
-		issued across the SAP instance.  The stack instance will be
-		deleted upon completion of this command.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_ESTABLISH_REQ
-Description:	Request the establishment of an SSCOP connection for assured 
-		information transfer to the remote peer entity.
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data to be sent to the peer.
-		Must be coded as SSCOP_UU_NULL.  (struct mbuf *)
-Argument 2:	Buffer Release (BR) parameter.  Must be coded as SSCOP_BR_YES.
-		(int)
-
-
-Stack Command:	SSCOP_ESTABLISH_RSP
-Description:	Response indicating that an SSCOP connection establishment 
-		request from the remote peer is acceptable.
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data to be sent to the peer.
-		Must be coded as SSCOP_UU_NULL.  (struct mbuf *)
-Argument 2:	Buffer Release (BR) parameter.  Must be coded as SSCOP_BR_YES.
-		(int)
-
-
-Stack Command:	SSCOP_RELEASE_REQ
-Description:	Request the termination of an SSCOP connection with the 
-		remote peer entity.  
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data to be sent to the peer.
-		Must be coded as SSCOP_UU_NULL.  (struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_DATA_REQ
-Description:	Request that an assured SDU be sent to the remote peer.
-Argument 1:	Pointer to an mbuf chain containing the user SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RESYNC_REQ
-Description:	Request the resynchronization of an SSCOP connection.
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data to be sent to the peer.
-		Must be coded as SSCOP_UU_NULL.  (struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RESYNC_RSP
-Description:	Acknowledge the remote peer's resynchronization of an SSCOP 
-		connection.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RECOVER_RSP (Q.2110 only)
-Description:	Acknowledge the indication that the SSCOP connection has 
-		recovered from SSCOP protocol errors.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_UNITDATA_REQ
-Description:	Request that an unacknowledged SDU be sent to the remote peer.
-Argument 1:	Pointer to an mbuf chain containing the user SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RETRIEVE_REQ
-Description:	Not supported.
-Argument 1:	N/A
-Argument 2:	N/A
-
-
-o The following stack commands are sent from SSCOP to an SSCF:
-
-Stack Command:	SSCOP_ESTABLISH_IND
-Description:	Indication that a request to establish an SSCOP connection has 
-		been received from the remote peer entity.
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data received from the peer.
-		(struct mbuf *)
-Argument 2:	Source of establish request (Q.SAAL1 only). Valid values are 
-		SSCOP_SOURCE_SSCOP or SSCOP_SOURCE_USER. (int)
-
-
-Stack Command:	SSCOP_ESTABLISH_CNF
-Description:	Confirmation from the remote peer of an SSCOP connection 
-		establishment, previously requested via an SSCOP_ESTABLISH_REQ
-		command.
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data received from the peer.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RELEASE_IND
-Description:	Indication that an SSCOP connection has been terminated by 
-		the remote peer entity.
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data received from the peer.
-		(struct mbuf *)
-Argument 2:	Source of release request. Valid values are SSCOP_SOURCE_SSCOP
-		or SSCOP_SOURCE_USER. (int)
-
-
-Stack Command:	SSCOP_RELEASE_CNF
-Description:	Confirmation from the remote peer of an SSCOP connection 
-		termination, previously requested via an SSCOP_RELEASE_REQ 
-		command.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_DATA_IND
-Description:	Indication that an assured SDU has been received from the 
-		remote peer.
-Argument 1:	Pointer to an mbuf chain containing the peer's SDU.
-		(struct mbuf *)
-Argument 2:	Sequence number of the received SDU. (sscop_seq)
-
-
-Stack Command:	SSCOP_RESYNC_IND
-Description:	Indication that the remote peer has requested the
-		resynchronization of the SSCOP connection.
-Argument 1:	Pointer to an mbuf chain containing any SSCOP User-to-User
-		Information (SSCOP-UU / UUI) data received from the peer.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RESYNC_CNF
-Description:	Confirmation from the remote peer that an SSCOP connection
-		has been resynchronized.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RECOVER_IND (Q.2110 only)
-Description:	Indication that an SSCOP connection has recovered from SSCOP
-		protocol errors.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_UNITDATA_IND
-Description:	Indication that an unacknowledged SDU has been received from 
-		the remote peer.
-Argument 1:	Pointer to an mbuf chain containing the peer's SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCOP_RETRIEVE_IND
-Description:	Not supported.
-Argument 1:	N/A
-Argument 2:	N/A
-
-
-Stack Command:	SSCOP_RETRIEVECMP_IND
-Description:	Not supported.
-Argument 1:	N/A
-Argument 2:	N/A
-
-
-
-Protocol Specifications
------------------------
-For SSCOP_VERS_QSAAL, see Q.SAAL1.
-For SSCOP_VERS_Q2110, see Q.2110.
-
-
-
-Implementation Limitations
---------------------------
-o The following signals are not supported:
-	AA-RETRIEVE
-	AA-RETRIEVE COMPLETE
-	AA-RELEASEBUF (Q.SAAL1 only)
-	MAA-UNITDATA
-
-o Does not support sending the SSCOP-UU/UUI parameter, must be set to NULL
-
-o For the AA-ESTABLISH request and response signals, only BR=YES is supported 
-
-o For the AA-DATA request signal, only PR=NO is supported (Q.SAAL1 only)
-
-
-	@(#) $FreeBSD: src/share/examples/atm/sscop-design.txt,v 1.2 1999/08/28 00:19:08 peter Exp $
-
--- share/examples/atm/atm-sockets.txt
+++ /dev/null
@@ -1,572 +0,0 @@
-
-	HARP Native ATM Sockets API
-	===========================
-
-ATM sockets are an extension to the traditional BSD sockets API to allow
-direct user-level access to native ATM protocol services.  The ATM sockets
-extensions are implemented via the addition of a new protocol family (PF_ATM)
-and a new socket address structure (struct sockaddr_atm).  
-
-The HARP implementation of native ATM sockets capabilities is intended to be
-conformant with The Open Group specifications (with known differences listed 
-below) as defined in the following document:
-
-	The Open Group: Networking Services (XNS) Issue 5 
-		ISBN 1-85912-165-9
-		http://www.rdg.opengroup.org/public/pubs/catalog/c523.htm
-
-And in particular, it is based on the following ATM-specific sections in the
-above document:
-
-	ATM Transport Protocol Information for Sockets
-	ATM Transport Protocol Information for XTI
-	ATM Transport Headers
-
-The ATM sockets API is an implementation based on the definitions and
-descriptions set forth in the following document:
-
-	The ATM Forum: Native ATM Services: Semantic Description, Version 1.0
-		af-saa-0048.000
-		http://www.atmforum.com/atmforum/specs/approved.html
-
-
-Using the HARP Implementation
------------------------------
-This document only provides the HARP-specific information necessary for using 
-the ATM sockets API.  Please refer to the XNS document described above for
-all of the general interface specifications.  There is also sample source
-code for an ATM sockets application included at the end of this document.
-
-All user definitions for the HARP ATM sockets implementation are contained
-in the file /usr/include/netatm/atm.h.  This file must be included in the
-user's C program source file.  In this file, all HARP extensions to the base 
-XNS specifications are denoted with a comment string of "XNS_EXT".
-
-
-HARP Extensions to XNS Issue 5
-------------------------------
-o Socket address structure for ATM addresses
-
-  An ATM socket address structure was not specifically defined by XNS,
-  although the t_atm_sap structure was defined to be used as an ATM protocol
-  address.  Thus, HARP has defined an ATM socket address (using address
-  family AF_ATM) as a 'struct sockaddr_atm', which contains 'struct t_atm_sap'
-  as the protocol address.  This structure (properly cast) must be used on
-  all ATM socket system calls requiring a 'struct sockaddr' parameter.
-
-o Network Interface Selection socket option (T_ATM_NET_INTF)
-
-  This option is used to specify the name of the network interface to be
-  used to route an outgoing ATM call using a socket connection.  This option
-  is only needed when there are multiple ATM network interfaces defined on a
-  system.  If this option is not set, then the first network interface on
-  the first physical ATM interface defined will be used.
-
-  See the sample application below for an example of the use of this option.
-
-o LLC Multiplexing socket option (T_ATM_LLC)
-
-  For LLC encapsulated VCCs (BLLI Layer 2 Protocol == T_ATM_BLLI2_I8802),
-  HARP has implemented an LLC multiplexing facility.  In order to use this
-  multiplexing facility, a user must issue a setsockopt() call specifying the 
-  T_ATM_LLC option before the connect() or listen() system call is invoked.
-
-  If using the LLC multiplexor, the user will only receive PDUs which match
-  the LLC header information specified in the socket option.  The kernel 
-  multiplexing software will strip the LLC header from all inbound PDUs and 
-  add the specified LLC header to all outgoing PDUs - the user will never see 
-  the LLC header.  
-
-  For listening sockets, the listener will be notified for all incoming LLC 
-  calls (which also meet the other incoming call distribution selection 
-  criteria), since the LLC header information is only carried in the data 
-  PDUs, not in the signalling protocol.
-
-  The T_ATM_LLC_SHARING flag is used to denote whether this user wishes to
-  share the VCC with other LLC users requesting similar connection attributes 
-  to the same destination.
-
-o Application Name socket option (T_ATM_APP_NAME)
-
-  This option is used to associate an identifier string (typically, the
-  application's name) with an open ATM socket.  Currently, it is only used 
-  for the "Owner" field in the output of the 'atm show vcc' command.  If this 
-  option is not set, then the "Owner" field will default to "(AAL5)". 
-
-  See the sample application below for an example of the use of this option.
-
-o PVC support
-
-  The XNS document specifically does not provide support for ATM PVCs.
-  However, due in part to internal HARP requirements (the ILMI daemon), PVC
-  sockets are supported under the HARP implementation. 
-
-  To support PVC sockets, there is a new address format (T_ATM_PVC_ADDR) and
-  address definition (Atm_addr_pvc).   Since there is no actual signalling
-  involved in setting up a PVC, a PVC socket connection only defines the
-  local socket-to-pvc connection - the remainder of the virtual circuit through
-  the ATM network to the remote endpoint must be defined independent of the
-  local socket creation.  PVC socket connections are only allowed via the
-  connect() system call - listen()/accept() sockets cannot be supported.
-  Also, since there are no circuit parameters signalled, most of the 
-  setsockopt() options are silently ignored.
-
-o SPANS support
-
-  HARP has added ATM socket support for the FORE-proprietary SPANS address 
-  format (T_ATM_SPANS_ADDR).  A SPANS socket can only be established over 
-  an ATM physical interface which is using the SPANS signalling manager.
-  There is limited ATM socket option support - the socket options can be set, 
-  but most are silently ignored, since they are not applicable to the SPANS 
-  protocols.  The SPANS socket address support has not been thoroughly tested.
-
-o Miscellaneous user convenience typedefs, macros and defines
-
-
-XNS Issue 5 Features Not Supported in HARP
-------------------------------------------
-o ATM_PROTO_SSCOP
-
-  The socket protocol for reliable data transport (ATM_PROTO_SSCOP) is not
-  supported in this HARP release.  There is some initial skeleton code for
-  SSCOP support, but it was not completed.
-
-o Multipoint connections
-
-  The core HARP code does not provide support for multipoint connections, so,
-  obviously, multipoint socket connections are also not supported.  
-
-  The non-supported socket options are:
-	o T_ATM_ADD_LEAF
-	o T_ATM_DROP_LEAF
-	o T_ATM_LEAF_IND
-
-  The non-supported socket option values are:
-	o For the T_ATM_BEARER_CAP socket option:
-		o connection_configuration == T_ATM_1_TO_MANY
-
-
-Example ATM Socket Application
-------------------------------
-The following are simple example client and server applications using the ATM 
-socket API.
-
-/*
- * ATM API sample client application
- *
- * This application will open an ATM socket to a server, send a text string 
- * in a PDU and then read one PDU from the socket and print its contents.
- *
- */
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#define	MAX_LEN		4096	/* Maximum PDU length */
-#define	MY_ID		11	/* BLLI Layer 2 protocol */
-#define MY_APPL		"Client"
-
-Atm_addr_nsap	dst_addr = {
-	0x47,
-#error FIX ME: Replace the 2 lines below with your nsap prefix and esi address
-	{0x00,0x05,0x80,0xff,0xdc,0x00,0x00,0x00,0x00,0x02,0xff,0xff},
-	{0x11,0x22,0x33,0x44,0x55,0x66},
-	0x00
-};
-
-static char	message[] = "A message from the client";
-
-void
-print_cause(int s)
-{
-	struct	t_atm_cause	cause;
-	int	optlen;
-
-	optlen = sizeof(cause);
-	if (getsockopt(s, T_ATM_SIGNALING, T_ATM_CAUSE, &cause, &optlen) < 0) {
-		perror("getsockopt(cause)");
-		return;
-	}
-	
-	fprintf(stderr, "Cause: coding=%d loc=%d cause=%d diag=(%d,%d,%d,%d)\n",
-		cause.coding_standard, cause.location, cause.cause_value,
-		cause.diagnostics[0], cause.diagnostics[1], 
-		cause.diagnostics[2], cause.diagnostics[3]);
-}
-
-main(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	struct sockaddr_atm	satm;
-	struct t_atm_aal5	aal5;
-	struct t_atm_traffic	traffic;
-	struct t_atm_bearer	bearer;
-	struct t_atm_qos	qos;
-	struct t_atm_net_intf	netintf;
-	struct t_atm_app_name	appname;
-	char	buffer[MAX_LEN+1];
-	int	s, n, optlen;
-
-	/*
-	 * Create socket
-	 */
-	s = socket(AF_ATM, SOCK_SEQPACKET, ATM_PROTO_AAL5);
-	if (s < 0) {
-		perror("socket");
-		exit(1);
-	}
-
-	/*
-	 * Set up destination SAP
-	 */
-	bzero((caddr_t) &satm, sizeof(satm));
-	satm.satm_family = AF_ATM;
-#if (defined(BSD) && (BSD >= 199103))
-	satm.satm_len = sizeof(satm);
-#endif
-	/* Destination ATM address */
-	satm.satm_addr.t_atm_sap_addr.SVE_tag_addr = T_ATM_PRESENT;
-	satm.satm_addr.t_atm_sap_addr.SVE_tag_selector = T_ATM_PRESENT;
-	satm.satm_addr.t_atm_sap_addr.address_format = T_ATM_ENDSYS_ADDR;
-	satm.satm_addr.t_atm_sap_addr.address_length = sizeof(Atm_addr_nsap);
-	bcopy((caddr_t)&dst_addr,
-		(caddr_t)satm.satm_addr.t_atm_sap_addr.address,
-		sizeof(dst_addr));
-
-	/* BLLI Layer-2 protocol */
-	satm.satm_addr.t_atm_sap_layer2.SVE_tag = T_ATM_PRESENT;
-	satm.satm_addr.t_atm_sap_layer2.ID_type = T_ATM_USER_ID; 
-	satm.satm_addr.t_atm_sap_layer2.ID.user_defined_ID = MY_ID; 
-
-	/* BLLI Layer-3 protocol */
-	satm.satm_addr.t_atm_sap_layer3.SVE_tag = T_ATM_ABSENT;
-
-	/* BHLI protocol */
-	satm.satm_addr.t_atm_sap_appl.SVE_tag = T_ATM_ABSENT;
-
-	/*
-	 * Set up connection parameters
-	 */
-	aal5.forward_max_SDU_size = MAX_LEN;
-	aal5.backward_max_SDU_size = MAX_LEN;
-	aal5.SSCS_type = T_ATM_NULL;
-	optlen = sizeof(aal5);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_AAL5, (caddr_t)&aal5,
-			optlen) < 0) {
-		perror("setsockopt(aal5)");
-		exit(1);
-	}
-
-	traffic.forward.PCR_high_priority = T_ATM_ABSENT;
-	traffic.forward.PCR_all_traffic = 100000;
-	traffic.forward.SCR_high_priority = T_ATM_ABSENT;
-	traffic.forward.SCR_all_traffic = T_ATM_ABSENT;
-	traffic.forward.MBS_high_priority = T_ATM_ABSENT;
-	traffic.forward.MBS_all_traffic = T_ATM_ABSENT;
-	traffic.forward.tagging = T_NO;
-	traffic.backward.PCR_high_priority = T_ATM_ABSENT;
-	traffic.backward.PCR_all_traffic = 100000;
-	traffic.backward.SCR_high_priority = T_ATM_ABSENT;
-	traffic.backward.SCR_all_traffic = T_ATM_ABSENT;
-	traffic.backward.MBS_high_priority = T_ATM_ABSENT;
-	traffic.backward.MBS_all_traffic = T_ATM_ABSENT;
-	traffic.backward.tagging = T_NO;
-	traffic.best_effort = T_YES;
-	optlen = sizeof(traffic);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_TRAFFIC, (caddr_t)&traffic,
-			optlen) < 0) {
-		perror("setsockopt(traffic)");
-		exit(1);
-	}
-
-	bearer.bearer_class = T_ATM_CLASS_X;
-	bearer.traffic_type = T_ATM_NULL;
-	bearer.timing_requirements = T_ATM_NULL;
-	bearer.clipping_susceptibility = T_NO;
-	bearer.connection_configuration = T_ATM_1_TO_1;
-	optlen = sizeof(bearer);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_BEARER_CAP, (caddr_t)&bearer,
-			optlen) < 0) {
-		perror("setsockopt(bearer)");
-		exit(1);
-	}
-
-	qos.coding_standard = T_ATM_NETWORK_CODING;
-	qos.forward.qos_class = T_ATM_QOS_CLASS_0;
-	qos.backward.qos_class = T_ATM_QOS_CLASS_0;
-	optlen = sizeof(qos);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_QOS, (caddr_t)&qos,
-			optlen) < 0) {
-		perror("setsockopt(qos)");
-		exit(1);
-	}
-
-#ifdef REMOVE_TO_USE_NET_INTF
-#error FIX ME: Replace the ni0 below with the local atm network interface name
-	strncpy(netintf.net_intf, "ni0", IFNAMSIZ);
-	optlen = sizeof(netintf);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_NET_INTF, (caddr_t)&netintf,
-			optlen) < 0) {
-		perror("setsockopt(net_intf)");
-		exit(1);
-	}
-#endif
-
-	strncpy(appname.app_name, MY_APPL, T_ATM_APP_NAME_LEN);
-	optlen = sizeof(appname);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_APP_NAME, (caddr_t)&appname,
-			optlen) < 0) {
-		perror("setsockopt(app_name)");
-		exit(1);
-	}
-
-	/*
-	 * Now try to connect to destination
-	 */
-	if (connect(s, (struct sockaddr *) &satm, sizeof(satm)) < 0) {
-		perror("connect");
-		print_cause(s);
-		exit(1);
-	}
-
-	/*
-	 * Exchange message with peer
-	 */
-	if (write(s, message, sizeof(message)) != sizeof(message)) {
-		perror("write");
-		exit(1);
-	}
-
-	if ((n = read(s, buffer, MAX_LEN)) < 0) {
-		perror("read");
-		exit(1);
-	}
-
-	buffer[n] = '\0';
-	printf("received %d bytes: <%s>\n", n, buffer);
-
-	/*
-	 * Finish up
-	 */
-	if (close(s) < 0) {
-		perror("close");
-		exit(1);
-	}
-
-	exit(0);
-}
-
-
-
-/*
- * ATM API sample server application
- *
- * This application will loop forever listening for connections on an ATM 
- * socket.  When a new connection arrives, it will send a string in a PDU,
- * read one PDU from the socket and print its contents.
- *
- */
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-#define	MAX_LEN		4096	/* Maximum PDU length */
-#define	MY_ID		11	/* BLLI Layer 2 protocol */
-#define MY_APPL		"Server"
-
-static char	message[] = "A message from the server";
-
-void
-print_cause(int s)
-{
-	struct	t_atm_cause	cause;
-	int	optlen;
-
-	optlen = sizeof(cause);
-	if (getsockopt(s, T_ATM_SIGNALING, T_ATM_CAUSE, &cause, &optlen) < 0) {
-		perror("getsockopt(cause)");
-		return;
-	}
-	
-	fprintf(stderr, "Cause: coding=%d loc=%d cause=%d diag=(%d,%d,%d,%d)\n",
-		cause.coding_standard, cause.location, cause.cause_value,
-		cause.diagnostics[0], cause.diagnostics[1], 
-		cause.diagnostics[2], cause.diagnostics[3]);
-}
-
-main(argc, argv)
-	int	argc;
-	char	**argv;
-{
-	struct sockaddr_atm	satm;
-	struct t_atm_aal5	aal5;
-	struct t_atm_traffic	traffic;
-	struct t_atm_bearer	bearer;
-	struct t_atm_qos	qos;
-	struct t_atm_net_intf	netintf;
-	struct t_atm_app_name	appname;
-	char	buffer[MAX_LEN+1];
-	int	s, n, optlen;
-
-	/*
-	 * Create socket
-	 */
-	s = socket(AF_ATM, SOCK_SEQPACKET, ATM_PROTO_AAL5);
-	if (s < 0) {
-		perror("socket");
-		exit(1);
-	}
-
-	/*
-	 * Set up destination SAP
-	 */
-	bzero((caddr_t) &satm, sizeof(satm));
-	satm.satm_family = AF_ATM;
-#if (defined(BSD) && (BSD >= 199103))
-	satm.satm_len = sizeof(satm);
-#endif
-	/* Destination ATM address */
-	satm.satm_addr.t_atm_sap_addr.SVE_tag_addr = T_ATM_ANY;
-	satm.satm_addr.t_atm_sap_addr.SVE_tag_selector = T_ATM_ANY;
-
-	/* BLLI Layer-2 protocol */
-	satm.satm_addr.t_atm_sap_layer2.SVE_tag = T_ATM_PRESENT;
-	satm.satm_addr.t_atm_sap_layer2.ID_type = T_ATM_USER_ID; 
-	satm.satm_addr.t_atm_sap_layer2.ID.user_defined_ID = MY_ID; 
-
-	/* BLLI Layer-3 protocol */
-	satm.satm_addr.t_atm_sap_layer3.SVE_tag = T_ATM_ABSENT;
-
-	/* BHLI protocol */
-	satm.satm_addr.t_atm_sap_appl.SVE_tag = T_ATM_ABSENT;
-
-	/*
-	 * Set up connection parameters
-	 */
-	aal5.forward_max_SDU_size = MAX_LEN;
-	aal5.backward_max_SDU_size = MAX_LEN;
-	aal5.SSCS_type = T_ATM_NULL;
-	optlen = sizeof(aal5);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_AAL5, (caddr_t)&aal5,
-			optlen) < 0) {
-		perror("setsockopt(aal5)");
-		exit(1);
-	}
-
-	traffic.forward.PCR_high_priority = T_ATM_ABSENT;
-	traffic.forward.PCR_all_traffic = 100000;
-	traffic.forward.SCR_high_priority = T_ATM_ABSENT;
-	traffic.forward.SCR_all_traffic = T_ATM_ABSENT;
-	traffic.forward.MBS_high_priority = T_ATM_ABSENT;
-	traffic.forward.MBS_all_traffic = T_ATM_ABSENT;
-	traffic.forward.tagging = T_NO;
-	traffic.backward.PCR_high_priority = T_ATM_ABSENT;
-	traffic.backward.PCR_all_traffic = 100000;
-	traffic.backward.SCR_high_priority = T_ATM_ABSENT;
-	traffic.backward.SCR_all_traffic = T_ATM_ABSENT;
-	traffic.backward.MBS_high_priority = T_ATM_ABSENT;
-	traffic.backward.MBS_all_traffic = T_ATM_ABSENT;
-	traffic.backward.tagging = T_NO;
-	traffic.best_effort = T_YES;
-	optlen = sizeof(traffic);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_TRAFFIC, (caddr_t)&traffic,
-			optlen) < 0) {
-		perror("setsockopt(traffic)");
-		exit(1);
-	}
-
-	bearer.bearer_class = T_ATM_CLASS_X;
-	bearer.traffic_type = T_ATM_NULL;
-	bearer.timing_requirements = T_ATM_NULL;
-	bearer.clipping_susceptibility = T_NO;
-	bearer.connection_configuration = T_ATM_1_TO_1;
-	optlen = sizeof(bearer);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_BEARER_CAP, (caddr_t)&bearer,
-			optlen) < 0) {
-		perror("setsockopt(bearer)");
-		exit(1);
-	}
-
-	qos.coding_standard = T_ATM_NETWORK_CODING;
-	qos.forward.qos_class = T_ATM_QOS_CLASS_0;
-	qos.backward.qos_class = T_ATM_QOS_CLASS_0;
-	optlen = sizeof(qos);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_QOS, (caddr_t)&qos,
-			optlen) < 0) {
-		perror("setsockopt(qos)");
-		exit(1);
-	}
-
-	strncpy(appname.app_name, MY_APPL, T_ATM_APP_NAME_LEN);
-	optlen = sizeof(appname);
-	if (setsockopt(s, T_ATM_SIGNALING, T_ATM_APP_NAME, (caddr_t)&appname,
-			optlen) < 0) {
-		perror("setsockopt(app_name)");
-		exit(1);
-	}
-
-	/*
-	 * Now try to bind/listen
-	 */
-	if (bind(s, (struct sockaddr *) &satm, sizeof(satm)) < 0) {
-		perror("bind");
-		exit(1);
-	}
-	if (listen(s, 4) < 0) {
-		perror("listen");
-		exit(1);
-	}
-
-	for (; ; ) {
-		struct sockaddr_atm	claddr;
-		int	clsock, cllen;
-
-		/* Wait for incoming call */
-		cllen = sizeof(claddr);
-		clsock = accept(s, (struct sockaddr *) &claddr, &cllen);
-		if (clsock < 0) {
-			perror("accept");
-			exit(1);
-		}
-		printf("Server: new connection\n");
-		
-		/*
-		 * Exchange message with peer
-		 */
-		if (write(clsock, message, sizeof(message)) != sizeof(message)) {
-			perror("write");
-			exit(1);
-		}
-
-		if ((n = read(clsock, buffer, MAX_LEN)) < 0) {
-			perror("read");
-			exit(1);
-		}
-
-		buffer[n] = '\0';
-		printf("received %d bytes: <%s>\n", n, buffer);
-
-		sleep(1);
-
-		/*
-		 * Finish up
-		 */
-		if (close(clsock) < 0) {
-			perror("close");
-			exit(1);
-		}
-	}
-
-	close(s);
-	exit(0);
-}
-
-	@(#) $FreeBSD: src/share/examples/atm/atm-sockets.txt,v 1.3 1999/08/28 00:19:07 peter Exp $
-
--- share/examples/atm/sscf-design.txt
+++ /dev/null
@@ -1,129 +0,0 @@
-
-	SSCF UNI Design
-	===============
-
-SAP_SSCF_UNI Interface
-----------------------
-This is the stack SAP interface between the UNI signalling layer (eg. Q.2931)
-and the SSCF module.  The stack commands defined for this interface are modeled
-after the SSCF protocol specification primitives AAL-xxx.  See the protocol
-specification documents referenced below for full descriptions of the SSCF UNI
-interface presented to the signalling user.
-
-
-o The following stack commands are sent from the signalling module to SSCF:
-
-Stack Command:	SSCF_UNI_INIT
-Description:	Initialize a SAP instance.  This should be the first stack
-		command issued across the SAP instance after the service stack
-		has been successfully instantiated.
-Argument 1:	Specifies the UNI version to be used for this stack instance.
-		(enum uni_vers)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_TERM
-Description:	Terminate a SAP instance.  This must be the last stack command
-		issued across the SAP instance.  The stack instance will be
-		deleted upon completion of this command.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_ESTABLISH_REQ
-Description:	Request the establishment of an assured SAAL connection to the
-		SAAL peer entity.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_RELEASE_REQ
-Description:	Request the termination of an assured SAAL connection to the
-		SAAL peer entity.
-Argument 1:	Specifies whether future session establishment indications from
-		the SAAL peer should be processed.  Valid values are 
-		SSCF_UNI_ESTIND_YES or SSCF_UNI_ESTIND_NO. (int)
-		Note that this is a local implementation parameter only.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_DATA_REQ
-Description:	Request that an assured SDU be sent to the SAAL peer.
-Argument 1:	Pointer to an mbuf chain containing the user SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_UNITDATA_REQ
-Description:	Request that an unacknowledged SDU be sent to the SAAL peer.
-Argument 1:	Pointer to an mbuf chain containing the user SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-o The following stack commands are sent from SSCF to the signalling module:
-
-Stack Command:	SSCF_UNI_ESTABLISH_IND
-Description:	Indication that an assured SAAL connection has been established
-		by the SAAL peer entity.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_ESTABLISH_CNF
-Description:	Confirmation of an assured SAAL connection establishment,
-		previously requested via an SSCF_UNI_ESTABLISH_REQ command.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_RELEASE_IND
-Description:	Indication that an assured SAAL connection has been terminated
-		by the SAAL peer entity.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_RELEASE_CNF
-Description:	Confirmation of an assured SAAL connection termination,
-		previously requested via an SSCF_UNI_RELEASE_REQ command.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_DATA_IND
-Description:	Indication that an assured SDU has been received from the 
-		SAAL peer.
-Argument 1:	Pointer to an mbuf chain containing the peer's SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	SSCF_UNI_UNITDATA_IND
-Description:	Indication that an unacknowledged SDU has been received from 
-		the SAAL peer.
-Argument 1:	Pointer to an mbuf chain containing the peer's SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-
-Protocol Specifications
------------------------
-For UNI_VERS_3_0, see Q.SAAL2.
-For UNI_VERS_3_1, see Q.2130.
-
-
-
-Implementation Limitations
---------------------------
-o The Parameter Data parameter is not supported for the following primitives:
-	AAL-ESTABLISH request
-	AAL-ESTABLISH indication
-	AAL-ESTABLISH confirm
-	AAL-RELEASE request
-	AAL-RELEASE indication
-
-
-	@(#) $FreeBSD: src/share/examples/atm/sscf-design.txt,v 1.2 1999/08/28 00:19:08 peter Exp $
-
--- share/examples/atm/cpcs-design.txt
+++ /dev/null
@@ -1,84 +0,0 @@
-
-	CPCS Design
-	===========
-
-SAP_CPCS Interface
-------------------
-This is the stack SAP interface between an AAL CPCS provider and an AAL CPCS
-user.  The stack commands defined for this interface are modeled after the 
-AAL3/4 and AAL5 protocol specification primitives CPCS-xxx.  See the protocol 
-specification documents referenced below for full descriptions of the CPCS 
-interface.
-
-
-o The following stack commands are sent from a CPCS user to the CPCS provider:
-
-Stack Command:	CPCS_INIT
-Description:	Initialize a SAP instance.  This should be the first stack
-		command issued across the SAP instance after the service stack 
-		has been successfully instantiated.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	CPCS_TERM
-Description:	Terminate a SAP instance.  This must be the last stack command
-		issued across the SAP instance.  The stack instance will be
-		deleted upon completion of this command.
-Argument 1:	Not used.
-Argument 2:	Not used.
-
-
-Stack Command:	CPCS_UNITDATA_INV
-Description:	Request that an SDU be sent to the remote AAL user.
-Argument 1:	Pointer to an mbuf chain containing the user SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	CPCS_UABORT_INV
-Description:	Not supported.
-Argument 1:	N/A
-Argument 2:	N/A
-
-
-o The following stack commands are sent from the CPCS provider to a CPCS user:
-
-Stack Command:	CPCS_UNITDATA_SIG
-Description:	Indication that an SDU has been received from the remote AAL 
-		user.
-Argument 1:	Pointer to an mbuf chain containing the peer's SDU.
-		(struct mbuf *)
-Argument 2:	Not used.
-
-
-Stack Command:	CPCS_UABORT_SIG
-Description:	Not supported.
-Argument 1:	N/A
-Argument 2:	N/A
-
-
-Stack Command:	CPCS_PABORT_SIG
-Description:	Not supported.
-Argument 1:	N/A
-Argument 2:	N/A
-
-
-
-Protocol Specifications
------------------------
-See I.363.
-
-
-
-Implementation Limitations
---------------------------
-o The CPCS-LP, CPCS-CI and CPCS-UU parameters are not supported.
-
-o The Streaming Mode service is not supported.
-
-o The Abort service is not supported.
-
-
-	@(#) $FreeBSD: src/share/examples/atm/cpcs-design.txt,v 1.2 1999/08/28 00:19:07 peter Exp $
-
--- share/examples/atm/atm-config.sh
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-#
-#
-# ===================================
-# HARP  |  Host ATM Research Platform
-# ===================================
-#
-#
-# This Host ATM Research Platform ("HARP") file (the "Software") is
-# made available by Network Computing Services, Inc. ("NetworkCS")
-# "AS IS".  NetworkCS does not provide maintenance, improvements or
-# support of any kind.
-#
-# NETWORKCS MAKES NO WARRANTIES OR REPRESENTATIONS, EXPRESS OR IMPLIED,
-# INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY
-# AND FITNESS FOR A PARTICULAR PURPOSE, AS TO ANY ELEMENT OF THE
-# SOFTWARE OR ANY SUPPORT PROVIDED IN CONNECTION WITH THIS SOFTWARE.
-# In no event shall NetworkCS be responsible for any damages, including
-# but not limited to consequential damages, arising from or relating to
-# any use of the Software or related support.
-#
-# Copyright 1994-1998 Network Computing Services, Inc.
-#
-# Copies of this Software may be made, however, the above copyright
-# notice must be reproduced on all copies.
-#
-#	@(#) $FreeBSD: src/share/examples/atm/atm-config.sh,v 1.2 1999/08/28 00:19:07 peter Exp $
-#
-#
-
-#
-# Sample script to load and configure ATM software
-#
-
-#
-# Download FORE microcode into adapter(s)
-#
-# This step is only required if you are using FORE ATM adapters.
-# This assumes that the FORE microcode file pca200e.bin is in /etc.
-# See the file fore-microcode.txt for further details.
-#
-/sbin/fore_dnld -d /etc
-
-#
-# Define network interfaces
-#
-/sbin/atm set netif hfa0  1
-
-#
-# Configure physical interfaces
-#
-/sbin/atm attach hfa0 uni31
-
-#
-# Start ILMI daemon (optional)
-#
-/sbin/ilmid
-
-#
-# Set ATM address prefix
-#
-# Only need to set prefix if using UNI and not using ILMI daemon
-#
-#/sbin/atm set prefix hfa0 
-
-#
-# Configure network interfaces
-#
-/sbin/ifconfig   netmask + up
-/sbin/atm set arpserver  
-
-#
-# Configure PVCs (optional)
-#
-#/sbin/atm add pvc hfa0   aal5 null ip  
-
-#
-# Start SCSP daemons (optional)
-#
-# This step is only required if your host is configured as an ATMARP server
-# and you wish to synchronize its cache with the cache(s) of some other
-# server(s).  Scspd will look for its configuration file at /etc/scspd.conf.
-#
-#/usr/sbin/scspd
-#/usr/sbin/atmarpd  ...
-
-exit 0
-
--- share/examples/atm/fore-microcode.txt
+++ /dev/null
@@ -1,93 +0,0 @@
-
-HARP and FORE Systems Microcode
-===============================
-
-ATM adapters from FORE Systems use Intel i960 embedded processors and 
-require that application software (herein called "microcode") be downloaded
-and executed on the adapter. The interface between the microcode and the host
-device driver is specified in the FORE ATM Adaptation Layer Interface (AALI) 
-(available from ftp.fore.com:/pub/docs/port). HARP uses microcode supplied 
-by FORE Systems. The HARP device driver for the FORE adapter (hfa) conforms 
-to the AALI specification.
-
-As part of the HARP ATM initialization procedure, the HARP 'fore_dnld' utility
-must be invoked in order to load the microcode file into each FORE adapter.
-However, the microcode file is NOT included in the FreeBSD distribution. It is 
-the user's responsibility to obtain and install the FORE microcode file. Below 
-are notes to assist users in finding and installing microcode known to work
-with HARP. 
-
-FORE microcode files can be obtained from either FORE's web site
-(http://www.fore.com) or the CD distributed with new FORE adapters.
-When using FORE's web site, you must have a valid login to access the
-TACtics Online section of the site. The software download section is
-available via the 'Services & Support'->'TACtics Online'->Software links.
-
-If you are currently using HARP and already have a working microcode file, 
-that microcode will continue to work with this release of HARP.
-
-
-PCA200E
--------
-
-From the FORE web pages, the following PCA200E adapter distributions
-are known to have microcode which will work with HARP:
-
-	pc_adapter->OS/2->archive->os2_4.0.2_1.20.200.zip
-		unzip the file and execute the command:
-
-		cp -p /Drivers/PCA200E.BIN /etc/pca200e.bin
-
-	pc_adapter->'Windows NT'->archive->pca2e_12.zip
-		unzip the file and execute the command:
-
-		cp -p /NT/I386/PCA200E.BIN /etc/pca200e.bin
-
-
-The following distributions from the FORE web pages are known to have 
-microcode which will NOT work with HARP:
-
-	pc_adapter:
-		OS/2:
-			release:
-				os2_4.1.0_1.74.zip
-		Windows95:
-			archive:
-				pc-w95_5.0.0.16432.zip
-				win95_4.0.3_1.04.200.zip
-				win95_4.1.6_1.16.zip
-			release:
-				pc-w95_4.1.6_27.zip
-		Windows NT:
-			archive:
-				pc-nt_5.0.0_16342.zip
-				winnt_4.0.3_1.05.200.zip
-				winnt_4.1.2_1.27.zip
-				winnt_4.1.6_1.16.zip
-			release:
-				pc-nt_4.1.6_27.zip
-				pc-nt_i386_5.0.0_25096.zip
-
-
-From the "ForeRunner 200E for PC/Mac" distribution CD-ROM, the following 
-PCA200E adapter distributions are known to have microcode which will work 
-with HARP (assuming the CD-ROM is mounted on /cdrom):
-
-	/cdrom/rel4.0/os2/
-		execute the command:
-		
-		cp -p /cdrom/rel4.0/os2/drivers/pca200e.bin /etc/pca200e.bin
-
-
-Note: Windows-based files are supplied in a compressed form. If the
-'fore_dnld' command complains about an unrecognized header format, you should
-try to uncompress the microcode file. To do so, move the file in binary mode
-to a DOS/Windows machine and use the DOS command 'expand' to uncompress the
-file. The command syntax is:
-
-	expand  
-
-Move the resulting  in binary mode back to the HARP machine as
-/etc/pca200e.bin and try to initialize the ATM system again.
-
-	@(#) $FreeBSD: src/share/examples/atm/fore-microcode.txt,v 1.2 2004/06/20 13:07:25 mpp Exp $
--- share/examples/atm/NOTES
+++ /dev/null
@@ -1,54 +0,0 @@
-
-                                   HARP Notes
-                                   1998-09-14
-
-This is a list of currently known incompatibilities and miscellaneous gotchas 
-in HARP.  
-
-To report new items, please send mail to harp-bugs at magic.net.
-
-================================================================================
-
-
-Efficient Driver and DMA sizes
-==============================
-
-The Efficient adapter moves PDUs between host memory and adapter memory with 
-the help of DMA descriptor lists. Each DMA descriptor consists of two words. 
-Word 0 contains a DMA type identifier and a repetition count. Word 1 contains 
-the physical (not virtual) host buffer address. Each DMA type is really an 
-encoding of the burst size for the DMA. (See /usr/src/sys/dev/hea/eni.h for
-more on the DMA types.) HARP was originally developed using burst sizes of 
-8_WORD, 4_WORD, and 1_WORD sizes. Each DMA request would be built to first 
-move as much data as possible using an 8_WORD burst. This should leave 0-7 
-words left over. If there were more than 3 words remaining, a 4_WORD DMA burst 
-would be scheduled. The remaining data must then be 0-3 words in length and 
-would be moved with 1_WORD bursts. The use of large burst sizes makes more 
-efficient use of DMA by performing the same amount of work in fewer cycles.
-
-Several users have reported problems with DMA which were characterized by error
-messages of the form:
-
-	"eni_output: Transmit drain queue is full. Resources will be lost."
-or
-	"eni_output: not enough room in DMA queue".
-
-It was determined that these systems do not support the use of four- or 
-eight-word DMA bursts.  To resolve this problem, HARP now #ifdef's around the 
-8_WORD and 4_WORD DMA setup and #undef's both values by default. This results 
-in the default operation of the Efficient driver to use only 1_WORD DMA bursts.
-
-If you wish to experiment with larger DMA bursts, you can edit the file
-/usr/src/sys/dev/hea/eni_transmit.c and change the #undef to a #define for 
-DMA_USE_8WORD and/or DMA_USE_4WORD. You will need to rebuild and install your 
-kernel for this change to take effect.
-
-We are exploring solutions which would allow HARP to determine which DMA bursts
-are supported by the system at run-time.  This would allow the Efficient device
-driver to make use of larger, more efficient burst sizes where supported 
-without halting on systems which can't support the larger sizes.
-
-
-
-	@(#) $FreeBSD: src/share/examples/atm/NOTES,v 1.2 1999/08/28 00:19:06 peter Exp $
-
--- share/examples/atm/README
+++ /dev/null
@@ -1,140 +0,0 @@
-
-		===================================
-		HARP  |  Host ATM Research Platform
-		===================================
-
-		              HARP 3
-
-
-What is this stuff?
--------------------
-The Advanced Networking Group (ANG) at the Minnesota Supercomputer Center,
-Inc. (MSCI), as part of its work on the MAGIC Gigabit Testbed, developed
-the Host ATM Research Platform (HARP) software, which allows IP hosts to
-communicate over ATM networks using standard protocols.  It is intended to
-be a high-quality platform for IP/ATM research.
-
-HARP provides a way for IP hosts to connect to ATM networks.  It supports 
-standard methods of communication using IP over ATM.  A host's standard IP 
-software sends and receives datagrams via a HARP ATM interface.  HARP provides 
-functionality similar to (and typically replaces) vendor-provided ATM device 
-driver software.
-
-HARP includes full source code, making it possible for researchers to
-experiment with different approaches to running IP over ATM.  HARP is 
-self-contained; it requires no other licenses or commercial software packages.
-
-HARP implements support for the IETF Classical IP model for using IP over ATM 
-networks, including:
-
-   o IETF ATMARP address resolution client
-   o IETF ATMARP address resolution server
-   o IETF SCSP/ATMARP server
-   o UNI 3.1 and 3.0 signalling protocols
-   o Fore Systems's SPANS signalling protocol
-
-
-
-What's supported
-----------------
-The following are supported by HARP 3:
-
-   o ATM Host Interfaces
-	- FORE Systems, Inc. SBA-200 and SBA-200E ATM SBus Adapters
-	- FORE Systems, Inc. PCA-200E ATM PCI Adapters
-	- Efficient Networks, Inc. ENI-155p ATM PCI Adapters
-
-   o ATM Signalling Protocols
-	- The ATM Forum UNI 3.1 signalling protocol
-	- The ATM Forum UNI 3.0 signalling protocol
-	- The ATM Forum ILMI address registration
-	- FORE Systems's proprietary SPANS signalling protocol
-	- Permanent Virtual Channels (PVCs)
-
-   o IETF "Classical IP and ARP over ATM" model
-	- RFC 1483, "Multiprotocol Encapsulation over ATM Adaptation Layer 5"
-	- RFC 1577, "Classical IP and ARP over ATM"
-	- RFC 1626, "Default IP MTU for use over ATM AAL5"
-	- RFC 1755, "ATM Signaling Support for IP over ATM"
-	- RFC 2225, "Classical IP and ARP over ATM"
-	- RFC 2334, "Server Cache Synchronization Protocol (SCSP)"
-	- Internet Draft draft-ietf-ion-scsp-atmarp-00.txt,
-		"A Distributed ATMARP Service Using SCSP"
-
-   o ATM Sockets interface
-	- The file atm-sockets.txt contains further information
-
-
-What's not supported
---------------------
-The following major features of the above list are not currently supported:
-
-	o UNI point-to-multipoint support
-	o Driver support for Traffic Control/Quality of Service
-	o SPANS multicast and MPP support
-	o SPANS signalling using Efficient adapters
-
-
-For further information
------------------------
-For additional information about HARP, please see:
-
-	http://www.msci.magic.net
-
-
-Suggestions and Problem Reports
--------------------------------
-While HARP is made available "as is" and is not supported, ANG is continuing
-development of HARP.  We welcome suggestions for new or enhanced features, 
-summaries of your experience with HARP, as well as reports of problems which
-you may experience.  Feel free to contact us at harp-bugs at magic.net.
-
-ANG is maintaining a mail list of those who wish to share their experiences
-with HARP, learn of others' experiences, or receive information about future 
-releases of HARP.  The HARP mailing list is at harp at magic.net.  To be added
-to the list, send email to harp-request at magic.net.
-
-
-Acknowledgments
----------------
-This software was developed under the sponsorship of the Defense Advanced 
-Research Projects Agency (DARPA).
-
-
-Citing HARP
------------
-When citing HARP in published works, please use the following citation:
-
-Host ATM Research Platform (HARP), Network Computing Services, Inc.
-This software was developed with the support of the Defense Advanced
-Research Projects Agency (DARPA).
-
-
-Copyright and Permitted Use
----------------------------
-The Host ATM Research Platform ("HARP") software (the "Software") is
-made available by Network Computing Services, Inc. ("NetworkCS")
-"AS IS".  NetworkCS does not provide maintenance, improvements or
-support of any kind.
-
-NETWORKCS MAKES NO WARRANTIES OR REPRESENTATIONS, EXPRESS OR IMPLIED,
-INCLUDING, BUT NOT LIMITED TO, IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE, AS TO ANY ELEMENT OF THE
-SOFTWARE OR ANY SUPPORT PROVIDED IN CONNECTION WITH THIS SOFTWARE.
-In no event shall NetworkCS be responsible for any damages, including
-but not limited to consequential damages, arising from or relating to
-any use of the Software or related support.
-
-Copyright 1994-1998 Network Computing Services, Inc.
-
-Copies of this Software may be made, however, the above copyright
-notice must be reproduced on all copies.
-
-Portions of this Software include materials copyrighted by the Regents of
-the University of California and by Sun Microsystems, Inc.  The applicable
-copyright notices are reproduced in the files where the material appears.
-
---------------------------------------------------------------------------------
-
-	@(#) $FreeBSD: src/share/examples/atm/README,v 1.2 1999/08/28 00:19:06 peter Exp $
-

From laffer1 at midnightbsd.org  Sun Jan  4 18:05:43 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:05:43 -0500 (EST)
Subject: [Midnightbsd-cvs] src: BSD.include.dist: netatm is disabled...
Message-ID: <200901042305.n04N5hrg087817@stargazer.midnightbsd.org>

Log Message:
-----------
netatm is disabled... don't include it.  Remove posix4 as it's no longer used.

Modified Files:
--------------
    src/etc/mtree:
        BSD.include.dist (r1.4 -> r1.5)

-------------- next part --------------
Index: BSD.include.dist
===================================================================
RCS file: /home/cvs/src/etc/mtree/BSD.include.dist,v
retrieving revision 1.4
retrieving revision 1.5
diff -L etc/mtree/BSD.include.dist -L etc/mtree/BSD.include.dist -u -r1.4 -r1.5
--- etc/mtree/BSD.include.dist
+++ etc/mtree/BSD.include.dist
@@ -93,8 +93,6 @@
         ..
         udf
         ..
-        umapfs
-        ..
         unionfs
         ..
     ..
@@ -156,16 +154,6 @@
     ..
     netatalk
     ..
-    netatm
-        ipatm
-        ..
-        sigpvc
-        ..
-        spans
-        ..
-        uni
-        ..
-    ..
     netgraph
         atm
         ..
@@ -184,8 +172,6 @@
     ..
     netipx
     ..
-    netkey
-    ..
     netnatm
         api
         ..
@@ -212,8 +198,6 @@
     ..
     pccard
     ..
-    posix4
-    ..
     protocols
     ..
     readline

From laffer1 at midnightbsd.org  Sun Jan  4 18:11:34 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:11:34 -0500 (EST)
Subject: [Midnightbsd-cvs] src: BSD.usr.dist: Remove obsolete directories.
Message-ID: <200901042311.n04NBY7M088296@stargazer.midnightbsd.org>

Log Message:
-----------
Remove obsolete directories.

Modified Files:
--------------
    src/etc/mtree:
        BSD.usr.dist (r1.9 -> r1.10)

-------------- next part --------------
Index: BSD.usr.dist
===================================================================
RCS file: /home/cvs/src/etc/mtree/BSD.usr.dist,v
retrieving revision 1.9
retrieving revision 1.10
diff -L etc/mtree/BSD.usr.dist -L etc/mtree/BSD.usr.dist -u -r1.9 -r1.10
--- etc/mtree/BSD.usr.dist
+++ etc/mtree/BSD.usr.dist
@@ -190,8 +190,6 @@
             ..
             MidnightBSD_version
             ..
-            atm
-            ..
             bc
             ..
             bootforth
@@ -820,8 +818,6 @@
         misc
             fonts
             ..
-            pcvtfonts
-            ..
         ..
         mk
         ..
@@ -1149,12 +1145,6 @@
                 ..
             ..
         ..
-        pcvt
-            Doc
-            ..
-            Etc
-            ..
-        ..
         security
         ..
         sendmail

From laffer1 at midnightbsd.org  Sun Jan  4 18:20:50 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:20:50 -0500 (EST)
Subject: [Midnightbsd-cvs] src: contrib/libreadline: Update upgrade
	documentation
Message-ID: <200901042320.n04NKod1089077@stargazer.midnightbsd.org>

Log Message:
-----------
Update upgrade documentation

Added Files:
-----------
    src/contrib/libreadline:
        MIDNIGHTBSD-upgrade (r1.1)

Removed Files:
-------------
    src/contrib/libreadline:
        FREEBSD-upgrade

-------------- next part --------------
--- contrib/libreadline/FREEBSD-upgrade
+++ /dev/null
@@ -1,11 +0,0 @@
-# $FreeBSD: src/contrib/libreadline/FREEBSD-upgrade,v 1.6 2004/10/18 07:15:43 ache Exp $
-#
-# Official patches 001-005 imported as v5_0_p1_p5
-#
-
-rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf
-rm savestring.c
-
-cvs import \
-	-m "Virgin import of GNU Readline 5.0" \
-	 src/contrib/libreadline FSF v5_0
--- /dev/null
+++ contrib/libreadline/MIDNIGHTBSD-upgrade
@@ -0,0 +1,15 @@
+# $MidnightBSD: src/contrib/libreadline/MIDNIGHTBSD-upgrade,v 1.1 2009/01/04 23:20:49 laffer1 Exp $
+#
+# http://cnswww.cns.cwru.edu/php/chet/readline/rltop.html
+# http://cnswww.cns.cwru.edu/php/chet/readline/CHANGES
+# ftp.gnu.org/gnu/readline
+#
+# Official patches 001-005 imported as v5_0_p1_p5
+#
+
+rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf
+rm savestring.c
+
+cvs import \
+	-m "Virgin import of GNU Readline 5.0" \
+	 src/contrib/libreadline FSF v5_0

From ctriv at midnightbsd.org  Sun Jan  4 18:29:43 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:29:43 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: palm/libmal: Added libmal-0.44
Message-ID: <200901042329.n04NThKS089761@stargazer.midnightbsd.org>

Log Message:
-----------
Added libmal-0.44

Added Files:
-----------
    mports/palm/libmal:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/palm/libmal/files:
        patch-malsync::mal::client::unix::MAL31DBConfig.c (r1.1)

-------------- next part --------------
--- /dev/null
+++ palm/libmal/pkg-descr
@@ -0,0 +1,4 @@
+This is a copy of malsync that produces a library instead
+of an executable. It is based on malsync 2.1.
+
+WWW: http://jasonday.home.att.net/code/libmal/
--- /dev/null
+++ palm/libmal/pkg-plist
@@ -0,0 +1,58 @@
+bin/malsync
+include/libmal/AGArray.h
+include/libmal/AGBase64.h
+include/libmal/AGBufferReader.h
+include/libmal/AGBufferWriter.h
+include/libmal/AGBufferedNet.h
+include/libmal/AGCEProtocol.h
+include/libmal/AGClientProcessor.h
+include/libmal/AGCollection.h
+include/libmal/AGCommandProcessor.h
+include/libmal/AGDBConfig.h
+include/libmal/AGDesktopInfoPalm.h
+include/libmal/AGDesktopInfoWinCE.h
+include/libmal/AGDeviceInfo.h
+include/libmal/AGDigest.h
+include/libmal/AGHashTable.h
+include/libmal/AGLinkMBResource.h
+include/libmal/AGLinkMessageBox.h
+include/libmal/AGLocationConfig.h
+include/libmal/AGMD5.h
+include/libmal/AGMobileLinkSettings.h
+include/libmal/AGMsg.h
+include/libmal/AGNet.h
+include/libmal/AGPalmProtocol.h
+include/libmal/AGPasswordPrompt.h
+include/libmal/AGProtectedMem.h
+include/libmal/AGProtocol.h
+include/libmal/AGProxy.h
+include/libmal/AGProxyDebug.h
+include/libmal/AGProxySearch.h
+include/libmal/AGReader.h
+include/libmal/AGRecord.h
+include/libmal/AGResourceManager.h
+include/libmal/AGServerConfig.h
+include/libmal/AGShlapi.h
+include/libmal/AGSyncCommon.h
+include/libmal/AGSyncProcessor.h
+include/libmal/AGSynchronize.h
+include/libmal/AGTimeoutMessageBox.h
+include/libmal/AGTypes.h
+include/libmal/AGUserConfig.h
+include/libmal/AGUtil.h
+include/libmal/AGUtilMac.h
+include/libmal/AGUtilPalmOS.h
+include/libmal/AGUtilUnix.h
+include/libmal/AGUtilWin.h
+include/libmal/AGWriter.h
+include/libmal/MALCommonWin.h
+include/libmal/MAL31DBConfig.h
+include/libmal/MAL31ServerConfig.h
+include/libmal/MAL31UserConfig.h
+include/libmal/ag-md5.h
+include/libmal/libmal.h
+lib/libmal.a
+lib/libmal.la
+lib/libmal.so
+lib/libmal.so.1
+ at dirrm include/libmal
--- /dev/null
+++ palm/libmal/Makefile
@@ -0,0 +1,24 @@
+#
+#
+# $MidnightBSD: mports/palm/libmal/Makefile,v 1.1 2009/01/04 23:29:40 ctriv Exp $
+#
+
+PORTNAME=	libmal
+PORTVERSION=	0.44
+CATEGORIES=	palm
+MASTER_SITES=	http://jasonday.home.att.net/code/libmal/
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	A library encapsulating malsync
+LICENSE=	mpl
+
+LIB_DEPENDS=	pisock.9:${PORTSDIR}/palm/pilot-link
+
+USE_GMAKE=	YES
+GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	YES
+CONFIGURE_ARGS=	--with-pilot-prefix=${LOCALBASE}
+USE_LDCONFIG=	YES
+CONFLICTS=	malsync-[0-9]*
+
+.include 
--- /dev/null
+++ palm/libmal/distinfo
@@ -0,0 +1,3 @@
+MD5 (libmal-0.44.tar.gz) = 826f2334c8eb24f5e170f208581fdffb
+SHA256 (libmal-0.44.tar.gz) = aa6b3ab7d41a4a96f46a9441100e23e4de82eb821b17800a01bfc87898bd1110
+SIZE (libmal-0.44.tar.gz) = 454980
--- /dev/null
+++ palm/libmal/files/patch-malsync::mal::client::unix::MAL31DBConfig.c
@@ -0,0 +1,11 @@
+--- malsync/mal/client/unix/MAL31DBConfig.c.orig	2008-04-15 19:49:54.000000000 +0200
++++ malsync/mal/client/unix/MAL31DBConfig.c	2008-04-15 19:50:04.000000000 +0200
+@@ -20,7 +20,7 @@
+  */
+ 
+ #include 
+-#if defined(DARWIN) || defined(__OpenBSD__)
++#if defined(DARWIN) || defined(__OpenBSD__) || defined(__FreeBSD__)
+ #include 
+ #else
+ #include 

From ctriv at midnightbsd.org  Sun Jan  4 18:29:51 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:29:51 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: libmal.
Message-ID: <200901042329.n04NTp7l089809@stargazer.midnightbsd.org>

Log Message:
-----------
added: libmal.

Modified Files:
--------------
    mports/palm:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/palm/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L palm/Makefile -L palm/Makefile -u -r1.2 -r1.3
--- palm/Makefile
+++ palm/Makefile
@@ -10,6 +10,7 @@
     SUBDIR += imgvtopgm
     SUBDIR += isilo
     SUBDIR += jfconv
+    SUBDIR += libmal
     SUBDIR += mdbconv
     SUBDIR += palmos-sdk
     SUBDIR += pilot-link

From laffer1 at midnightbsd.org  Sun Jan  4 18:45:21 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:45:21 -0500 (EST)
Subject: [Midnightbsd-cvs] src: lib/libreadline: update to 5.2
Message-ID: <200901042345.n04NjLG4091298@stargazer.midnightbsd.org>

Log Message:
-----------
update to 5.2

Modified Files:
--------------
    src/gnu/lib/libreadline:
        Makefile.inc (r1.2 -> r1.3)
        config.h (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile.inc
===================================================================
RCS file: /home/cvs/src/gnu/lib/libreadline/Makefile.inc,v
retrieving revision 1.2
retrieving revision 1.3
diff -L gnu/lib/libreadline/Makefile.inc -L gnu/lib/libreadline/Makefile.inc -u -r1.2 -r1.3
--- gnu/lib/libreadline/Makefile.inc
+++ gnu/lib/libreadline/Makefile.inc
@@ -1,8 +1,8 @@
 # $MidnightBSD$
 # $FreeBSD: src/gnu/lib/libreadline/Makefile.inc,v 1.11.2.1 2005/07/22 17:29:02 kensmith Exp $
 
-SHLIB_MAJOR=6
-RL_LIBRARY_VERSION=5.0
+SHLIB_MAJOR=7
+RL_LIBRARY_VERSION=5.2
 
 SRCDIR= ${.CURDIR}/../../../../contrib/libreadline
 .PATH: ${SRCDIR} ${.CURDIR}/..
Index: config.h
===================================================================
RCS file: /home/cvs/src/gnu/lib/libreadline/config.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -L gnu/lib/libreadline/config.h -L gnu/lib/libreadline/config.h -u -r1.2 -r1.3
--- gnu/lib/libreadline/config.h
+++ gnu/lib/libreadline/config.h
@@ -1,5 +1,5 @@
 /* $MidnightBSD$ */
-/* $FreeBSD: src/gnu/lib/libreadline/config.h,v 1.7 2004/10/18 07:49:59 ache Exp $ */
+/* $FreeBSD: src/gnu/lib/libreadline/config.h,v 1.9 2006/12/31 09:26:00 ache Exp $ */
 /* config.h.  Generated by configure.  */
 /* config.h.in.  Maintained by hand. */
 
@@ -29,12 +29,36 @@
 /* Define if the `S_IS*' macros in  do not work properly.  */
 /* #undef STAT_MACROS_BROKEN */
 
+/* Define if you have the fcntl function. */
+#define HAVE_FCNTL 1
+
+/* Define if you have the getpwent function. */
+#define HAVE_GETPWENT 1
+
+/* Define if you have the getpwnam function. */
+#define HAVE_GETPWNAM 1
+
+/* Define if you have the getpwuid function. */
+#define HAVE_GETPWUID 1
+
 /* Define if you have the isascii function. */
 #define HAVE_ISASCII 1
 
+/* Define if you have the iswctype function.  */
+#define HAVE_ISWCTYPE 1
+
+/* Define if you have the iswlower function.  */
+#define HAVE_ISWLOWER 1
+
+/* Define if you have the iswupper function.  */
+#define HAVE_ISWUPPER 1
+
 /* Define if you have the isxdigit function. */
 #define HAVE_ISXDIGIT 1
 
+/* Define if you have the kill function. */
+#define HAVE_KILL 1
+
 /* Define if you have the lstat function. */
 #define HAVE_LSTAT 1
 
@@ -76,11 +100,23 @@
 /* Define if you have the tcgetattr function.  */
 #define HAVE_TCGETATTR 1
 
+/* Define if you have the towlower function.  */
+#define HAVE_TOWLOWER 1
+
+/* Define if you have the towupper function.  */
+#define HAVE_TOWUPPER 1
+
 /* Define if you have the vsnprintf function.  */
 #define HAVE_VSNPRINTF 1
 
-/* Define if you have the wctomb function.  */
-#define HAVE_WCTOMB 1
+/* Define if you have the wcrtomb function.  */
+#define HAVE_WCRTOMB 1
+
+/* Define if you have the wcscoll function.  */
+#define HAVE_WCSCOLL 1
+
+/* Define if you have the wctype function.  */
+#define HAVE_WCTYPE 1
 
 /* Define if you have the wcwidth function.  */
 #define HAVE_WCWIDTH 1
@@ -90,6 +126,9 @@
 /* Define if you have the  header file.  */
 #define HAVE_DIRENT_H 1
 
+/* Define if you have the  header file.  */
+#define HAVE_FCNTL_H 1
+
 /* Define if you have the  header file.  */
 #define HAVE_LANGINFO_H 1
 
@@ -105,6 +144,9 @@
 /* Define if you have the  header file.  */
 /* #undef HAVE_NDIR_H */
 
+/* Define if you have the  header file.  */
+#define HAVE_PWD_H 1
+
 /* Define if you have the  header file.  */
 #define HAVE_STDARG_H 1
 
@@ -156,11 +198,20 @@
 /* Define if you have the  header file.  */
 #define HAVE_WCHAR_H 1
 
-/* Define if you have the  header file.  */
+/* Define if you have the  header file.  */
 #define HAVE_WCTYPE_H 1
 
 #define HAVE_MBSTATE_T 1
 
+/* Define if you have wchar_t in . */
+#define HAVE_WCHAR_T 1
+
+/* Define if you have wctype_t in . */
+#define HAVE_WCTYPE_T 1
+
+/* Define if you have wint_t in . */
+#define HAVE_WINT_T 1
+
 /* Define if you have  and nl_langinfo(CODESET). */
 #define HAVE_LANGINFO_CODESET 1
 

From laffer1 at midnightbsd.org  Sun Jan  4 18:46:22 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:46:22 -0500 (EST)
Subject: [Midnightbsd-cvs] src: UPDATING: Import gnu readline
Message-ID: <200901042346.n04NkMd7091365@stargazer.midnightbsd.org>

Log Message:
-----------
Import gnu readline

Modified Files:
--------------
    src:
        UPDATING (r1.47 -> r1.48)

-------------- next part --------------
Index: UPDATING
===================================================================
RCS file: /home/cvs/src/UPDATING,v
retrieving revision 1.47
retrieving revision 1.48
diff -L UPDATING -L UPDATING -u -r1.47 -r1.48
--- UPDATING
+++ UPDATING
@@ -3,6 +3,9 @@
 Items affecting the mports and packages system can be found in
 /usr/mports/UPDATING. 
 
+20080104:
+	Import GNU libreadline 5.2
+
 20080101:
 	Update time zone data to 2008i.
 

From laffer1 at midnightbsd.org  Sun Jan  4 18:50:24 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:50:24 -0500 (EST)
Subject: [Midnightbsd-cvs] src: Makefile: bump shared lib version,
	switch to new world order.
Message-ID: <200901042350.n04NoOvx091778@stargazer.midnightbsd.org>

Log Message:
-----------
bump shared lib version, switch to new world order.

Modified Files:
--------------
    src/lib/libfetch:
        Makefile (r1.2 -> r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/src/lib/libfetch/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lib/libfetch/Makefile -L lib/libfetch/Makefile -u -r1.2 -r1.3
--- lib/libfetch/Makefile
+++ lib/libfetch/Makefile
@@ -1,16 +1,21 @@
 # $MidnightBSD$
 # $FreeBSD: src/lib/libfetch/Makefile,v 1.44.2.1 2005/07/22 17:29:05 kensmith Exp $
 
+.include 
+
 LIB=		fetch
 CFLAGS+=	-I.
-CFLAGS+=	-DINET6
 SRCS=		fetch.c common.c ftp.c http.c file.c \
 		ftperr.h httperr.h
 INCS=		fetch.h
 MAN=		fetch.3
 CLEANFILES=	ftperr.h httperr.h
 
-.if !defined(NO_CRYPT) && !defined(NO_OPENSSL)
+.if ${MK_INET6_SUPPORT} != "no"
+CFLAGS+=	-DINET6
+.endif
+
+.if ${MK_OPENSSL} != "no"
 CFLAGS+=	-DWITH_SSL
 DPADD=		${LIBSSL} ${LIBCRYPTO}
 LDADD=		-lssl -lcrypto
@@ -21,7 +26,7 @@
 CSTD?=		c99
 WARNS?=		2
 
-SHLIB_MAJOR=    4
+SHLIB_MAJOR=    5
 
 ftperr.h: ftp.errors ${.CURDIR}/Makefile
 	@echo "static struct fetcherr ftp_errlist[] = {" > ${.TARGET}

From laffer1 at midnightbsd.org  Sun Jan  4 18:56:01 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 18:56:01 -0500 (EST)
Subject: [Midnightbsd-cvs] src: MIDNIGHTBSD-upgrade: update for 5.2 p13
Message-ID: <200901042356.n04Nu1Cq092235@stargazer.midnightbsd.org>

Log Message:
-----------
update for 5.2 p13

Modified Files:
--------------
    src/contrib/libreadline:
        MIDNIGHTBSD-upgrade (r1.1 -> r1.2)

-------------- next part --------------
Index: MIDNIGHTBSD-upgrade
===================================================================
RCS file: /home/cvs/src/contrib/libreadline/MIDNIGHTBSD-upgrade,v
retrieving revision 1.1
retrieving revision 1.2
diff -L contrib/libreadline/MIDNIGHTBSD-upgrade -L contrib/libreadline/MIDNIGHTBSD-upgrade -u -r1.1 -r1.2
--- contrib/libreadline/MIDNIGHTBSD-upgrade
+++ contrib/libreadline/MIDNIGHTBSD-upgrade
@@ -4,12 +4,12 @@
 # http://cnswww.cns.cwru.edu/php/chet/readline/CHANGES
 # ftp.gnu.org/gnu/readline
 #
-# Official patches 001-005 imported as v5_0_p1_p5
+# Official patches 001-013 imported as v5_2_p13
 #
 
 rm doc/*.dvi doc/*.html doc/*.ps doc/*.0 doc/*.info doc/*.tex doc/texi2* doc/*.pdf
-rm savestring.c
+rm savestring.c support/wcwidth.c
 
 cvs import \
-	-m "Virgin import of GNU Readline 5.0" \
-	 src/contrib/libreadline FSF v5_0
+	-m "Virgin import of GNU Readline 5.2 (trimmed)" \
+	 src/contrib/libreadline FSF v5_2

From laffer1 at midnightbsd.org  Sun Jan  4 19:24:23 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 19:24:23 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: php.mk: try to fix index
Message-ID: <200901050024.n050ONuF094239@stargazer.midnightbsd.org>

Log Message:
-----------
try to fix index

Modified Files:
--------------
    mports/Mk/extensions:
        php.mk (r1.1 -> r1.2)

-------------- next part --------------
Index: php.mk
===================================================================
RCS file: /home/cvs/mports/Mk/extensions/php.mk,v
retrieving revision 1.1
retrieving revision 1.2
diff -L Mk/extensions/php.mk -L Mk/extensions/php.mk -u -r1.1 -r1.2
--- Mk/extensions/php.mk
+++ Mk/extensions/php.mk
@@ -45,6 +45,7 @@
 
 PHP_VER?=	${DEFAULT_PHP_VER}
 PHP_EXT_DIR=	20060613
+PHP_EXT_INC=	pcre
 
 HTTPD?=		${LOCALBASE}/sbin/httpd
 .	if exists(${HTTPD}) && !defined(PACKAGE_BUILDING)

From laffer1 at midnightbsd.org  Sun Jan  4 19:24:53 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 19:24:53 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: mports/devel: remove port as it's
	integrated in php now
Message-ID: <200901050024.n050OrsE094315@stargazer.midnightbsd.org>

Log Message:
-----------
remove port as it's integrated in php now

Modified Files:
--------------
    mports/devel:
        Makefile (r1.269 -> r1.270)

Removed Files:
-------------
    mports/devel/php5-pcre:
        Makefile
    mports/devel/php5-pcre/files:
        patch-php_pcre.c

-------------- next part --------------
--- devel/php5-pcre/Makefile
+++ /dev/null
@@ -1,15 +0,0 @@
-# New ports collection makefile for:	php5-pcre
-# Date created:			7 Jul 2004
-# Whom:				Alex Dupre 
-#
-# $FreeBSD: ports/devel/php5-pcre/Makefile,v 1.1 2004/07/19 07:12:57 ale Exp $
-# $MidnightBSD: mports/devel/php5-pcre/Makefile,v 1.1 2006/11/05 15:21:42 laffer1 Exp $
-#
-
-CATEGORIES=	devel
-
-MASTERDIR=	${.CURDIR}/../../lang/php5
-
-PKGNAMESUFFIX=	-pcre
-
-.include "${MASTERDIR}/Makefile"
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/Makefile,v
retrieving revision 1.269
retrieving revision 1.270
diff -L devel/Makefile -L devel/Makefile -u -r1.269 -r1.270
--- devel/Makefile
+++ devel/Makefile
@@ -246,7 +246,6 @@
     SUBDIR += php5-gettext
     SUBDIR += php5-ncurses
     SUBDIR += php5-pcntl
-    SUBDIR += php5-pcre
     SUBDIR += php5-readline
     SUBDIR += php5-shmop
     SUBDIR += php5-spl
--- devel/php5-pcre/files/patch-php_pcre.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- php_pcre.c.orig	2007-11-14 08:11:40.000000000 +0100
-+++ php_pcre.c	2007-11-14 08:11:50.000000000 +0100
-@@ -18,6 +18,10 @@
- 
- /* $Id: php_pcre.c,v 1.168.2.9.2.21 2007/09/20 08:10:44 tony2001 Exp $ */
- 
-+#ifdef HAVE_CONFIG_H
-+#include "config.h"
-+#endif
-+
- #include "php.h"
- #include "php_ini.h"
- #include "php_globals.h"

From laffer1 at midnightbsd.org  Sun Jan  4 19:25:19 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 19:25:19 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: lang/php5: Build bundled pcre with php
	now.
Message-ID: <200901050025.n050PJA5094622@stargazer.midnightbsd.org>

Log Message:
-----------
Build bundled pcre with php now.  This fixes several problems.

Modified Files:
--------------
    mports/lang/php5:
        Makefile (r1.22 -> r1.23)
        Makefile.ext (r1.11 -> r1.12)
        pkg-plist (r1.3 -> r1.4)

-------------- next part --------------
Index: pkg-plist
===================================================================
RCS file: /home/cvs/mports/lang/php5/pkg-plist,v
retrieving revision 1.3
retrieving revision 1.4
diff -L lang/php5/pkg-plist -L lang/php5/pkg-plist -u -r1.3 -r1.4
--- lang/php5/pkg-plist
+++ lang/php5/pkg-plist
@@ -72,6 +72,13 @@
 include/php/ext/date/lib/timelib_structs.h
 include/php/ext/date/php_date.h
 include/php/ext/libxml/php_libxml.h
+include/php/ext/pcre/pcrelib/config.h
+include/php/ext/pcre/pcrelib/pcre.h
+include/php/ext/pcre/pcrelib/pcre_internal.h
+include/php/ext/pcre/pcrelib/pcreposix.h
+include/php/ext/pcre/pcrelib/ucp.h
+include/php/ext/pcre/pcrelib/ucptable.h
+include/php/ext/pcre/php_pcre.h
 include/php/ext/standard/base64.h
 include/php/ext/standard/basic_functions.h
 include/php/ext/standard/crc32.h
@@ -199,6 +206,8 @@
 @dirrm include/php/ext/date/lib
 @dirrm include/php/ext/date
 @dirrm include/php/ext/libxml
+ at dirrm include/php/ext/pcre/pcrelib
+ at dirrm include/php/ext/pcre
 @dirrm include/php/ext/standard
 @dirrmtry include/php/ext
 @dirrm include/php/main/streams
Index: Makefile.ext
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile.ext,v
retrieving revision 1.11
retrieving revision 1.12
diff -L lang/php5/Makefile.ext -L lang/php5/Makefile.ext -u -r1.11 -r1.12
--- lang/php5/Makefile.ext
+++ lang/php5/Makefile.ext
@@ -245,12 +245,6 @@
 CONFIGURE_ARGS+=--enable-pcntl
 .endif
 
-.if ${PHP_MODNAME} == "pcre"
-CONFIGURE_ARGS+=--with-pcre-regex=yes
-
-PHP_HEADER_DIRS=pcrelib
-.endif
-
 .if ${PHP_MODNAME} == "pdo"
 CONFIGURE_ARGS+=--enable-pdo
 .endif
@@ -393,7 +387,7 @@
 
 USE_GNOME=	libxml2
 
-USE_PHP=	pcre simplexml
+USE_PHP=	simplexml
 USE_PHP_BUILD=	yes
 .endif
 
@@ -589,11 +583,6 @@
 	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
 .endif
 
-.if ${PHP_MODNAME} == "pcre"
-post-extract:
-	@${MV} ${WRKSRC}/config0.m4 ${WRKSRC}/config.m4
-.endif
-
 .if ${PHP_MODNAME} == "oci8" || ${PHP_MODNAME} == "pdo_oci"
 pre-configure:
 	@cd ${WRKSRC}; \
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/php5/Makefile,v
retrieving revision 1.22
retrieving revision 1.23
diff -L lang/php5/Makefile -L lang/php5/Makefile -u -r1.22 -r1.23
--- lang/php5/Makefile
+++ lang/php5/Makefile
@@ -25,13 +25,15 @@
 .if !defined(PKGNAMESUFFIX)
 USE_AUTOTOOLS=	autoconf:262
 
-CONFIGURE_ARGS=	--enable-versioning \
+CONFIGURE_ARGS=	\
+		--enable-versioning \
 		--enable-memory-limit \
 		--with-layout=GNU \
 		--with-config-file-scan-dir=${PREFIX}/etc/php \
 		--disable-all \
 		--enable-libxml \
 		--with-libxml-dir=${LOCALBASE} \
+		--with-pcre-regex=yes \
 		--enable-reflection \
 		--program-prefix=""
 
@@ -161,6 +163,10 @@
 	@${ECHO_CMD} "PHP_VER=5" > ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_VERSION=${PORTVERSION}" >> ${WRKDIR}/php.conf
 	@${ECHO_CMD} "PHP_SAPI=${PHP_SAPI}" >> ${WRKDIR}/php.conf
+	@${ECHO_CMD} "PHP_EXT_INC=pcre" >> ${WRKDIR}/php.conf
+
+test: build
+	@(cd ${WRKSRC} && ${MAKE} test)
 
 post-install:
 	@${INSTALL_DATA} ${WRKSRC}/php.ini-dist ${PREFIX}/etc

From ctriv at midnightbsd.org  Sun Jan  4 20:01:08 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 20:01:08 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: deskutils/kdepim4: Added kdepim-4.1.3
Message-ID: <200901050101.n05118lB097447@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdepim-4.1.3

Added Files:
-----------
    mports/deskutils/kdepim4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ deskutils/kdepim4/pkg-descr
@@ -0,0 +1,8 @@
+KDE4 is the K Desktop Environment for Unix, Windows, and Mac OS X.
+
+These kde4 ports intend to provide early access to KDE4 for FreeBSD
+developers, porters and beta testers. Use at your own risk!
+
+This package provides PIM applications for KDE4.
+
+WWW: http://www.kde.org/
--- /dev/null
+++ deskutils/kdepim4/pkg-plist
@@ -0,0 +1,1431 @@
+bin/akonadi_ical_resource
+bin/akonadi_imaplib_resource
+bin/akonadi_kabc_resource
+bin/akonadi_kcal_resource
+bin/akonadi_knut_resource
+bin/akonadi_localbookmarks_resource
+bin/akonadi_maildir_resource
+bin/akonadi_mailthreader_agent
+bin/akonadi_nepomuk_contact_feeder
+bin/akonadi_nepomuk_email_feeder
+bin/akonadi_nntp_resource
+bin/akonadi_strigi_feeder
+bin/akonadi_vcard_resource
+bin/akonadiconsole
+bin/akonaditray
+bin/akregator
+bin/egroupwarewizard
+bin/groupwarewizard
+bin/groupwisewizard
+bin/ical2vcal
+bin/kabc2mutt
+bin/kabcclient
+bin/kaddressbook
+bin/kalarm
+bin/kalarmautostart
+bin/karm
+bin/kgpgconf
+%%KITCHENSYNC%%bin/kitchensync
+bin/kjots
+bin/kleopatra
+bin/kmail
+bin/kmail_antivir.sh
+bin/kmail_clamav.sh
+bin/kmail_fprot.sh
+bin/kmail_sav.sh
+bin/kmailcvt
+bin/knode
+bin/knotes
+bin/kode
+bin/kolabwizard
+bin/konsolekalendar
+bin/kontact
+bin/korgac
+bin/korganizer
+bin/ktimetracker
+bin/ktnefviewer
+bin/kung
+bin/kwatchgnupg
+bin/kwsdl_compiler
+bin/kxforms
+bin/kxml_compiler
+bin/scalixadmin
+bin/scalixwizard
+bin/schematest
+bin/sloxwizard
+bin/thememain
+include/akregator/akregator_export.h
+include/akregator/article.h
+include/akregator/command.h
+include/akregator/feedlistmanagementinterface.h
+include/akregator/feedstorage.h
+include/akregator/plugin.h
+include/akregator/storage.h
+include/akregator/storagefactory.h
+include/akregator/storagefactoryregistry.h
+include/akregator/types.h
+include/kaddressbook/kaddressbook_export.h
+include/kdepimprotocols.h
+include/kleo/adduseridjob.h
+include/kleo/changeexpiryjob.h
+include/kleo/changeownertrustjob.h
+include/kleo/cryptobackend.h
+include/kleo/cryptobackendfactory.h
+include/kleo/cryptoconfig.h
+include/kleo/cryptplug.h
+include/kleo/cryptplugfactory.h
+include/kleo/cryptplugwrapper.h
+include/kleo/cryptplugwrapperlist.h
+include/kleo/decryptjob.h
+include/kleo/decryptverifyjob.h
+include/kleo/deletejob.h
+include/kleo/dn.h
+include/kleo/downloadjob.h
+include/kleo/encryptjob.h
+include/kleo/enum.h
+include/kleo/exportjob.h
+include/kleo/hierarchicalkeylistjob.h
+include/kleo/importjob.h
+include/kleo/job.h
+include/kleo/keyfilter.h
+include/kleo/keyfiltermanager.h
+include/kleo/keygenerationjob.h
+include/kleo/keylistjob.h
+include/kleo/kleo_export.h
+include/kleo/multideletejob.h
+include/kleo/oidmap.h
+include/kleo/refreshkeysjob.h
+include/kleo/signencryptjob.h
+include/kleo/signjob.h
+include/kleo/signkeyjob.h
+include/kleo/specialjob.h
+include/kleo/ui/backendconfigwidget.h
+include/kleo/ui/cryptoconfigdialog.h
+include/kleo/ui/cryptoconfigmodule.h
+include/kleo/ui/directoryserviceswidget.h
+include/kleo/ui/dnattributeorderconfigwidget.h
+include/kleo/ui/kdhorizontalline.h
+include/kleo/ui/keyapprovaldialog.h
+include/kleo/ui/keylistview.h
+include/kleo/ui/keyrequester.h
+include/kleo/ui/keyselectiondialog.h
+include/kleo/ui/messagebox.h
+include/kleo/ui/progressbar.h
+include/kleo/ui/progressdialog.h
+include/kleo/verifydetachedjob.h
+include/kleo/verifyopaquejob.h
+include/kmail/interfaces/bodypart.h
+include/kmail/interfaces/bodypartformatter.h
+include/kmail/interfaces/bodyparturlhandler.h
+include/kmail/interfaces/htmlwriter.h
+include/kmail/interfaces/observable.h
+include/kmail/interfaces/observer.h
+include/kpgp/kpgp.h
+include/kpgp/kpgpbase.h
+include/kpgp/kpgpblock.h
+include/kpgp/kpgpkey.h
+include/kpgp/kpgpui.h
+include/kpgp/libkpgp_export.h
+include/ksieve/error.h
+include/ksieve/lexer.h
+include/ksieve/libksieve_export.h
+include/ksieve/parser.h
+include/ksieve/scriptbuilder.h
+include/libkleopatraclient/core/command.h
+include/libkleopatraclient/core/initialization.h
+include/libkleopatraclient/core/selectcertificatecommand.h
+include/libkleopatraclient/core/signencryptfilescommand.h
+include/libkleopatraclient/gui/certificaterequester.h
+include/libkleopatraclient/kleopatraclient_export.h
+lib/kde4/akonadi_serializer_addressee.so
+lib/kde4/akonadi_serializer_bookmark.so
+lib/kde4/akonadi_serializer_kcal.so
+lib/kde4/akonadi_serializer_mail.so
+lib/kde4/akregator_config_advanced.so
+lib/kde4/akregator_config_appearance.so
+lib/kde4/akregator_config_archive.so
+lib/kde4/akregator_config_browser.so
+lib/kde4/akregator_config_general.so
+lib/kde4/akregator_config_onlinesync.so
+lib/kde4/akregator_mk4storage_plugin.so
+lib/kde4/akregator_onlinesync_plugin.so
+lib/kde4/akregatorpart.so
+lib/kde4/kabc_akonadi.so
+lib/kde4/kabc_groupdav.so
+lib/kde4/kabc_groupwise.so
+lib/kde4/kabc_kolab.so
+lib/kde4/kabc_scalix.so
+lib/kde4/kabc_slox.so
+lib/kde4/kabc_xmlrpc.so
+lib/kde4/kaddrbk_bookmark_xxport.so
+lib/kde4/kaddrbk_cardview.so
+lib/kde4/kaddrbk_cryptosettings.so
+lib/kde4/kaddrbk_csv_xxport.so
+lib/kde4/kaddrbk_distributionlistng.so
+lib/kde4/kaddrbk_eudora_xxport.so
+lib/kde4/kaddrbk_gmx_xxport.so
+%%GNOKII%%lib/kde4/kaddrbk_gnokii_xxport.so
+lib/kde4/kaddrbk_iconview.so
+lib/kde4/kaddrbk_kde2_xxport.so
+lib/kde4/kaddrbk_ldif_xxport.so
+lib/kde4/kaddrbk_opera_xxport.so
+lib/kde4/kaddrbk_pab_xxport.so
+lib/kde4/kaddrbk_resourceselection.so
+lib/kde4/kaddrbk_tableview.so
+lib/kde4/kaddrbk_vcard_xxport.so
+lib/kde4/kaddressbookpart.so
+lib/kde4/kalarm_local.so
+lib/kde4/kalarm_localdir.so
+lib/kde4/kalarm_remote.so
+lib/kde4/karmpart.so
+lib/kde4/kcal_akonadi.so
+lib/kde4/kcal_blog.so
+lib/kde4/kcal_groupdav.so
+lib/kde4/kcal_groupwise.so
+lib/kde4/kcal_kabc.so
+lib/kde4/kcal_kolab.so
+lib/kde4/kcal_remote.so
+lib/kde4/kcal_resourcefeatureplan_plugin.so
+lib/kde4/kcal_scalix.so
+lib/kde4/kcal_slox.so
+lib/kde4/kcal_xmlrpc.so
+lib/kde4/kcm_akonadi_resources.so
+lib/kde4/kcm_apptsummary.so
+lib/kde4/kcm_kabconfig.so
+lib/kde4/kcm_kabcustomfields.so
+lib/kde4/kcm_kabldapconfig.so
+lib/kde4/kcm_kleopatra.so
+lib/kde4/kcm_kmail.so
+lib/kde4/kcm_kmailsummary.so
+lib/kde4/kcm_knode.so
+lib/kde4/kcm_kontact.so
+lib/kde4/kcm_kontactsummary.so
+lib/kde4/kcm_korganizer.so
+lib/kde4/kcm_ktimetrackerconfig.so
+lib/kde4/kcm_sdsummary.so
+lib/kde4/kcm_todosummary.so
+lib/kde4/kio_akonadi.so
+lib/kde4/kio_groupwise.so
+lib/kde4/kio_scalix.so
+%%KITCHENSYNC%%lib/kde4/kitchensyncpart.so
+lib/kde4/kjotspart.so
+lib/kde4/kmail_bodypartformatter_application_octetstream.so
+lib/kde4/kmail_bodypartformatter_text_calendar.so
+lib/kde4/kmail_bodypartformatter_text_vcard.so
+lib/kde4/kmail_bodypartformatter_text_xdiff.so
+lib/kde4/kmailpart.so
+lib/kde4/knodepart.so
+lib/kde4/knotes_kolab.so
+lib/kde4/knotes_local.so
+lib/kde4/knotes_scalix.so
+lib/kde4/knotes_xmlrpc.so
+lib/kde4/kontact_akregatorplugin.so
+lib/kde4/kontact_journalplugin.so
+lib/kde4/kontact_kaddressbookplugin.so
+lib/kde4/kontact_karmplugin.so
+lib/kde4/kontact_kjotsplugin.so
+lib/kde4/kontact_kmailplugin.so
+lib/kde4/kontact_knodeplugin.so
+lib/kde4/kontact_knotesplugin.so
+lib/kde4/kontact_korganizerplugin.so
+lib/kde4/kontact_specialdatesplugin.so
+lib/kde4/kontact_summaryplugin.so
+lib/kde4/kontact_todoplugin.so
+lib/kde4/korg_datenums.so
+lib/kde4/korg_hebrew.so
+lib/kde4/korg_journalprint.so
+lib/kde4/korg_picoftheday.so
+lib/kde4/korg_thisdayinhistory.so
+lib/kde4/korg_yearprint.so
+lib/kde4/korganizerpart.so
+lib/kde4/kpartsdesignerplugin.so
+lib/kde4/ktexteditorkabcbridge.so
+lib/kde4/ldifvcardthumbnail.so
+lib/kde4/plugins/designer/kdepimwidgets.so
+lib/libakonadi-kabc.so
+lib/libakonadi-kabc.so.5
+lib/libakonadi-kabc.so.5.0.0
+lib/libakonadi-kcal.so
+lib/libakonadi-kcal.so.5
+lib/libakonadi-kcal.so.5.0.0
+lib/libakregatorinterfaces.so
+lib/libakregatorinterfaces.so.5
+lib/libakregatorinterfaces.so.5.0.0
+lib/libakregatorprivate.so
+lib/libakregatorprivate.so.5
+lib/libakregatorprivate.so.5.0.0
+lib/libgwsoap.so
+lib/libgwsoap.so.5
+lib/libgwsoap.so.5.0.0
+lib/libimap.so
+lib/libimap.so.5
+lib/libimap.so.5.0.0
+lib/libkabc_groupdav.so
+lib/libkabc_groupdav.so.5
+lib/libkabc_groupdav.so.5.0.0
+lib/libkabc_slox.so
+lib/libkabc_slox.so.5
+lib/libkabc_slox.so.5.0.0
+lib/libkabc_xmlrpc.so
+lib/libkabc_xmlrpc.so.5
+lib/libkabc_xmlrpc.so.5.0.0
+lib/libkabcgroupwise.so
+lib/libkabcgroupwise.so.5
+lib/libkabcgroupwise.so.5.0.0
+lib/libkabckolab.so
+lib/libkabckolab.so.5
+lib/libkabckolab.so.5.0.0
+lib/libkabcommon.so
+lib/libkabcommon.so.5
+lib/libkabcommon.so.5.0.0
+lib/libkabcscalix.so
+lib/libkabcscalix.so.5
+lib/libkabcscalix.so.5.0.0
+lib/libkabinterfaces.so
+lib/libkabinterfaces.so.5
+lib/libkabinterfaces.so.5.0.0
+lib/libkaddressbookprivate.so
+lib/libkaddressbookprivate.so.5
+lib/libkaddressbookprivate.so.5.0.0
+lib/libkalarm_resources.so
+lib/libkalarm_resources.so.5
+lib/libkalarm_resources.so.5.0.0
+lib/libkcal_groupdav.so
+lib/libkcal_groupdav.so.5
+lib/libkcal_groupdav.so.5.0.0
+lib/libkcal_resourceblog.so
+lib/libkcal_resourceblog.so.5
+lib/libkcal_resourceblog.so.5.0.0
+lib/libkcal_resourcefeatureplan.so
+lib/libkcal_resourcefeatureplan.so.5
+lib/libkcal_resourcefeatureplan.so.5.0.0
+lib/libkcal_resourceremote.so
+lib/libkcal_resourceremote.so.5
+lib/libkcal_resourceremote.so.5.0.0
+lib/libkcal_slox.so
+lib/libkcal_slox.so.5
+lib/libkcal_slox.so.5.0.0
+lib/libkcal_xmlrpc.so
+lib/libkcal_xmlrpc.so.5
+lib/libkcal_xmlrpc.so.5.0.0
+lib/libkcalgroupwise.so
+lib/libkcalgroupwise.so.5
+lib/libkcalgroupwise.so.5.0.0
+lib/libkcalkolab.so
+lib/libkcalkolab.so.5
+lib/libkcalkolab.so.5.0.0
+lib/libkcalscalix.so
+lib/libkcalscalix.so.5
+lib/libkcalscalix.so.5.0.0
+lib/libkdepim.so
+lib/libkdepim.so.5
+lib/libkdepim.so.5.0.0
+lib/libkgroupwarebase.so
+lib/libkgroupwarebase.so.5
+lib/libkgroupwarebase.so.5.0.0
+lib/libkgroupwaredav.so
+lib/libkgroupwaredav.so.5
+lib/libkgroupwaredav.so.5.0.0
+lib/libkholidays.so
+lib/libkholidays.so.5
+lib/libkholidays.so.5.0.0
+%%KITCHENSYNC%%lib/libkitchensyncprivate.so
+%%KITCHENSYNC%%lib/libkitchensyncprivate.so.5
+%%KITCHENSYNC%%lib/libkitchensyncprivate.so.5.0.0
+lib/libkleo.so
+lib/libkleo.so.5
+lib/libkleo.so.5.0.0
+lib/libkleopatraclientcore.so
+lib/libkleopatraclientcore.so.0.2.0
+lib/libkleopatraclientgui.so
+lib/libkleopatraclientgui.so.0.2.0
+lib/libkmailprivate.so
+lib/libkmailprivate.so.5
+lib/libkmailprivate.so.5.0.0
+lib/libknodecommon.so
+lib/libknodecommon.so.5
+lib/libknodecommon.so.5.0.0
+lib/libknotes_xmlrpc.so
+lib/libknotes_xmlrpc.so.5
+lib/libknotes_xmlrpc.so.5.0.0
+lib/libknoteskolab.so
+lib/libknoteskolab.so.5
+lib/libknoteskolab.so.5.0.0
+lib/libknotesscalix.so
+lib/libknotesscalix.so.5
+lib/libknotesscalix.so.5.0.0
+lib/libkocorehelper.so
+lib/libkocorehelper.so.5
+lib/libkocorehelper.so.5.0.0
+lib/libkode.so
+lib/libkode.so.5
+lib/libkode.so.5.0.0
+lib/libkontactinterfaces.so
+lib/libkontactinterfaces.so.5
+lib/libkontactinterfaces.so.5.0.0
+lib/libkontactprivate.so
+lib/libkontactprivate.so.5
+lib/libkontactprivate.so.5.0.0
+lib/libkorg_stdprinting.so
+lib/libkorg_stdprinting.so.5
+lib/libkorg_stdprinting.so.5.0.0
+lib/libkorganizer_calendar.so
+lib/libkorganizer_calendar.so.5
+lib/libkorganizer_calendar.so.5.0.0
+lib/libkorganizer_eventviewer.so
+lib/libkorganizer_eventviewer.so.5
+lib/libkorganizer_eventviewer.so.5.0.0
+lib/libkorganizer_interfaces.so
+lib/libkorganizer_interfaces.so.5
+lib/libkorganizer_interfaces.so.5.0.0
+lib/libkorganizerprivate.so
+lib/libkorganizerprivate.so.5
+lib/libkorganizerprivate.so.5.0.0
+lib/libkpgp.so
+lib/libkpgp.so.5
+lib/libkpgp.so.5.0.0
+lib/libkschema.so
+lib/libkschema.so.5
+lib/libkschema.so.5.0.0
+lib/libkschemawidgets.so
+lib/libkschemawidgets.so.5
+lib/libkschemawidgets.so.5.0.0
+lib/libksieve.so
+lib/libksieve.so.5
+lib/libksieve.so.5.0.0
+lib/libkslox.so
+lib/libkslox.so.5
+lib/libkslox.so.5.0.0
+lib/libkxmlcommon.so
+lib/libkxmlcommon.so.5
+lib/libkxmlcommon.so.5.0.0
+lib/libmaildir.so
+lib/libmaildir.so.5
+lib/libmaildir.so.5.0.0
+lib/libmimelib.so
+lib/libmimelib.so.5
+lib/libmimelib.so.5.0.0
+%%KITCHENSYNC%%lib/libqopensync.so
+%%KITCHENSYNC%%lib/libqopensync.so.5
+%%KITCHENSYNC%%lib/libqopensync.so.5.0.0
+lib/libschema.so
+lib/libschema.so.5
+lib/libschema.so.5.0.0
+lib/libwscl.so
+lib/libwscl.so.5
+lib/libwscl.so.5.0.0
+lib/libwsdl.so
+lib/libwsdl.so.5
+lib/libwsdl.so.5.0.0
+lib/strigi/strigiea_ics.so
+lib/strigi/strigiea_rfc822.so
+lib/strigi/strigiea_vcf.so
+share/akonadi/agents/icalresource.desktop
+share/akonadi/agents/imaplibresource.desktop
+share/akonadi/agents/kabcresource.desktop
+share/akonadi/agents/kcalresource.desktop
+share/akonadi/agents/knutresource.desktop
+share/akonadi/agents/localbookmarksresource.desktop
+share/akonadi/agents/maildirresource.desktop
+share/akonadi/agents/mailthreaderagent.desktop
+share/akonadi/agents/nepomukcontactfeeder.desktop
+share/akonadi/agents/nepomukemailfeeder.desktop
+share/akonadi/agents/nntpresource.desktop
+share/akonadi/agents/strigifeeder.desktop
+share/akonadi/agents/vcardresource.desktop
+share/applications/kde4/KMail.desktop
+share/applications/kde4/KNode.desktop
+share/applications/kde4/Kjots.desktop
+share/applications/kde4/Kontact.desktop
+share/applications/kde4/akonadiconsole.desktop
+share/applications/kde4/akonaditray.desktop
+share/applications/kde4/akregator.desktop
+share/applications/kde4/groupwarewizard.desktop
+share/applications/kde4/kaddressbook.desktop
+share/applications/kde4/kalarm.desktop
+share/applications/kde4/karm.desktop
+%%KITCHENSYNC%%share/applications/kde4/kitchensync.desktop
+share/applications/kde4/kleopatra_import.desktop
+share/applications/kde4/kmail_view.desktop
+share/applications/kde4/knotes.desktop
+share/applications/kde4/konsolekalendar.desktop
+share/applications/kde4/korganizer-import.desktop
+share/applications/kde4/korganizer.desktop
+share/applications/kde4/ktnef.desktop
+share/applications/kde4/kwsdl_compiler.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_addressee.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_bookmark.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_kcal.desktop
+share/apps/akonadi/plugins/serializer/akonadi_serializer_mail.desktop
+share/apps/akonadiconsole/akonadiconsoleui.rc
+share/apps/akregator/about/akregator.css
+share/apps/akregator/about/main.html
+share/apps/akregator/about/top-left-akregator.png
+share/apps/akregator/akregator.notifyrc
+share/apps/akregator/akregator_part.rc
+share/apps/akregator/akregator_shell.rc
+share/apps/akregator/articleviewer.rc
+share/apps/akregator/pageviewer.rc
+share/apps/akregator/pics/kmmsgnew.png
+share/apps/akregator/pics/kmmsgunseen.png
+share/apps/cmake/modules/FindKode.cmake
+share/apps/cmake/modules/KodeMacros.cmake
+share/apps/kaddressbook/bookmark_xxportui.rc
+share/apps/kaddressbook/csv-templates/kaddressbook.desktop
+share/apps/kaddressbook/csv-templates/outlook2000.desktop
+share/apps/kaddressbook/csv-templates/yahoo.desktop
+share/apps/kaddressbook/csv_xxportui.rc
+share/apps/kaddressbook/eudora_xxportui.rc
+share/apps/kaddressbook/gmx_xxportui.rc
+%%GNOKII%%share/apps/kaddressbook/gnokii_xxportui.rc
+share/apps/kaddressbook/icons/oxygen/16x16/apps/aim_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/gadu_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/groupwise_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/icq_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/irc_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/jabber_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/meanwhile_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/msn_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/skype_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/sms_protocol.png
+share/apps/kaddressbook/icons/oxygen/16x16/apps/yahoo_protocol.png
+share/apps/kaddressbook/kaddressbook_part.rc
+share/apps/kaddressbook/kaddressbookui.rc
+share/apps/kaddressbook/kde2_xxportui.rc
+share/apps/kaddressbook/ldif_xxportui.rc
+share/apps/kaddressbook/opera_xxportui.rc
+share/apps/kaddressbook/pab_xxportui.rc
+share/apps/kaddressbook/pics/world.jpg
+share/apps/kaddressbook/printing/detailed-style.png
+share/apps/kaddressbook/printing/mike-style.png
+share/apps/kaddressbook/printing/ringbinder-style.png
+share/apps/kaddressbook/vcard_xxportui.rc
+share/apps/kaddressbook/zone.tab
+share/apps/kalarm/kalarmui.rc
+share/apps/karmpart/karmui.rc
+share/apps/kconf_update/kalarm-1.2.1-general.pl
+share/apps/kconf_update/kalarm-1.9.5-defaults.pl
+share/apps/kconf_update/kalarm-2.0.2-general.pl
+share/apps/kconf_update/kalarm-version.pl
+share/apps/kconf_update/kalarm.upd
+share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
+share/apps/kconf_update/kmail-3.1-use-UOID-for-identities.pl
+share/apps/kconf_update/kmail-3.1.4-dont-use-UOID-0-for-any-identity.pl
+share/apps/kconf_update/kmail-3.2-misc.sh
+share/apps/kconf_update/kmail-3.2-update-loop-on-goto-unread-settings.sh
+share/apps/kconf_update/kmail-3.3-aegypten.pl
+share/apps/kconf_update/kmail-3.3-misc.pl
+share/apps/kconf_update/kmail-3.3-move-identities.pl
+share/apps/kconf_update/kmail-3.3-split-sign-encr-keys.sh
+share/apps/kconf_update/kmail-3.3-use-ID-for-accounts.pl
+share/apps/kconf_update/kmail-3.3b1-misc.pl
+share/apps/kconf_update/kmail-3.4-misc.pl
+share/apps/kconf_update/kmail-3.4.1-update-status-filters.pl
+share/apps/kconf_update/kmail-3.5-trigger-flag-migration.pl
+share/apps/kconf_update/kmail-4.0-misc.pl
+share/apps/kconf_update/kmail-pgpidentity.pl
+share/apps/kconf_update/kmail-upd-identities.pl
+share/apps/kconf_update/kmail.upd
+share/apps/kconf_update/kolab-resource.upd
+share/apps/kconf_update/korganizer.upd
+share/apps/kconf_update/kpgp-3.1-upgrade-address-data.pl
+share/apps/kconf_update/kpgp.upd
+share/apps/kconf_update/upgrade-resourcetype.pl
+share/apps/kconf_update/upgrade-signature.pl
+share/apps/kconf_update/upgrade-transport.pl
+share/apps/kdepimwidgets/pics/addresseelineedit.png
+share/apps/kdepimwidgets/pics/clicklineedit.png
+share/apps/kdepimwidgets/pics/kdateedit.png
+share/apps/kdepimwidgets/pics/ktimeedit.png
+%%KITCHENSYNC%%share/apps/kitchensync/about/kitchensync.css
+%%KITCHENSYNC%%share/apps/kitchensync/about/main.html
+%%KITCHENSYNC%%share/apps/kitchensync/about/top-right-kitchensync.png
+%%KITCHENSYNC%%share/apps/kitchensync/kitchensync_part.rc
+%%KITCHENSYNC%%share/apps/kitchensync/kitchensyncui.rc
+share/apps/kjots/kjotspartui.rc
+share/apps/kjots/kjotsui.rc
+share/apps/kleopatra/kleopatra.rc
+share/apps/kleopatra/pics/kleopatra_splashscreen.png
+share/apps/kleopatra/pics/kleopatra_splashscreen.svgz
+share/apps/kleopatra/pics/kleopatra_wizard.png
+share/apps/kleopatra/pics/kleopatra_wizard.svgz
+share/apps/kmail/about/kmail.css
+share/apps/kmail/about/main.html
+share/apps/kmail/about/top-left-kmail.png
+share/apps/kmail/kmail.notifyrc
+share/apps/kmail/kmail_part.rc
+share/apps/kmail/kmcomposerui.rc
+share/apps/kmail/kmmainwin.rc
+share/apps/kmail/kmreadermainwin.rc
+share/apps/kmail/pics/key.png
+share/apps/kmail/pics/key_bad.png
+share/apps/kmail/pics/key_ok.png
+share/apps/kmail/pics/key_unknown.png
+share/apps/kmail/pics/kmwizard.png
+share/apps/kmail/pics/mail-deleted.png
+share/apps/kmail/pics/mail-encrypted-full.png
+share/apps/kmail/pics/mail-encrypted-part.png
+share/apps/kmail/pics/mail-encrypted.png
+share/apps/kmail/pics/mail-thread-ignored.png
+share/apps/kmail/pics/mail-thread-watch.png
+share/apps/kmail/pics/pgp-keys.png
+share/apps/kmail/pics/quotecollapse.png
+share/apps/kmail/pics/quoteexpand.png
+share/apps/kmail/plugins/bodypartformatter/application_octetstream.desktop
+share/apps/kmail/plugins/bodypartformatter/text_calendar.desktop
+share/apps/kmail/plugins/bodypartformatter/text_vcard.desktop
+share/apps/kmail/plugins/bodypartformatter/text_xdiff.desktop
+share/apps/kmail/profile-default-rc
+share/apps/kmail/profile-high-contrast-rc
+share/apps/kmail/profile-html-rc
+share/apps/kmail/profile-purist-rc
+share/apps/kmail/profile-secure-rc
+share/apps/kmail/tips
+share/apps/kmailcvt/pics/step1.png
+share/apps/knode/filters/1.fltr
+share/apps/knode/filters/2.fltr
+share/apps/knode/filters/3.fltr
+share/apps/knode/filters/4.fltr
+share/apps/knode/filters/5.fltr
+share/apps/knode/filters/6.fltr
+share/apps/knode/filters/7.fltr
+share/apps/knode/filters/8.fltr
+share/apps/knode/filters/filters.rc
+share/apps/knode/headers.rc
+share/apps/knode/kncomposerui.rc
+share/apps/knode/knodeui.rc
+share/apps/knode/knreaderui.rc
+share/apps/knode/pics/article.png
+share/apps/knode/pics/ctlart.png
+share/apps/knode/pics/eyes.png
+share/apps/knode/pics/greyball.png
+share/apps/knode/pics/greyballchk.png
+share/apps/knode/pics/group.png
+share/apps/knode/pics/group_big.png
+share/apps/knode/pics/ignore.png
+share/apps/knode/pics/key.png
+share/apps/knode/pics/key_bad.png
+share/apps/knode/pics/key_ok.png
+share/apps/knode/pics/key_unknown.png
+share/apps/knode/pics/mail.png
+share/apps/knode/pics/newsubs.png
+share/apps/knode/pics/pgp-keys.png
+share/apps/knode/pics/posting.png
+share/apps/knode/pics/snderr.png
+share/apps/knode/pics/stat_cncl.png
+share/apps/knode/pics/stat_edit.png
+share/apps/knode/pics/stat_saved.png
+share/apps/knode/pics/stat_sent.png
+share/apps/knotes/icons/oxygen/16x16/actions/knotes_alarm.png
+share/apps/knotes/icons/oxygen/16x16/actions/knotes_close.png
+share/apps/knotes/icons/oxygen/16x16/actions/knotes_date.png
+share/apps/knotes/icons/oxygen/16x16/actions/knotes_delete.png
+share/apps/knotes/knotes_part.rc
+share/apps/knotes/knotesappui.rc
+share/apps/knotes/knotesui.rc
+share/apps/kontact/about/kontact.css
+share/apps/kontact/about/main.html
+share/apps/kontact/about/top-left-kontact.png
+share/apps/kontact/kontactui.rc
+share/apps/kontact/ksettingsdialog/akregator.setdlg
+share/apps/kontact/ksettingsdialog/kaddressbook.setdlg
+share/apps/kontact/ksettingsdialog/kjots.setdlg
+share/apps/kontact/ksettingsdialog/kmail.setdlg
+share/apps/kontact/ksettingsdialog/knode.setdlg
+share/apps/kontact/ksettingsdialog/knotes.setdlg
+share/apps/kontact/ksettingsdialog/korganizer.setdlg
+share/apps/kontact/ksettingsdialog/ktimetracker.setdlg
+share/apps/kontact/ksettingsdialog/specialdates.setdlg
+share/apps/kontact/ksettingsdialog/summary.setdlg
+share/apps/kontactsummary/kontactsummary_part.rc
+share/apps/korgac/icons/oxygen/22x22/actions/korgac.png
+share/apps/korganizer/korganizer_part.rc
+share/apps/korganizer/korganizerui.rc
+share/apps/korganizer/sounds/alert.wav
+share/apps/korganizer/sounds/icemag.wav
+share/apps/korganizer/sounds/lightmag.wav
+share/apps/korganizer/sounds/onscreen.wav
+share/apps/korganizer/sounds/spinout.wav
+share/apps/korganizer/tips
+share/apps/ktimetracker/icons/oxygen/128x128/actions/subtask-new-ktimetracker.png
+share/apps/ktimetracker/icons/oxygen/16x16/actions/subtask-new-ktimetracker.png
+share/apps/ktimetracker/icons/oxygen/22x22/actions/subtask-new-ktimetracker.png
+share/apps/ktimetracker/icons/oxygen/32x32/actions/subtask-new-ktimetracker.png
+share/apps/ktimetracker/icons/oxygen/48x48/actions/subtask-new-ktimetracker.png
+share/apps/ktimetracker/icons/oxygen/64x64/actions/subtask-new-ktimetracker.png
+share/apps/ktimetracker/icons/oxygen/scalable/actions/subtask-new-ktimetracker.svgz
+share/apps/ktimetracker/karmui.rc
+share/apps/ktimetracker/pics/active-icon-0.xpm
+share/apps/ktimetracker/pics/active-icon-1.xpm
+share/apps/ktimetracker/pics/active-icon-2.xpm
+share/apps/ktimetracker/pics/active-icon-3.xpm
+share/apps/ktimetracker/pics/active-icon-4.xpm
+share/apps/ktimetracker/pics/active-icon-5.xpm
+share/apps/ktimetracker/pics/active-icon-6.xpm
+share/apps/ktimetracker/pics/active-icon-7.xpm
+share/apps/ktimetracker/pics/clock.xpm
+share/apps/ktimetracker/pics/clockedit.xpm
+share/apps/ktimetracker/pics/empty-watch.xpm
+share/apps/ktimetracker/pics/filedel.xpm
+share/apps/ktimetracker/pics/task-complete.xpm
+share/apps/ktimetracker/pics/task-incomplete.xpm
+share/apps/ktimetracker/pics/watch-0.xpm
+share/apps/ktimetracker/pics/watch-1.xpm
+share/apps/ktimetracker/pics/watch-2.xpm
+share/apps/ktimetracker/pics/watch-3.xpm
+share/apps/ktimetracker/pics/watch-4.xpm
+share/apps/ktimetracker/pics/watch-5.xpm
+share/apps/ktimetracker/pics/watch-6.xpm
+share/apps/ktimetracker/pics/watch-7.xpm
+share/apps/ktnef/ktnefui.rc
+share/apps/kwatchgnupg/kwatchgnupgui.rc
+share/apps/kwatchgnupg/pics/kwatchgnupg.png
+share/apps/kwatchgnupg/pics/kwatchgnupg2.png
+share/apps/kxforms/kxformsui.rc
+share/apps/libkdepim/about/bar-bottom-left.png
+share/apps/libkdepim/about/bar-bottom-middle.png
+share/apps/libkdepim/about/bar-bottom-right.png
+share/apps/libkdepim/about/bar-middle-left.png
+share/apps/libkdepim/about/bar-middle-right.png
+share/apps/libkdepim/about/bar-top-left.png
+share/apps/libkdepim/about/bar-top-middle.png
+share/apps/libkdepim/about/bar-top-right.png
+share/apps/libkdepim/about/bottom-left.png
+share/apps/libkdepim/about/bottom-middle.png
+share/apps/libkdepim/about/bottom-right.png
+share/apps/libkdepim/about/box-bottom-left.png
+share/apps/libkdepim/about/box-bottom-middle.png
+share/apps/libkdepim/about/box-bottom-right.png
+share/apps/libkdepim/about/box-middle-left.png
+share/apps/libkdepim/about/box-middle-right.png
+share/apps/libkdepim/about/box-top-left.png
+share/apps/libkdepim/about/box-top-middle.png
+share/apps/libkdepim/about/box-top-right.png
+share/apps/libkdepim/about/kde_infopage.css
+share/apps/libkdepim/about/kde_infopage_rtl.css
+share/apps/libkdepim/about/top-left.png
+share/apps/libkdepim/about/top-middle.png
+share/apps/libkholidays/holiday_BelgiumDutch
+share/apps/libkholidays/holiday_BelgiumFrench
+share/apps/libkholidays/holiday_BelgiumWalloon
+share/apps/libkholidays/holiday_Suedtirol
+share/apps/libkholidays/holiday_ar
+share/apps/libkholidays/holiday_at
+share/apps/libkholidays/holiday_au
+share/apps/libkholidays/holiday_bavarian
+share/apps/libkholidays/holiday_br
+share/apps/libkholidays/holiday_ca
+share/apps/libkholidays/holiday_catalan
+share/apps/libkholidays/holiday_ch
+share/apps/libkholidays/holiday_co
+share/apps/libkholidays/holiday_cz
+share/apps/libkholidays/holiday_de
+share/apps/libkholidays/holiday_dk
+share/apps/libkholidays/holiday_ee
+share/apps/libkholidays/holiday_es
+share/apps/libkholidays/holiday_fi
+share/apps/libkholidays/holiday_fr
+share/apps/libkholidays/holiday_frswiss
+share/apps/libkholidays/holiday_gb
+share/apps/libkholidays/holiday_gr
+share/apps/libkholidays/holiday_gt
+share/apps/libkholidays/holiday_hu
+share/apps/libkholidays/holiday_ie
+share/apps/libkholidays/holiday_il
+share/apps/libkholidays/holiday_is
+share/apps/libkholidays/holiday_it
+share/apps/libkholidays/holiday_jp
+share/apps/libkholidays/holiday_lt
+share/apps/libkholidays/holiday_mx
+share/apps/libkholidays/holiday_nl
+share/apps/libkholidays/holiday_no
+share/apps/libkholidays/holiday_nz
+share/apps/libkholidays/holiday_pl
+share/apps/libkholidays/holiday_pt
+share/apps/libkholidays/holiday_py
+share/apps/libkholidays/holiday_quebec
+share/apps/libkholidays/holiday_ro
+share/apps/libkholidays/holiday_ru
+share/apps/libkholidays/holiday_se
+share/apps/libkholidays/holiday_si
+share/apps/libkholidays/holiday_th
+share/apps/libkholidays/holiday_ua
+share/apps/libkholidays/holiday_us
+share/apps/libkholidays/holiday_uy
+share/apps/libkholidays/holiday_za
+share/apps/libkleopatra/pics/chiasmus_chi.png
+share/apps/libkleopatra/pics/key.png
+share/apps/libkleopatra/pics/key_bad.png
+share/apps/libkleopatra/pics/key_ok.png
+share/apps/libkleopatra/pics/key_unknown.png
+share/apps/nepomuk/ontologies/nco.desktop
+share/apps/nepomuk/ontologies/nco.trig
+share/apps/nepomuk/ontologies/nmo.desktop
+share/apps/nepomuk/ontologies/nmo.trig
+share/autostart/kalarm.autostart.desktop
+share/autostart/korgac.desktop
+share/config.kcfg/akregator.kcfg
+share/config.kcfg/custommimeheader.kcfg
+share/config.kcfg/customtemplates_kfg.kcfg
+share/config.kcfg/egroupware.kcfg
+share/config.kcfg/groupwise.kcfg
+share/config.kcfg/kalarmconfig.kcfg
+share/config.kcfg/kjots.kcfg
+share/config.kcfg/kmail.kcfg
+share/config.kcfg/knoteconfig.kcfg
+share/config.kcfg/knotesglobalconfig.kcfg
+share/config.kcfg/kolab.kcfg
+share/config.kcfg/kontact.kcfg
+share/config.kcfg/korganizer.kcfg
+share/config.kcfg/kxforms.kcfg
+share/config.kcfg/replyphrases.kcfg
+share/config.kcfg/scalix.kcfg
+share/config.kcfg/slox.kcfg
+share/config.kcfg/templatesconfiguration_kfg.kcfg
+share/config/kmail.antispamrc
+share/config/kmail.antivirusrc
+share/config/korganizer.knsrc
+share/config/libkleopatrarc
+share/dbus-1/interfaces/org.kde.KAddressbook.Core.xml
+share/dbus-1/interfaces/org.kde.KNotes.xml
+share/dbus-1/interfaces/org.kde.Korganizer.Calendar.xml
+share/dbus-1/interfaces/org.kde.addressbook.service.xml
+share/dbus-1/interfaces/org.kde.akregator.part.xml
+share/dbus-1/interfaces/org.kde.kalarm.kalarm.xml
+share/dbus-1/interfaces/org.kde.kmail.kmail.xml
+share/dbus-1/interfaces/org.kde.kmail.kmailpart.xml
+share/dbus-1/interfaces/org.kde.kmail.mailcomposer.xml
+share/dbus-1/interfaces/org.kde.knode.xml
+share/dbus-1/interfaces/org.kde.kontact.KNotes.xml
+share/dbus-1/interfaces/org.kde.korganizer.KOrgac.xml
+share/dbus-1/interfaces/org.kde.korganizer.Korganizer.xml
+share/dbus-1/interfaces/org.kde.ktimetracker.ktimetracker.xml
+share/dbus-1/interfaces/org.kde.mailtransport.service.xml
+share/doc/HTML/en/akregator/add-feed.png
+share/doc/HTML/en/akregator/add-feed2.png
+share/doc/HTML/en/akregator/add-folder.png
+share/doc/HTML/en/akregator/add-folder2.png
+share/doc/HTML/en/akregator/advanced-tab.png
+share/doc/HTML/en/akregator/appearance-tab.png
+share/doc/HTML/en/akregator/archive-tab.png
+share/doc/HTML/en/akregator/browser-tab.png
+share/doc/HTML/en/akregator/common
+share/doc/HTML/en/akregator/general-tab.png
+share/doc/HTML/en/akregator/index.cache.bz2
+share/doc/HTML/en/akregator/index.docbook
+share/doc/HTML/en/akregator/konq.png
+share/doc/HTML/en/akregator/konq2.png
+share/doc/HTML/en/akregator/main-window.png
+share/doc/HTML/en/akregator/main-window2.png
+share/doc/HTML/en/akregator/main-window3.png
+share/doc/HTML/en/akregator/main-window4.png
+share/doc/HTML/en/akregator/quick-filter.png
+share/doc/HTML/en/akregator/rss.png
+share/doc/HTML/en/akregator/rss3.png
+share/doc/HTML/en/kaddressbook/addhost.png
+share/doc/HTML/en/kaddressbook/common
+share/doc/HTML/en/kaddressbook/conf.png
+share/doc/HTML/en/kaddressbook/contactdlg.png
+share/doc/HTML/en/kaddressbook/edit_instant_messenging.png
+share/doc/HTML/en/kaddressbook/exportdlg.png
+share/doc/HTML/en/kaddressbook/extension.png
+share/doc/HTML/en/kaddressbook/filtereditdlg.png
+share/doc/HTML/en/kaddressbook/index.cache.bz2
+share/doc/HTML/en/kaddressbook/index.docbook
+share/doc/HTML/en/kaddressbook/mainwin.png
+share/doc/HTML/en/kaddressbook/resourcedlg.png
+share/doc/HTML/en/kaddressbook/resourcesdlg.png
+share/doc/HTML/en/kaddressbook/vieweditdlg.png
+share/doc/HTML/en/kalarm/alarmmessage.png
+share/doc/HTML/en/kalarm/common
+share/doc/HTML/en/kalarm/editwindow.png
+share/doc/HTML/en/kalarm/index.cache.bz2
+share/doc/HTML/en/kalarm/index.docbook
+share/doc/HTML/en/kalarm/mainwindow.png
+share/doc/HTML/en/kalarm/spinbox.png
+share/doc/HTML/en/kjots/common
+share/doc/HTML/en/kjots/index.cache.bz2
+share/doc/HTML/en/kjots/index.docbook
+share/doc/HTML/en/kleopatra/common
+share/doc/HTML/en/kleopatra/index.cache.bz2
+share/doc/HTML/en/kleopatra/index.docbook
+share/doc/HTML/en/kmail/common
+share/doc/HTML/en/kmail/configure.docbook
+share/doc/HTML/en/kmail/credits-and-licenses.docbook
+share/doc/HTML/en/kmail/faq.docbook
+share/doc/HTML/en/kmail/getting-started.docbook
+share/doc/HTML/en/kmail/importing.docbook
+share/doc/HTML/en/kmail/index.cache.bz2
+share/doc/HTML/en/kmail/index.docbook
+share/doc/HTML/en/kmail/intro.docbook
+share/doc/HTML/en/kmail/menus.docbook
+share/doc/HTML/en/kmail/using-kmail.docbook
+share/doc/HTML/en/knode/commands.docbook
+share/doc/HTML/en/knode/common
+share/doc/HTML/en/knode/credits.docbook
+share/doc/HTML/en/knode/eyes.png
+share/doc/HTML/en/knode/faq.docbook
+share/doc/HTML/en/knode/gloss.docbook
+share/doc/HTML/en/knode/greyball.png
+share/doc/HTML/en/knode/greyballchk.png
+share/doc/HTML/en/knode/index.cache.bz2
+share/doc/HTML/en/knode/index.docbook
+share/doc/HTML/en/knode/install.docbook
+share/doc/HTML/en/knode/introduction.docbook
+share/doc/HTML/en/knode/journey.docbook
+share/doc/HTML/en/knode/knode-cleanup.png
+share/doc/HTML/en/knode/knode-colors-fonts.png
+share/doc/HTML/en/knode/knode-composer-attachments.png
+share/doc/HTML/en/knode/knode-composer-settings.png
+share/doc/HTML/en/knode/knode-edit-filter.png
+share/doc/HTML/en/knode/knode-edit-header1.png
+share/doc/HTML/en/knode/knode-edit-header2.png
+share/doc/HTML/en/knode/knode-filters.png
+share/doc/HTML/en/knode/knode-followup.png
+share/doc/HTML/en/knode/knode-header-settings.png
+share/doc/HTML/en/knode/knode-identity.png
+share/doc/HTML/en/knode/knode-mail-account.png
+share/doc/HTML/en/knode/knode-new-article.png
+share/doc/HTML/en/knode/knode-news-account.png
+share/doc/HTML/en/knode/knode-post-settings.png
+share/doc/HTML/en/knode/knode-read-news-appearance-dialog.png
+share/doc/HTML/en/knode/knode-read-news-settings.png
+share/doc/HTML/en/knode/knode-reply.png
+share/doc/HTML/en/knode/knode-rule-editor.png
+share/doc/HTML/en/knode/knode-search.png
+share/doc/HTML/en/knode/knode-start.png
+share/doc/HTML/en/knode/knode-subscribe.png
+share/doc/HTML/en/knode/knode-views.png
+share/doc/HTML/en/knode/more.docbook
+share/doc/HTML/en/knode/newsubs.png
+share/doc/HTML/en/knode/redball.png
+share/doc/HTML/en/knode/redballchk.png
+share/doc/HTML/en/knode/using-firststart.docbook
+share/doc/HTML/en/knode/using-morefeatures.docbook
+share/doc/HTML/en/knode/using-subscribing.docbook
+share/doc/HTML/en/knotes/common
+share/doc/HTML/en/knotes/index.cache.bz2
+share/doc/HTML/en/knotes/index.docbook
+share/doc/HTML/en/konsolekalendar/common
+share/doc/HTML/en/konsolekalendar/index.cache.bz2
+share/doc/HTML/en/konsolekalendar/index.docbook
+share/doc/HTML/en/kontact/calendar-sidebar-icon.png
+share/doc/HTML/en/kontact/common
+share/doc/HTML/en/kontact/configuration-components.png
+share/doc/HTML/en/kontact/configuration-main.png
+share/doc/HTML/en/kontact/configuration-select-components.png
+share/doc/HTML/en/kontact/configuration-starting-component.png
+share/doc/HTML/en/kontact/configuration-summary-view-kpilot.png
+share/doc/HTML/en/kontact/configuration-summary-view.png
+share/doc/HTML/en/kontact/index.cache.bz2
+share/doc/HTML/en/kontact/index.docbook
+share/doc/HTML/en/kontact/kaddressbook-sidebar-icon.png
+share/doc/HTML/en/kontact/main-view.png
+share/doc/HTML/en/kontact/menu-bar-kmail.png
+share/doc/HTML/en/kontact/menu-bar-korganizer.png
+share/doc/HTML/en/kontact/menu-bar-summary.png
+share/doc/HTML/en/kontact/new-menu.png
+share/doc/HTML/en/kontact/settings-menu-kmail.png
+share/doc/HTML/en/kontact/side-pane.png
+share/doc/HTML/en/kontact/summary-view-calendar.png
+share/doc/HTML/en/kontact/summary-view-contacts.png
+share/doc/HTML/en/kontact/summary-view-kpilot.png
+share/doc/HTML/en/kontact/summary-view-mail.png
+share/doc/HTML/en/kontact/summary-view-newsticker.png
+share/doc/HTML/en/kontact/summary-view-notes.png
+share/doc/HTML/en/kontact/summary-view-repositioning.png
+share/doc/HTML/en/kontact/summary-view-todos.png
+share/doc/HTML/en/kontact/summary-view-weather.png
+share/doc/HTML/en/kontact/summary-view.png
+share/doc/HTML/en/kontact/todo-list-sidebar-icon.png
+share/doc/HTML/en/korganizer/common
+share/doc/HTML/en/korganizer/event-attachments.png
+share/doc/HTML/en/korganizer/event-attendees.png
+share/doc/HTML/en/korganizer/event-freebusy.png
+share/doc/HTML/en/korganizer/event-general.png
+share/doc/HTML/en/korganizer/event-recurrence.png
+share/doc/HTML/en/korganizer/groupevent.png
+share/doc/HTML/en/korganizer/i_actions_newevent.png
+share/doc/HTML/en/korganizer/i_actions_newtodo.png
+share/doc/HTML/en/korganizer/i_copy.png
+share/doc/HTML/en/korganizer/i_cut.png
+share/doc/HTML/en/korganizer/i_edit_delete.png
+share/doc/HTML/en/korganizer/i_edit_find.png
+share/doc/HTML/en/korganizer/i_edit_redo.png
+share/doc/HTML/en/korganizer/i_edit_undo.png
+share/doc/HTML/en/korganizer/i_file_close.png
+share/doc/HTML/en/korganizer/i_file_new.png
+share/doc/HTML/en/korganizer/i_file_open.png
+share/doc/HTML/en/korganizer/i_file_print.png
+share/doc/HTML/en/korganizer/i_file_quit.png
+share/doc/HTML/en/korganizer/i_file_revert.png
+share/doc/HTML/en/korganizer/i_file_save.png
+share/doc/HTML/en/korganizer/i_file_saveas.png
+share/doc/HTML/en/korganizer/i_go_backward.png
+share/doc/HTML/en/korganizer/i_go_forward.png
+share/doc/HTML/en/korganizer/i_go_to_today.png
+share/doc/HTML/en/korganizer/i_paste.png
+share/doc/HTML/en/korganizer/i_settings_prefs.png
+share/doc/HTML/en/korganizer/i_view_day.png
+share/doc/HTML/en/korganizer/i_view_journal.png
+share/doc/HTML/en/korganizer/i_view_list.png
+share/doc/HTML/en/korganizer/i_view_month.png
+share/doc/HTML/en/korganizer/i_view_todo_list.png
+share/doc/HTML/en/korganizer/i_view_week.png
+share/doc/HTML/en/korganizer/i_view_whatsnext.png
+share/doc/HTML/en/korganizer/i_view_work_week.png
+share/doc/HTML/en/korganizer/i_view_xdays.png
+share/doc/HTML/en/korganizer/index.cache.bz2
+share/doc/HTML/en/korganizer/index.docbook
+share/doc/HTML/en/korganizer/korganizer-resource.png
+share/doc/HTML/en/korganizer/o2v_importing1.png
+share/doc/HTML/en/korganizer/o2v_importing2.png
+share/doc/HTML/en/korganizer/o2v_importing3.png
+share/doc/HTML/en/korganizer/o2v_main.png
+share/doc/HTML/en/korganizer/o2v_progress.png
+share/doc/HTML/en/korganizer/o2v_save.png
+share/doc/HTML/en/korganizer/o2v_warning.png
+share/doc/HTML/en/korganizer/organizer.png
+share/doc/HTML/en/korganizer/outlook-to-vcalendar.docbook
+share/doc/HTML/en/korganizer/plugins-chapter.docbook
+share/doc/HTML/en/korganizer/remotefile-resource.png
+share/doc/HTML/en/korganizer/todo-general.png
+share/doc/HTML/en/ktimetracker/clipboard-history.png
+share/doc/HTML/en/ktimetracker/common
+share/doc/HTML/en/ktimetracker/copy-this-task.png
+share/doc/HTML/en/ktimetracker/csvexport.png
+share/doc/HTML/en/ktimetracker/daterange.png
+share/doc/HTML/en/ktimetracker/idle-detect.png
+share/doc/HTML/en/ktimetracker/index.cache.bz2
+share/doc/HTML/en/ktimetracker/index.docbook
+share/doc/HTML/en/ktimetracker/karm.png
+share/doc/HTML/en/ktimetracker/systray.png
+share/doc/HTML/en/kwsdl_compiler/common
+share/doc/HTML/en/kwsdl_compiler/index.cache.bz2
+share/doc/HTML/en/kwsdl_compiler/index.docbook
+share/icons/hicolor/128x128/apps/akregator.png
+share/icons/hicolor/128x128/apps/kaddressbook.png
+share/icons/hicolor/128x128/apps/kjots.png
+share/icons/hicolor/128x128/apps/kmail.png
+share/icons/hicolor/128x128/apps/knode.png
+share/icons/hicolor/128x128/apps/knode2.png
+share/icons/hicolor/128x128/apps/knotes.png
+share/icons/hicolor/128x128/apps/kontact.png
+share/icons/hicolor/128x128/apps/korganizer.png
+share/icons/hicolor/128x128/apps/ktimetracker.png
+%%KITCHENSYNC%%share/icons/hicolor/16x16/actions/sync-start.png
+share/icons/hicolor/16x16/apps/akregator.png
+share/icons/hicolor/16x16/apps/akregator_empty.png
+share/icons/hicolor/16x16/apps/kaddressbook.png
+share/icons/hicolor/16x16/apps/kalarm.png
+%%KITCHENSYNC%%share/icons/hicolor/16x16/apps/kitchensync.png
+share/icons/hicolor/16x16/apps/kjots.png
+share/icons/hicolor/16x16/apps/kmail.png
+share/icons/hicolor/16x16/apps/knode.png
+share/icons/hicolor/16x16/apps/knode2.png
+share/icons/hicolor/16x16/apps/knotes.png
+share/icons/hicolor/16x16/apps/kontact.png
+share/icons/hicolor/16x16/apps/korganizer.png
+share/icons/hicolor/16x16/apps/ktimetracker.png
+%%KITCHENSYNC%%share/icons/hicolor/22x22/actions/sync-start.png
+share/icons/hicolor/22x22/apps/akregator.png
+share/icons/hicolor/22x22/apps/kaddressbook.png
+share/icons/hicolor/22x22/apps/kalarm.png
+%%KITCHENSYNC%%share/icons/hicolor/22x22/apps/kitchensync.png
+share/icons/hicolor/22x22/apps/kjots.png
+share/icons/hicolor/22x22/apps/kmail.png
+share/icons/hicolor/22x22/apps/knotes.png
+share/icons/hicolor/22x22/apps/kontact.png
+share/icons/hicolor/22x22/apps/korganizer.png
+share/icons/hicolor/22x22/apps/ktimetracker.png
+%%KITCHENSYNC%%share/icons/hicolor/32x32/actions/sync-start.png
+share/icons/hicolor/32x32/apps/akregator.png
+share/icons/hicolor/32x32/apps/kaddressbook.png
+share/icons/hicolor/32x32/apps/kalarm.png
+%%KITCHENSYNC%%share/icons/hicolor/32x32/apps/kitchensync.png
+share/icons/hicolor/32x32/apps/kjots.png
+share/icons/hicolor/32x32/apps/kmail.png
+share/icons/hicolor/32x32/apps/knode.png
+share/icons/hicolor/32x32/apps/knode2.png
+share/icons/hicolor/32x32/apps/knotes.png
+share/icons/hicolor/32x32/apps/kontact.png
+share/icons/hicolor/32x32/apps/korganizer.png
+share/icons/hicolor/32x32/apps/ktimetracker.png
+%%KITCHENSYNC%%share/icons/hicolor/48x48/actions/sync-start.png
+share/icons/hicolor/48x48/apps/akregator.png
+share/icons/hicolor/48x48/apps/kaddressbook.png
+share/icons/hicolor/48x48/apps/kalarm.png
+%%KITCHENSYNC%%share/icons/hicolor/48x48/apps/kitchensync.png
+share/icons/hicolor/48x48/apps/kjots.png
+share/icons/hicolor/48x48/apps/kmail.png
+share/icons/hicolor/48x48/apps/knode.png
+share/icons/hicolor/48x48/apps/knode2.png
+share/icons/hicolor/48x48/apps/knotes.png
+share/icons/hicolor/48x48/apps/kontact.png
+share/icons/hicolor/48x48/apps/korganizer.png
+share/icons/hicolor/48x48/apps/ktimetracker.png
+share/icons/hicolor/48x48/apps/ktnef.png
+share/icons/hicolor/64x64/apps/akregator.png
+share/icons/hicolor/64x64/apps/kaddressbook.png
+share/icons/hicolor/64x64/apps/kjots.png
+share/icons/hicolor/64x64/apps/kmail.png
+share/icons/hicolor/64x64/apps/knode.png
+share/icons/hicolor/64x64/apps/knode2.png
+share/icons/hicolor/64x64/apps/knotes.png
+share/icons/hicolor/64x64/apps/kontact.png
+share/icons/hicolor/64x64/apps/korganizer.png
+share/icons/hicolor/64x64/apps/ktimetracker.png
+share/icons/hicolor/scalable/apps/akregator.svgz
+share/icons/hicolor/scalable/apps/kaddressbook.svgz
+share/icons/hicolor/scalable/apps/kjots.svgz
+share/icons/hicolor/scalable/apps/kmail.svgz
+share/icons/hicolor/scalable/apps/korganizer.svgz
+share/icons/oxygen/128x128/apps/kleopatra.png
+share/icons/oxygen/16x16/actions/document-new-from-template.png
+share/icons/oxygen/16x16/actions/edit-delete-page.png
+share/icons/oxygen/16x16/actions/ldap_lookup.png
+share/icons/oxygen/16x16/actions/mail-forwarded-replied.png
+share/icons/oxygen/16x16/actions/mail-forwarded.png
+share/icons/oxygen/16x16/actions/mail-reply-custom.png
+share/icons/oxygen/16x16/actions/mail-signed-part.png
+share/icons/oxygen/16x16/actions/mail-signed-verified.png
+share/icons/oxygen/16x16/actions/mail-signed.png
+share/icons/oxygen/16x16/actions/meeting-attending-tentative.png
+share/icons/oxygen/16x16/actions/meeting-attending.png
+share/icons/oxygen/16x16/actions/smallclock.png
+share/icons/oxygen/16x16/actions/upindicator.png
+share/icons/oxygen/16x16/apps/kalarm.png
+share/icons/oxygen/16x16/apps/kleopatra.png
+share/icons/oxygen/16x16/apps/kmailcvt.png
+share/icons/oxygen/16x16/mimetypes/x-mail-distribution-list.png
+share/icons/oxygen/16x16/status/appointment-recurring.png
+share/icons/oxygen/16x16/status/appointment-reminder.png
+share/icons/oxygen/16x16/status/mail-sent.png
+share/icons/oxygen/16x16/status/mail-tagged.png
+share/icons/oxygen/16x16/status/mail-task.png
+share/icons/oxygen/16x16/status/meeting-organizer.png
+share/icons/oxygen/16x16/status/task-complete.png
+share/icons/oxygen/16x16/status/task-recurring.png
+share/icons/oxygen/16x16/status/task-reminder.png
+share/icons/oxygen/22x22/actions/button_fewer.png
+share/icons/oxygen/22x22/actions/button_more.png
+share/icons/oxygen/22x22/actions/checkmark.png
+share/icons/oxygen/22x22/actions/document-new-from-template.png
+share/icons/oxygen/22x22/actions/edit-delete-page.png
+share/icons/oxygen/22x22/actions/mail-reply-custom.png
+share/icons/oxygen/22x22/actions/meeting-attending-tentative.png
+share/icons/oxygen/22x22/actions/meeting-attending.png
+share/icons/oxygen/22x22/apps/kalarm.png
+share/icons/oxygen/22x22/apps/kleopatra.png
+share/icons/oxygen/22x22/mimetypes/x-mail-distribution-list.png
+share/icons/oxygen/22x22/status/appointment-recurring.png
+share/icons/oxygen/22x22/status/appointment-reminder.png
+share/icons/oxygen/22x22/status/mail-tagged.png
+share/icons/oxygen/22x22/status/mail-task.png
+share/icons/oxygen/22x22/status/meeting-organizer.png
+share/icons/oxygen/22x22/status/task-complete.png
+share/icons/oxygen/22x22/status/task-recurring.png
+share/icons/oxygen/22x22/status/task-reminder.png
+share/icons/oxygen/32x32/actions/edit-delete-page.png
+share/icons/oxygen/32x32/actions/journal-new.png
+share/icons/oxygen/32x32/actions/mail-reply-custom.png
+share/icons/oxygen/32x32/actions/meeting-attending-tentative.png
+share/icons/oxygen/32x32/actions/meeting-attending.png
+share/icons/oxygen/32x32/actions/task-new.png
+share/icons/oxygen/32x32/apps/kalarm.png
+share/icons/oxygen/32x32/apps/kleopatra.png
+share/icons/oxygen/32x32/apps/kmailcvt.png
+share/icons/oxygen/32x32/mimetypes/x-mail-distribution-list.png
+share/icons/oxygen/32x32/status/appointment-recurring.png
+share/icons/oxygen/32x32/status/appointment-reminder.png
+share/icons/oxygen/32x32/status/mail-tagged.png
+share/icons/oxygen/32x32/status/meeting-organizer.png
+share/icons/oxygen/32x32/status/task-complete.png
+share/icons/oxygen/32x32/status/task-recurring.png
+share/icons/oxygen/32x32/status/task-reminder.png
+share/icons/oxygen/48x48/actions/edit-delete-page.png
+share/icons/oxygen/48x48/actions/mail-reply-custom.png
+share/icons/oxygen/48x48/apps/kalarm.png
+share/icons/oxygen/48x48/apps/kleopatra.png
+share/icons/oxygen/48x48/apps/kmailcvt.png
+share/icons/oxygen/48x48/mimetypes/x-mail-distribution-list.png
+share/icons/oxygen/48x48/status/mail-tagged.png
+share/icons/oxygen/64x64/apps/kleopatra.png
+share/icons/oxygen/scalable/actions/edit-delete-page.svgz
+share/icons/oxygen/scalable/actions/mail-forwarded-replied.svgz
+share/icons/oxygen/scalable/actions/mail-forwarded.svgz
+share/icons/oxygen/scalable/actions/mail-reply-custom.svgz
+share/icons/oxygen/scalable/actions/mail-signed-part.svgz
+share/icons/oxygen/scalable/actions/mail-signed-verified.svgz
+share/icons/oxygen/scalable/actions/mail-signed.svgz
+share/icons/oxygen/scalable/apps/kleopatra.svgz
+share/icons/oxygen/scalable/mimetypes/x-mail-distribution-list.svgz
+share/icons/oxygen/scalable/status/mail-tagged.svgz
+share/icons/oxygen/scalable/status/mail-task.svgz
+share/kde4/services/akonadi.protocol
+share/kde4/services/akregator_config_advanced.desktop
+share/kde4/services/akregator_config_appearance.desktop
+share/kde4/services/akregator_config_archive.desktop
+share/kde4/services/akregator_config_browser.desktop
+share/kde4/services/akregator_config_general.desktop
+share/kde4/services/akregator_config_onlinesync.desktop
+share/kde4/services/akregator_mk4storage_plugin.desktop
+share/kde4/services/akregator_onlinesync_plugin.desktop
+share/kde4/services/akregator_part.desktop
+share/kde4/services/feed.protocol
+share/kde4/services/groupwise.protocol
+share/kde4/services/groupwises.protocol
+share/kde4/services/kabconfig.desktop
+share/kde4/services/kabcustomfields.desktop
+share/kde4/services/kabldapconfig.desktop
+share/kde4/services/kaddressbook/aimprotocol.desktop
+share/kde4/services/kaddressbook/bookmark_xxport.desktop
+share/kde4/services/kaddressbook/cardview.desktop
+share/kde4/services/kaddressbook/cryptosettings.desktop
+share/kde4/services/kaddressbook/csv_xxport.desktop
+share/kde4/services/kaddressbook/distributionlistng.desktop
+share/kde4/services/kaddressbook/eudora_xxport.desktop
+share/kde4/services/kaddressbook/gaduprotocol.desktop
+share/kde4/services/kaddressbook/gmx_xxport.desktop
+%%GNOKII%%share/kde4/services/kaddressbook/gnokii_xxport.desktop
+share/kde4/services/kaddressbook/groupwiseprotocol.desktop
+share/kde4/services/kaddressbook/iconview.desktop
+share/kde4/services/kaddressbook/icqprotocol.desktop
+share/kde4/services/kaddressbook/ircprotocol.desktop
+share/kde4/services/kaddressbook/jabberprotocol.desktop
+share/kde4/services/kaddressbook/kde2_xxport.desktop
+share/kde4/services/kaddressbook/ldif_xxport.desktop
+share/kde4/services/kaddressbook/meanwhileprotocol.desktop
+share/kde4/services/kaddressbook/msnprotocol.desktop
+share/kde4/services/kaddressbook/opera_xxport.desktop
+share/kde4/services/kaddressbook/pab_xxport.desktop
+share/kde4/services/kaddressbook/resourceselection.desktop
+share/kde4/services/kaddressbook/skypeprotocol.desktop
+share/kde4/services/kaddressbook/smsprotocol.desktop
+share/kde4/services/kaddressbook/tableview.desktop
+share/kde4/services/kaddressbook/vcard_xxport.desktop
+share/kde4/services/kaddressbook/yahooprotocol.desktop
+share/kde4/services/karm_part.desktop
+share/kde4/services/kcm_akonadi_resources.desktop
+share/kde4/services/kcmapptsummary.desktop
+share/kde4/services/kcmkmailsummary.desktop
+share/kde4/services/kcmkontactsummary.desktop
+share/kde4/services/kcmsdsummary.desktop
+share/kde4/services/kcmtodosummary.desktop
+share/kde4/services/kjotspart.desktop
+share/kde4/services/kleopatra_config_appear.desktop
+share/kde4/services/kleopatra_config_dirserv.desktop
+share/kde4/services/kleopatra_config_dnorder.desktop
+share/kde4/services/kleopatra_config_smimevalidation.desktop
+share/kde4/services/kleopatra_decryptverifyfiles.desktop
+share/kde4/services/kleopatra_decryptverifyfolders.desktop
+share/kde4/services/kleopatra_signencryptfiles.desktop
+share/kde4/services/kleopatra_signencryptfolders.desktop
+share/kde4/services/kmail_config_accounts.desktop
+share/kde4/services/kmail_config_appearance.desktop
+share/kde4/services/kmail_config_composer.desktop
+share/kde4/services/kmail_config_identity.desktop
+share/kde4/services/kmail_config_misc.desktop
+share/kde4/services/kmail_config_security.desktop
+share/kde4/services/knewsservice.protocol
+share/kde4/services/knode_config_accounts.desktop
+share/kde4/services/knode_config_appearance.desktop
+share/kde4/services/knode_config_cleanup.desktop
+share/kde4/services/knode_config_identity.desktop
+share/kde4/services/knode_config_post_news.desktop
+share/kde4/services/knode_config_privacy.desktop
+share/kde4/services/knode_config_read_news.desktop
+share/kde4/services/kontact/akregatorplugin.desktop
+share/kde4/services/kontact/journalplugin.desktop
+share/kde4/services/kontact/kaddressbookplugin.desktop
+share/kde4/services/kontact/kjots_plugin.desktop
+share/kde4/services/kontact/kmailplugin.desktop
+share/kde4/services/kontact/knodeplugin.desktop
+share/kde4/services/kontact/knotesplugin.desktop
+share/kde4/services/kontact/korganizerplugin.desktop
+share/kde4/services/kontact/ktimetracker_plugin.desktop
+share/kde4/services/kontact/specialdatesplugin.desktop
+share/kde4/services/kontact/summaryplugin.desktop
+share/kde4/services/kontact/todoplugin.desktop
+share/kde4/services/kontactconfig.desktop
+share/kde4/services/korganizer/datenums.desktop
+share/kde4/services/korganizer/hebrew.desktop
+share/kde4/services/korganizer/journalprint.desktop
+share/kde4/services/korganizer/picoftheday.desktop
+share/kde4/services/korganizer/thisdayinhistory.desktop
+share/kde4/services/korganizer/yearprint.desktop
+share/kde4/services/korganizer_configcolorsandfonts.desktop
+share/kde4/services/korganizer_configdesignerfields.desktop
+share/kde4/services/korganizer_configfreebusy.desktop
+share/kde4/services/korganizer_configgroupscheduling.desktop
+share/kde4/services/korganizer_configmain.desktop
+share/kde4/services/korganizer_configplugins.desktop
+share/kde4/services/korganizer_configtime.desktop
+share/kde4/services/korganizer_configviews.desktop
+share/kde4/services/kresources/alarms/local.desktop
+share/kde4/services/kresources/alarms/localdir.desktop
+share/kde4/services/kresources/alarms/remote.desktop
+share/kde4/services/kresources/kabc/akonadi.desktop
+share/kde4/services/kresources/kabc/kabc_groupdav.desktop
+share/kde4/services/kresources/kabc/kabc_groupwise.desktop
+share/kde4/services/kresources/kabc/kabc_opengroupware.desktop
+share/kde4/services/kresources/kabc/kabc_ox.desktop
+share/kde4/services/kresources/kabc/kabc_slox.desktop
+share/kde4/services/kresources/kabc/kabc_xmlrpc.desktop
+share/kde4/services/kresources/kabc/kolab.desktop
+share/kde4/services/kresources/kabc/scalix.desktop
+share/kde4/services/kresources/kalarm_manager.desktop
+share/kde4/services/kresources/kcal/akonadi.desktop
+share/kde4/services/kresources/kcal/blog.desktop
+share/kde4/services/kresources/kcal/kabc.desktop
+share/kde4/services/kresources/kcal/kcal_groupdav.desktop
+share/kde4/services/kresources/kcal/kcal_groupwise.desktop
+share/kde4/services/kresources/kcal/kcal_opengroupware.desktop
+share/kde4/services/kresources/kcal/kcal_ox.desktop
+share/kde4/services/kresources/kcal/kcal_resourcefeatureplan.desktop
+share/kde4/services/kresources/kcal/kcal_slox.desktop
+share/kde4/services/kresources/kcal/kcal_xmlrpc.desktop
+share/kde4/services/kresources/kcal/kolab.desktop
+share/kde4/services/kresources/kcal/remote.desktop
+share/kde4/services/kresources/kcal/scalix.desktop
+share/kde4/services/kresources/knotes/knotes_xmlrpc.desktop
+share/kde4/services/kresources/knotes/kolabresource.desktop
+share/kde4/services/kresources/knotes/local.desktop
+share/kde4/services/kresources/knotes/scalix.desktop
+share/kde4/services/kresources/knotes_manager.desktop
+share/kde4/services/ktimetrackerconfig.desktop
+share/kde4/services/ldifvcardthumbnail.desktop
+share/kde4/services/scalix.protocol
+share/kde4/services/scalixs.protocol
+share/kde4/services/webcal.protocol
+share/kde4/servicetypes/akregator_plugin.desktop
+share/kde4/servicetypes/calendardecoration.desktop
+share/kde4/servicetypes/calendarplugin.desktop
+share/kde4/servicetypes/dbusaddressbook.desktop
+share/kde4/servicetypes/dbuscalendar.desktop
+share/kde4/servicetypes/dbusimap.desktop
+share/kde4/servicetypes/dbusmail.desktop
+share/kde4/servicetypes/kaddressbook_contacteditorwidget.desktop
+share/kde4/servicetypes/kaddressbook_extension.desktop
+share/kde4/servicetypes/kaddressbook_view.desktop
+share/kde4/servicetypes/kaddressbook_xxport.desktop
+share/kde4/servicetypes/kaddressbookimprotocol.desktop
+share/kde4/servicetypes/kontactplugin.desktop
+share/kde4/servicetypes/korganizerpart.desktop
+share/kde4/servicetypes/korgprintplugin.desktop
+ at dirrm share/kde4/services/kresources/knotes
+ at dirrm share/kde4/services/kresources/alarms
+ at dirrm share/kde4/services/korganizer
+ at dirrm share/kde4/services/kontact
+ at dirrm share/kde4/services/kaddressbook
+ at dirrm share/doc/HTML/en/kwsdl_compiler
+ at dirrm share/doc/HTML/en/ktimetracker
+ at dirrm share/doc/HTML/en/korganizer
+ at dirrm share/doc/HTML/en/kontact
+ at dirrm share/doc/HTML/en/konsolekalendar
+ at dirrm share/doc/HTML/en/knotes
+ at dirrm share/doc/HTML/en/knode
+ at dirrm share/doc/HTML/en/kmail
+ at dirrm share/doc/HTML/en/kleopatra
+ at dirrm share/doc/HTML/en/kjots
+ at dirrm share/doc/HTML/en/kalarm
+ at dirrm share/doc/HTML/en/kaddressbook
+ at dirrm share/doc/HTML/en/akregator
+ at dirrmtry share/autostart
+ at dirrmtry share/apps/nepomuk/ontologies
+ at dirrmtry share/apps/nepomuk
+ at dirrm share/apps/libkleopatra/pics
+ at dirrm share/apps/libkleopatra
+ at dirrm share/apps/libkholidays
+ at dirrm share/apps/libkdepim/about
+ at dirrm share/apps/libkdepim
+ at dirrm share/apps/kxforms
+ at dirrm share/apps/kwatchgnupg/pics
+ at dirrm share/apps/kwatchgnupg
+ at dirrm share/apps/ktnef
+ at dirrm share/apps/ktimetracker/pics
+ at dirrm share/apps/ktimetracker/icons/oxygen/scalable/actions
+ at dirrm share/apps/ktimetracker/icons/oxygen/scalable
+ at dirrm share/apps/ktimetracker/icons/oxygen/64x64/actions
+ at dirrm share/apps/ktimetracker/icons/oxygen/64x64
+ at dirrm share/apps/ktimetracker/icons/oxygen/48x48/actions
+ at dirrm share/apps/ktimetracker/icons/oxygen/48x48
+ at dirrm share/apps/ktimetracker/icons/oxygen/32x32/actions
+ at dirrm share/apps/ktimetracker/icons/oxygen/32x32
+ at dirrm share/apps/ktimetracker/icons/oxygen/22x22/actions
+ at dirrm share/apps/ktimetracker/icons/oxygen/22x22
+ at dirrm share/apps/ktimetracker/icons/oxygen/16x16/actions
+ at dirrm share/apps/ktimetracker/icons/oxygen/16x16
+ at dirrm share/apps/ktimetracker/icons/oxygen/128x128/actions
+ at dirrm share/apps/ktimetracker/icons/oxygen/128x128
+ at dirrm share/apps/ktimetracker/icons/oxygen
+ at dirrm share/apps/ktimetracker/icons
+ at dirrm share/apps/ktimetracker
+ at dirrm share/apps/korganizer/sounds
+ at dirrm share/apps/korganizer
+ at dirrm share/apps/korgac/icons/oxygen/22x22/actions
+ at dirrm share/apps/korgac/icons/oxygen/22x22
+ at dirrm share/apps/korgac/icons/oxygen
+ at dirrm share/apps/korgac/icons
+ at dirrm share/apps/korgac
+ at dirrm share/apps/kontactsummary
+ at dirrm share/apps/kontact/ksettingsdialog
+ at dirrm share/apps/kontact/about
+ at dirrm share/apps/kontact
+ at dirrm share/apps/knotes/icons/oxygen/16x16/actions
+ at dirrm share/apps/knotes/icons/oxygen/16x16
+ at dirrm share/apps/knotes/icons/oxygen
+ at dirrm share/apps/knotes/icons
+ at dirrm share/apps/knotes
+ at dirrm share/apps/knode/pics
+ at dirrm share/apps/knode/filters
+ at dirrm share/apps/knode
+ at dirrm share/apps/kmailcvt/pics
+ at dirrm share/apps/kmailcvt
+ at dirrm share/apps/kmail/plugins/bodypartformatter
+ at dirrm share/apps/kmail/plugins
+ at dirrm share/apps/kmail/pics
+ at dirrm share/apps/kmail/about
+ at dirrm share/apps/kmail
+ at dirrm share/apps/kleopatra/pics
+ at dirrm share/apps/kleopatra
+ at dirrm share/apps/kjots
+%%KITCHENSYNC%%@dirrm share/apps/kitchensync/about
+%%KITCHENSYNC%%@dirrm share/apps/kitchensync
+ at dirrm share/apps/kdepimwidgets/pics
+ at dirrm share/apps/kdepimwidgets
+ at dirrmtry share/apps/kconf_update
+ at dirrm share/apps/karmpart
+ at dirrm share/apps/kalarm
+ at dirrm share/apps/kaddressbook/printing
+ at dirrm share/apps/kaddressbook/pics
+ at dirrm share/apps/kaddressbook/icons/oxygen/16x16/apps
+ at dirrm share/apps/kaddressbook/icons/oxygen/16x16
+ at dirrm share/apps/kaddressbook/icons/oxygen
+ at dirrm share/apps/kaddressbook/icons
+ at dirrm share/apps/kaddressbook/csv-templates
+ at dirrm share/apps/kaddressbook
+ at dirrmtry share/apps/cmake/modules
+ at dirrmtry share/apps/cmake
+ at dirrm share/apps/akregator/pics
+ at dirrm share/apps/akregator/about
+ at dirrm share/apps/akregator
+ at dirrm share/apps/akonadiconsole
+ at dirrm share/apps/akonadi/plugins/serializer
+ at dirrm share/apps/akonadi/plugins
+ at dirrm share/apps/akonadi
+ at dirrm share/akonadi/agents
+ at dirrm share/akonadi
+ at dirrmtry lib/strigi
+ at dirrmtry lib/kde4/plugins/designer
+ at dirrm include/libkleopatraclient/gui
+ at dirrm include/libkleopatraclient/core
+ at dirrm include/libkleopatraclient
+ at dirrm include/ksieve
+ at dirrm include/kpgp
+ at dirrm include/kmail/interfaces
+ at dirrm include/kmail
+ at dirrm include/kleo/ui
+ at dirrm include/kleo
+ at dirrm include/kaddressbook
+ at dirrm include/akregator
--- /dev/null
+++ deskutils/kdepim4/Makefile
@@ -0,0 +1,55 @@
+#
+# $MidnightBSD: mports/deskutils/kdepim4/Makefile,v 1.1 2009/01/05 01:01:07 ctriv Exp $
+
+PORTNAME=	kdepim
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	deskutils kde ipv6
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Libraries for KDE-PIM applications
+LICENSE=	gpl2
+
+BUILD_DEPENDS=	libassuan>=1.0.4:${PORTSDIR}/security/libassuan
+LIB_DEPENDS=	gpgme:${PORTSDIR}/security/gpgme \
+		sasl2:${PORTSDIR}/security/cyrus-sasl2 \
+		boost_python:${PORTSDIR}/devel/boost-python \
+		mal.1:${PORTSDIR}/palm/libmal \
+		pisock.9:${PORTSDIR}/palm/pilot-link
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_KDE4=	kdelibs pimlibs kdebase akonadi kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+USE_BZIP2=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib opengl moc rcc uic dbus qt3support designer network svg qtestlib
+USE_OPENLDAP=	yes
+
+OPTIONS=	GNOKII "KAdressbook import/export for Nokia phones" off \
+		KITCHENSYNC "PIM synchronization utility" off
+
+.include 
+
+.if defined(WITH_GNOKII)
+LIB_DEPENDS+=	gnokii:${PORTSDIR}/comms/gnokii
+PLIST_SUB+=	GNOKII=""
+.else
+CMAKE_ARGS+=	-DWITH_GNOKII:BOOL=off
+PLIST_SUB+=	GNOKII="@comment "
+.endif
+
+.if defined(WITH_KITCHENSYNC)
+LIB_DEPENDS+=	opensync.1:${PORTSDIR}/devel/libopensync
+PLIST_SUB+=	KITCHENSYNC=""
+.else
+CMAKE_ARGS+=	-DWITH_Opensync:BOOL=off
+PLIST_SUB+=	KITCHENSYNC="@comment "
+.endif
+
+post-extract:
+	${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ deskutils/kdepim4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdepim-4.1.3.tar.bz2) = 655ff3c21c36a3378723bc2afb8cb434
+SHA256 (KDE/kdepim-4.1.3.tar.bz2) = 386d105639a26736d22db540f5b041f68335442fda7a1b4223cfef8477b9262e
+SIZE (KDE/kdepim-4.1.3.tar.bz2) = 13445548

From ctriv at midnightbsd.org  Sun Jan  4 20:01:39 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 20:01:39 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add kdepim4
Message-ID: <200901050101.n0511d4p097526@stargazer.midnightbsd.org>

Log Message:
-----------
add kdepim4

Modified Files:
--------------
    mports/deskutils:
        Makefile (r1.37 -> r1.38)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/deskutils/Makefile,v
retrieving revision 1.37
retrieving revision 1.38
diff -L deskutils/Makefile -L deskutils/Makefile -u -r1.37 -r1.38
--- deskutils/Makefile
+++ deskutils/Makefile
@@ -31,6 +31,7 @@
     SUBDIR += jlj
     SUBDIR += kbirthday
     SUBDIR += kdepim3
+    SUBDIR += kdepim4
     SUBDIR += kdepimlibs4
     SUBDIR += linux-sunbird
     SUBDIR += ljclive

From ctriv at midnightbsd.org  Sun Jan  4 20:14:08 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 20:14:08 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: deskutils/kdeplasma-addons: Added
	kdeplasma-addons-4.1.3
Message-ID: <200901050114.n051E8xO098526@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdeplasma-addons-4.1.3

Added Files:
-----------
    mports/deskutils/kdeplasma-addons:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ deskutils/kdeplasma-addons/pkg-descr
@@ -0,0 +1,3 @@
+This port provides additional plasmoids for KDE
+
+WWW:	http://www.kde.org/
--- /dev/null
+++ deskutils/kdeplasma-addons/pkg-plist
@@ -0,0 +1,208 @@
+include/plasmaappletdialog.h
+include/plasmaappletdialog_export.h
+lib/kde4/krunner_contacts.so
+lib/kde4/krunner_converterrunner.so
+lib/kde4/plasma_applet_binaryclock.so
+lib/kde4/plasma_applet_calculator.so
+lib/kde4/plasma_applet_comic.so
+lib/kde4/plasma_applet_dict.so
+lib/kde4/plasma_applet_fifteenPuzzle.so
+lib/kde4/plasma_applet_fileWatcher.so
+lib/kde4/plasma_applet_frame.so
+lib/kde4/plasma_applet_fuzzy_clock.so
+lib/kde4/plasma_applet_kolourpicker.so
+lib/kde4/plasma_applet_konqprofiles.so
+lib/kde4/plasma_applet_konsoleprofiles.so
+lib/kde4/plasma_applet_luna.so
+lib/kde4/plasma_applet_notes.so
+lib/kde4/plasma_applet_nowplaying.so
+lib/kde4/plasma_applet_showdashboard.so
+lib/kde4/plasma_applet_showdesktop.so
+lib/kde4/plasma_applet_twitter.so
+lib/kde4/plasma_comic_dilbertprovider.so
+lib/kde4/plasma_comic_garfieldprovider.so
+lib/kde4/plasma_comic_osnewsprovider.so
+lib/kde4/plasma_comic_phdprovider.so
+lib/kde4/plasma_comic_snoopyprovider.so
+lib/kde4/plasma_comic_userfriendlyprovider.so
+lib/kde4/plasma_comic_xkcdprovider.so
+lib/kde4/plasma_engine_comic.so
+lib/kde4/plasma_engine_twitter.so
+lib/libplasmaappletdialog.so
+lib/libplasmaappletdialog.so.5
+lib/libplasmaappletdialog.so.5.0.0
+lib/libplasmacomicprovidercore.so
+lib/libplasmacomicprovidercore.so.1
+lib/libplasmacomicprovidercore.so.1.0.0
+share/apps/desktoptheme/Aya/dialogs/background.svg
+share/apps/desktoptheme/Aya/dialogs/krunner.svg
+share/apps/desktoptheme/Aya/dialogs/shutdowndialog.svg
+share/apps/desktoptheme/Aya/metadata.desktop
+share/apps/desktoptheme/Aya/opaque/dialogs/background.svg
+share/apps/desktoptheme/Aya/opaque/widgets/tooltip.svg
+share/apps/desktoptheme/Aya/widgets/analog_meter.svg
+share/apps/desktoptheme/Aya/widgets/background.svg
+share/apps/desktoptheme/Aya/widgets/bar_meter_horizontal.svg
+share/apps/desktoptheme/Aya/widgets/bar_meter_vertical.svg
+share/apps/desktoptheme/Aya/widgets/battery-oxygen.svg
+share/apps/desktoptheme/Aya/widgets/battery.svg
+share/apps/desktoptheme/Aya/widgets/clock.svg
+share/apps/desktoptheme/Aya/widgets/connection-established.svg
+share/apps/desktoptheme/Aya/widgets/iconbutton.svg
+share/apps/desktoptheme/Aya/widgets/pager.svg
+share/apps/desktoptheme/Aya/widgets/panel-background.svg
+share/apps/desktoptheme/Aya/widgets/plot-background.svg
+share/apps/desktoptheme/Aya/widgets/systemtray.svg
+share/apps/desktoptheme/Aya/widgets/tasks.svg
+share/apps/desktoptheme/Aya/widgets/toolbox-button.svg
+share/apps/desktoptheme/Aya/widgets/tooltip.svg
+share/apps/desktoptheme/Aya/widgets/translucentbackground.svg
+share/apps/desktoptheme/Elegance/colors
+share/apps/desktoptheme/Elegance/dialogs/background.svg
+share/apps/desktoptheme/Elegance/dialogs/krunner.svg
+share/apps/desktoptheme/Elegance/dialogs/shutdowndialog.svg
+share/apps/desktoptheme/Elegance/dialogs/shutdowndlg.svg
+share/apps/desktoptheme/Elegance/metadata.desktop
+share/apps/desktoptheme/Elegance/widgets/analog_meter.svg
+share/apps/desktoptheme/Elegance/widgets/background.svg
+share/apps/desktoptheme/Elegance/widgets/battery-oxygen.svg
+share/apps/desktoptheme/Elegance/widgets/containment-controls.svg
+share/apps/desktoptheme/Elegance/widgets/clock.svg
+share/apps/desktoptheme/Elegance/widgets/iconbutton.svg
+share/apps/desktoptheme/Elegance/widgets/panel-background.svg
+share/apps/desktoptheme/Elegance/widgets/plot-background.svg
+share/apps/desktoptheme/Elegance/widgets/systemtray.svg
+share/apps/desktoptheme/Elegance/widgets/tasks.svg
+share/apps/desktoptheme/Elegance/widgets/toolbox-button.svg
+share/apps/desktoptheme/Elegance/widgets/tooltip.svg
+share/apps/desktoptheme/Elegance/widgets/translucentbackground.svg
+share/apps/desktoptheme/Silicon/colors
+share/apps/desktoptheme/Silicon/dialogs/background.svg
+share/apps/desktoptheme/Silicon/dialogs/krunner.svg
+share/apps/desktoptheme/Silicon/metadata.desktop
+share/apps/desktoptheme/Silicon/opaque/dialogs/background.svg
+share/apps/desktoptheme/Silicon/opaque/dialogs/krunner.svg
+share/apps/desktoptheme/Silicon/widgets/background.svg
+share/apps/desktoptheme/Silicon/widgets/clock.svg
+share/apps/desktoptheme/Silicon/widgets/iconbutton.svg
+share/apps/desktoptheme/Silicon/widgets/notes.svg
+share/apps/desktoptheme/Silicon/widgets/pager.svg
+share/apps/desktoptheme/Silicon/widgets/panel-background.svg
+share/apps/desktoptheme/Silicon/widgets/plot-background.svg
+share/apps/desktoptheme/Silicon/widgets/systemtray.svg
+share/apps/desktoptheme/Silicon/widgets/tasks.svg
+share/apps/desktoptheme/Silicon/widgets/tooltip.svg
+share/apps/desktoptheme/default/widgets/luna.svg
+share/apps/desktoptheme/default/widgets/notes.svg
+share/apps/desktoptheme/default/widgets/picture-frame-default.svg
+share/apps/desktoptheme/default/widgets/twitter.svg
+share/apps/desktoptheme/heron/colors
+share/apps/desktoptheme/heron/dialogs/background.svg
+share/apps/desktoptheme/heron/dialogs/shutdowndialog.svg
+share/apps/desktoptheme/heron/metadata.desktop
+share/apps/desktoptheme/heron/opaque/dialogs/background.svg
+share/apps/desktoptheme/heron/opaque/widgets/panel-background.svg
+share/apps/desktoptheme/heron/opaque/widgets/tooltip.svg
+share/apps/desktoptheme/heron/widgets/analog_meter.svg
+share/apps/desktoptheme/heron/widgets/background.svg
+share/apps/desktoptheme/heron/widgets/bar_meter_horizontal.svg
+share/apps/desktoptheme/heron/widgets/bar_meter_vertical.svg
+share/apps/desktoptheme/heron/widgets/clock.svg
+share/apps/desktoptheme/heron/widgets/connection-established.svg
+share/apps/desktoptheme/heron/widgets/iconbutton.svg
+share/apps/desktoptheme/heron/widgets/notes.svg
+share/apps/desktoptheme/heron/widgets/panel-background.svg
+share/apps/desktoptheme/heron/widgets/picture-frame-default.svg
+share/apps/desktoptheme/heron/widgets/plot-background.svg
+share/apps/desktoptheme/heron/widgets/tasks.svg
+share/apps/desktoptheme/heron/widgets/tooltip.svg
+share/apps/desktoptheme/slim-glow/LICENSE
+share/apps/desktoptheme/slim-glow/colors
+share/apps/desktoptheme/slim-glow/dialogs/background.svg
+share/apps/desktoptheme/slim-glow/dialogs/krunner.svg
+share/apps/desktoptheme/slim-glow/dialogs/shutdowndialog.svg
+share/apps/desktoptheme/slim-glow/metadata.desktop
+share/apps/desktoptheme/slim-glow/opaque/dialogs/background.svg
+share/apps/desktoptheme/slim-glow/opaque/widgets/panel-background.svg
+share/apps/desktoptheme/slim-glow/opaque/widgets/tooltip.svg
+share/apps/desktoptheme/slim-glow/widgets/analog_meter.svg
+share/apps/desktoptheme/slim-glow/widgets/background.svg
+share/apps/desktoptheme/slim-glow/widgets/bar_meter_horizontal.svg
+share/apps/desktoptheme/slim-glow/widgets/bar_meter_vertical.svg
+share/apps/desktoptheme/slim-glow/widgets/clock.svg
+share/apps/desktoptheme/slim-glow/widgets/connection-established.svg
+share/apps/desktoptheme/slim-glow/widgets/iconbutton.svg
+share/apps/desktoptheme/slim-glow/widgets/notes.svg
+share/apps/desktoptheme/slim-glow/widgets/panel-background.svg
+share/apps/desktoptheme/slim-glow/widgets/picture-frame-default.svg
+share/apps/desktoptheme/slim-glow/widgets/plot-background.svg
+share/apps/desktoptheme/slim-glow/widgets/tasks.svg
+share/apps/desktoptheme/slim-glow/widgets/toolbox-button.svg
+share/apps/desktoptheme/slim-glow/widgets/tooltip.svg
+share/apps/desktoptheme/slim-glow/widgets/translucentbackground.svg
+share/apps/plasma-comic/plasma_comic_dilbert.png
+share/apps/plasma-comic/plasma_comic_garfield.png
+share/apps/plasma-comic/plasma_comic_osnews.png
+share/apps/plasma-comic/plasma_comic_phd.png
+share/apps/plasma-comic/plasma_comic_snoopy.png
+share/apps/plasma-comic/plasma_comic_userfriendly.png
+share/apps/plasma-comic/plasma_comic_xkcd.png
+share/icons/hicolor/scalable/apps/fifteenpuzzle.svgz
+share/kde4/services/dilbertprovider.desktop
+share/kde4/services/garfieldprovider.desktop
+share/kde4/services/osnewsprovider.desktop
+share/kde4/services/phdprovider.desktop
+share/kde4/services/plasma-applet-binaryclock.desktop
+share/kde4/services/plasma-applet-calculator.desktop
+share/kde4/services/plasma-applet-fifteenPuzzle.desktop
+share/kde4/services/plasma-applet-konqprofiles.desktop
+share/kde4/services/plasma-applet-konsoleprofiles.desktop
+share/kde4/services/plasma-applet-luna.desktop
+share/kde4/services/plasma-applet-nowplaying.desktop
+share/kde4/services/plasma-applet-showdashboard.desktop
+share/kde4/services/plasma-applet-showdesktop.desktop
+share/kde4/services/plasma-clock-fuzzy.desktop
+share/kde4/services/plasma-comic-default.desktop
+share/kde4/services/plasma-dataengine-comic.desktop
+share/kde4/services/plasma-dataengine-twitter.desktop
+share/kde4/services/plasma-dict-default.desktop
+share/kde4/services/plasma-fileWatcher-default.desktop
+share/kde4/services/plasma-frame-default.desktop
+share/kde4/services/plasma-kolourpicker-default.desktop
+share/kde4/services/plasma-notes-default.desktop
+share/kde4/services/plasma-runner-contacts.desktop
+share/kde4/services/plasma-runner-converter.desktop
+share/kde4/services/plasma-twitter-default.desktop
+share/kde4/services/snoopyprovider.desktop
+share/kde4/services/userfriendlyprovider.desktop
+share/kde4/services/xkcdprovider.desktop
+share/kde4/servicetypes/plasma_comicprovider.desktop
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrm share/apps/plasma-comic
+ at dirrm share/apps/desktoptheme/slim-glow/widgets
+ at dirrm share/apps/desktoptheme/slim-glow/opaque/widgets
+ at dirrm share/apps/desktoptheme/slim-glow/opaque/dialogs
+ at dirrm share/apps/desktoptheme/slim-glow/opaque
+ at dirrm share/apps/desktoptheme/slim-glow/dialogs
+ at dirrm share/apps/desktoptheme/slim-glow
+ at dirrm share/apps/desktoptheme/heron/widgets
+ at dirrm share/apps/desktoptheme/heron/opaque/widgets
+ at dirrm share/apps/desktoptheme/heron/opaque/dialogs
+ at dirrm share/apps/desktoptheme/heron/opaque
+ at dirrm share/apps/desktoptheme/heron/dialogs
+ at dirrm share/apps/desktoptheme/heron
+ at dirrm share/apps/desktoptheme/Silicon/opaque/dialogs
+ at dirrm share/apps/desktoptheme/Silicon/opaque
+ at dirrm share/apps/desktoptheme/Silicon/widgets
+ at dirrm share/apps/desktoptheme/Silicon/dialogs
+ at dirrm share/apps/desktoptheme/Silicon
+ at dirrm share/apps/desktoptheme/Elegance/widgets
+ at dirrm share/apps/desktoptheme/Elegance/dialogs
+ at dirrm share/apps/desktoptheme/Elegance
+ at dirrm share/apps/desktoptheme/Aya/widgets
+ at dirrm share/apps/desktoptheme/Aya/opaque/widgets
+ at dirrm share/apps/desktoptheme/Aya/opaque/dialogs
+ at dirrm share/apps/desktoptheme/Aya/opaque
+ at dirrm share/apps/desktoptheme/Aya/dialogs
+ at dirrm share/apps/desktoptheme/Aya
--- /dev/null
+++ deskutils/kdeplasma-addons/Makefile
@@ -0,0 +1,25 @@
+#
+# $MidnightBSD: mports/deskutils/kdeplasma-addons/Makefile,v 1.1 2009/01/05 01:14:08 ctriv Exp $
+#
+
+PORTNAME=	kdeplasma-addons
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	deskutils kde ipv6
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Extra plasmoids for KDE4
+LICENSE=	gpl2
+
+USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+USE_BZIP2=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl webkit xml network moc rcc uic
+
+post-extract:
+	@${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ deskutils/kdeplasma-addons/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdeplasma-addons-4.1.3.tar.bz2) = 72d2d1c95b55fadbbce0e9cd201f1b80
+SHA256 (KDE/kdeplasma-addons-4.1.3.tar.bz2) = 7b44ddc3bda14c8497059f36165fb4ae8cf227372123ac4afb360328d45a0240
+SIZE (KDE/kdeplasma-addons-4.1.3.tar.bz2) = 4074696

From ctriv at midnightbsd.org  Sun Jan  4 20:14:49 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 20:14:49 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: kdeplasma-addons.
Message-ID: <200901050114.n051EntD098610@stargazer.midnightbsd.org>

Log Message:
-----------
added: kdeplasma-addons.

Modified Files:
--------------
    mports/deskutils:
        Makefile (r1.38 -> r1.39)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/deskutils/Makefile,v
retrieving revision 1.38
retrieving revision 1.39
diff -L deskutils/Makefile -L deskutils/Makefile -u -r1.38 -r1.39
--- deskutils/Makefile
+++ deskutils/Makefile
@@ -33,6 +33,7 @@
     SUBDIR += kdepim3
     SUBDIR += kdepim4
     SUBDIR += kdepimlibs4
+    SUBDIR += kdeplasma-addons
     SUBDIR += linux-sunbird
     SUBDIR += ljclive
     SUBDIR += menumaker

From ctriv at midnightbsd.org  Sun Jan  4 20:40:10 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 20:40:10 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: x11-clocks/kdetoys4: Added kdetoys-4.1.3
Message-ID: <200901050140.n051eAXC002543@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdetoys-4.1.3

Added Files:
-----------
    mports/x11-clocks/kdetoys4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ x11-clocks/kdetoys4/pkg-descr
@@ -0,0 +1,4 @@
+This port contains a set of KDE-based applications for
+miscellaneous use, like clocks.
+
+WWW: http://www.kde.org/
--- /dev/null
+++ x11-clocks/kdetoys4/pkg-plist
@@ -0,0 +1,555 @@
+bin/amor
+bin/kteatime
+bin/ktux
+bin/kweatherreport
+bin/kweatherservice
+lib/kde4/kcm_weather.so
+lib/kde4/kcm_weatherservice.so
+lib/libkdeinit4_kweatherreport.so
+share/applications/kde4/amor.desktop
+share/applications/kde4/kteatime.desktop
+share/apps/amor/billyrc
+share/apps/amor/blobrc
+share/apps/amor/bonhommerc
+share/apps/amor/bsdrc
+share/apps/amor/eyesrc
+share/apps/amor/ghostrc
+share/apps/amor/nekorc
+share/apps/amor/pics/animated/blob/blob.png
+share/apps/amor/pics/animated/blob/blob_BeamDown1.png
+share/apps/amor/pics/animated/blob/blob_BeamDown2.png
+share/apps/amor/pics/animated/blob/blob_BeamDown3.png
+share/apps/amor/pics/animated/blob/blob_BeamDown4.png
+share/apps/amor/pics/animated/blob/blob_BeamDown5.png
+share/apps/amor/pics/animated/blob/blob_BeamDown6.png
+share/apps/amor/pics/animated/blob/blob_BeamDown7.png
+share/apps/amor/pics/animated/blob/blob_BeamDown8.png
+share/apps/amor/pics/animated/blob/blob_BeamDown9.png
+share/apps/amor/pics/animated/blob/blob_BeamUp1.png
+share/apps/amor/pics/animated/blob/blob_BeamUp10.png
+share/apps/amor/pics/animated/blob/blob_BeamUp2.png
+share/apps/amor/pics/animated/blob/blob_BeamUp3.png
+share/apps/amor/pics/animated/blob/blob_BeamUp4.png
+share/apps/amor/pics/animated/blob/blob_BeamUp5.png
+share/apps/amor/pics/animated/blob/blob_BeamUp6.png
+share/apps/amor/pics/animated/blob/blob_BeamUp7.png
+share/apps/amor/pics/animated/blob/blob_BeamUp8.png
+share/apps/amor/pics/animated/blob/blob_BeamUp9.png
+share/apps/amor/pics/animated/blob/blob_b1.png
+share/apps/amor/pics/animated/blob/blob_b2.png
+share/apps/amor/pics/animated/blob/blob_e1.png
+share/apps/amor/pics/animated/blob/blob_ex1.png
+share/apps/amor/pics/animated/blob/blob_f1.png
+share/apps/amor/pics/animated/blob/blob_f2.png
+share/apps/amor/pics/animated/blob/blob_f3.png
+share/apps/amor/pics/animated/blob/blob_fire10.png
+share/apps/amor/pics/animated/blob/blob_fire11.png
+share/apps/amor/pics/animated/blob/blob_fire2.png
+share/apps/amor/pics/animated/blob/blob_fire3.png
+share/apps/amor/pics/animated/blob/blob_fire4.png
+share/apps/amor/pics/animated/blob/blob_fire5.png
+share/apps/amor/pics/animated/blob/blob_fire6.png
+share/apps/amor/pics/animated/blob/blob_fire7.png
+share/apps/amor/pics/animated/blob/blob_fire8.png
+share/apps/amor/pics/animated/blob/blob_fire9.png
+share/apps/amor/pics/animated/blob/blob_g1.png
+share/apps/amor/pics/animated/blob/blob_g2.png
+share/apps/amor/pics/animated/blob/blob_gl1.png
+share/apps/amor/pics/animated/blob/blob_gl2.png
+share/apps/amor/pics/animated/blob/blob_gl3.png
+share/apps/amor/pics/animated/blob/blob_h1.png
+share/apps/amor/pics/animated/blob/blob_h2.png
+share/apps/amor/pics/animated/blob/blob_h3.png
+share/apps/amor/pics/animated/blob/blob_jet1.png
+share/apps/amor/pics/animated/blob/blob_jet2.png
+share/apps/amor/pics/animated/blob/blob_jet3.png
+share/apps/amor/pics/animated/blob/blob_jet4.png
+share/apps/amor/pics/animated/blob/blob_l_jet1.png
+share/apps/amor/pics/animated/blob/blob_l_jet2.png
+share/apps/amor/pics/animated/blob/blob_l_jet3.png
+share/apps/amor/pics/animated/blob/blob_l_jet4.png
+share/apps/amor/pics/animated/blob/blob_l_turn1.png
+share/apps/amor/pics/animated/blob/blob_l_turn2.png
+share/apps/amor/pics/animated/blob/blob_l_turn3.png
+share/apps/amor/pics/animated/blob/blob_l_turn4.png
+share/apps/amor/pics/animated/blob/blob_r135.png
+share/apps/amor/pics/animated/blob/blob_r180.png
+share/apps/amor/pics/animated/blob/blob_r225.png
+share/apps/amor/pics/animated/blob/blob_r270.png
+share/apps/amor/pics/animated/blob/blob_r315.png
+share/apps/amor/pics/animated/blob/blob_r45.png
+share/apps/amor/pics/animated/blob/blob_r90.png
+share/apps/amor/pics/animated/blob/blob_r_turn1.png
+share/apps/amor/pics/animated/blob/blob_r_turn2.png
+share/apps/amor/pics/animated/blob/blob_r_turn3.png
+share/apps/amor/pics/animated/blob/blob_r_turn4.png
+share/apps/amor/pics/animated/blob/blob_s1.png
+share/apps/amor/pics/animated/blob/blob_s2.png
+share/apps/amor/pics/animated/blob/blob_s3.png
+share/apps/amor/pics/animated/blob/blob_sl1.png
+share/apps/amor/pics/animated/blob/blob_sl2.png
+share/apps/amor/pics/animated/blob/blob_sl3.png
+share/apps/amor/pics/animated/blob/blob_sl4.png
+share/apps/amor/pics/animated/blob/blob_z1.png
+share/apps/amor/pics/animated/blob/blob_z2.png
+share/apps/amor/pics/animated/blob/blob_z3.png
+share/apps/amor/pics/animated/bonhomme/b-f.png
+share/apps/amor/pics/animated/bonhomme/b-f2.png
+share/apps/amor/pics/animated/bonhomme/b1-r.png
+share/apps/amor/pics/animated/bonhomme/b1.png
+share/apps/amor/pics/animated/bonhomme/b2-r.png
+share/apps/amor/pics/animated/bonhomme/b2.png
+share/apps/amor/pics/animated/bonhomme/b3-r.png
+share/apps/amor/pics/animated/bonhomme/b3.png
+share/apps/amor/pics/animated/bonhomme/b4-r.png
+share/apps/amor/pics/animated/bonhomme/b4.png
+share/apps/amor/pics/animated/bonhomme/bcol1.png
+share/apps/amor/pics/animated/bonhomme/bcol2.png
+share/apps/amor/pics/animated/bonhomme/bdrib1.png
+share/apps/amor/pics/animated/bonhomme/bdrib2.png
+share/apps/amor/pics/animated/bonhomme/bdrib3.png
+share/apps/amor/pics/animated/bonhomme/bdrib4.png
+share/apps/amor/pics/animated/bonhomme/bdrib5.png
+share/apps/amor/pics/animated/bonhomme/bdrib6.png
+share/apps/amor/pics/animated/bonhomme/bdrib7.png
+share/apps/amor/pics/animated/bonhomme/bdrop.png
+share/apps/amor/pics/animated/bonhomme/bgo1.png
+share/apps/amor/pics/animated/bonhomme/bgo2.png
+share/apps/amor/pics/animated/bonhomme/bgo3.png
+share/apps/amor/pics/animated/bonhomme/bgo4.png
+share/apps/amor/pics/animated/bonhomme/bgo5.png
+share/apps/amor/pics/animated/bonhomme/bgo6.png
+share/apps/amor/pics/animated/bonhomme/bgo7.png
+share/apps/amor/pics/animated/bonhomme/bh1.png
+share/apps/amor/pics/animated/bonhomme/bpof1.png
+share/apps/amor/pics/animated/bonhomme/bpof2.png
+share/apps/amor/pics/animated/bonhomme/bpof3.png
+share/apps/amor/pics/animated/bonhomme/bpof4.png
+share/apps/amor/pics/animated/bonhomme/bpof5.png
+share/apps/amor/pics/animated/bonhomme/bpof6.png
+share/apps/amor/pics/animated/bonhomme/sa1.png
+share/apps/amor/pics/animated/bonhomme/sa2.png
+share/apps/amor/pics/animated/bonhomme/sa2a.png
+share/apps/amor/pics/animated/bonhomme/sa2b.png
+share/apps/amor/pics/animated/bonhomme/sa2c.png
+share/apps/amor/pics/animated/bonhomme/salut.png
+share/apps/amor/pics/animated/bonhomme/salut1.png
+share/apps/amor/pics/animated/eyes/eye_1.png
+share/apps/amor/pics/animated/eyes/eye_2.png
+share/apps/amor/pics/animated/eyes/eye_b.png
+share/apps/amor/pics/animated/eyes/eye_d.png
+share/apps/amor/pics/animated/eyes/eye_e.png
+share/apps/amor/pics/animated/eyes/eye_h1.png
+share/apps/amor/pics/animated/eyes/eye_h2.png
+share/apps/amor/pics/animated/eyes/eye_h3.png
+share/apps/amor/pics/animated/eyes/eye_h4.png
+share/apps/amor/pics/animated/eyes/eye_l.png
+share/apps/amor/pics/animated/eyes/eye_m1.png
+share/apps/amor/pics/animated/eyes/eye_m2.png
+share/apps/amor/pics/animated/eyes/eye_m3.png
+share/apps/amor/pics/animated/eyes/eye_m4.png
+share/apps/amor/pics/animated/eyes/eye_m5.png
+share/apps/amor/pics/animated/eyes/eye_m6.png
+share/apps/amor/pics/animated/eyes/eye_m7.png
+share/apps/amor/pics/animated/eyes/eye_s1.png
+share/apps/amor/pics/animated/eyes/eye_s2.png
+share/apps/amor/pics/animated/eyes/eye_s3.png
+share/apps/amor/pics/animated/eyes/eye_s4.png
+share/apps/amor/pics/animated/eyes/eye_u.png
+share/apps/amor/pics/animated/eyes/eye_z1.png
+share/apps/amor/pics/animated/eyes/eye_z2.png
+share/apps/amor/pics/animated/eyes/eye_z3.png
+share/apps/amor/pics/animated/eyes/eye_z4.png
+share/apps/amor/pics/animated/eyes/eye_z5.png
+share/apps/amor/pics/animated/ghost/ghost_1.png
+share/apps/amor/pics/animated/ghost/ghost_2.png
+share/apps/amor/pics/animated/ghost/ghost_e.png
+share/apps/amor/pics/animated/ghost/ghost_m1.png
+share/apps/amor/pics/animated/ghost/ghost_m2.png
+share/apps/amor/pics/animated/ghost/ghost_m3.png
+share/apps/amor/pics/animated/ghost/ghost_m4.png
+share/apps/amor/pics/animated/ghost/ghost_m5.png
+share/apps/amor/pics/animated/ghost/ghost_m6.png
+share/apps/amor/pics/animated/ghost/ghost_m7.png
+share/apps/amor/pics/animated/ghost/ghost_z1.png
+share/apps/amor/pics/animated/ghost/ghost_z2.png
+share/apps/amor/pics/animated/ghost/ghost_z3.png
+share/apps/amor/pics/animated/ghost/ghost_z4.png
+share/apps/amor/pics/animated/ghost/ghost_z5.png
+share/apps/amor/pics/animated/neko/claw1.png
+share/apps/amor/pics/animated/neko/claw2.png
+share/apps/amor/pics/animated/neko/jump1.png
+share/apps/amor/pics/animated/neko/jump2.png
+share/apps/amor/pics/animated/neko/jump3.png
+share/apps/amor/pics/animated/neko/jump4.png
+share/apps/amor/pics/animated/neko/jumpl1.png
+share/apps/amor/pics/animated/neko/jumpl2.png
+share/apps/amor/pics/animated/neko/jumpl3.png
+share/apps/amor/pics/animated/neko/jumpl4.png
+share/apps/amor/pics/animated/neko/lick.png
+share/apps/amor/pics/animated/neko/lick2.png
+share/apps/amor/pics/animated/neko/run1.png
+share/apps/amor/pics/animated/neko/run2.png
+share/apps/amor/pics/animated/neko/run3.png
+share/apps/amor/pics/animated/neko/run4.png
+share/apps/amor/pics/animated/neko/scratch1.png
+share/apps/amor/pics/animated/neko/scratch2.png
+share/apps/amor/pics/animated/neko/scratch3.png
+share/apps/amor/pics/animated/neko/scratch4.png
+share/apps/amor/pics/animated/neko/sit.png
+share/apps/amor/pics/animated/neko/sitleft.png
+share/apps/amor/pics/animated/neko/sleep1.png
+share/apps/amor/pics/animated/neko/sleep2.png
+share/apps/amor/pics/animated/neko/surprise.png
+share/apps/amor/pics/animated/neko/tail.png
+share/apps/amor/pics/animated/neko/yawn.png
+share/apps/amor/pics/animated/pingu/bash_l1.png
+share/apps/amor/pics/animated/pingu/bash_l10.png
+share/apps/amor/pics/animated/pingu/bash_l11.png
+share/apps/amor/pics/animated/pingu/bash_l12.png
+share/apps/amor/pics/animated/pingu/bash_l2.png
+share/apps/amor/pics/animated/pingu/bash_l3.png
+share/apps/amor/pics/animated/pingu/bash_l4.png
+share/apps/amor/pics/animated/pingu/bash_l5.png
+share/apps/amor/pics/animated/pingu/bash_l6.png
+share/apps/amor/pics/animated/pingu/bash_l7.png
+share/apps/amor/pics/animated/pingu/bash_l8.png
+share/apps/amor/pics/animated/pingu/bash_l9.png
+share/apps/amor/pics/animated/pingu/bash_r1.png
+share/apps/amor/pics/animated/pingu/bash_r10.png
+share/apps/amor/pics/animated/pingu/bash_r11.png
+share/apps/amor/pics/animated/pingu/bash_r12.png
+share/apps/amor/pics/animated/pingu/bash_r2.png
+share/apps/amor/pics/animated/pingu/bash_r3.png
+share/apps/amor/pics/animated/pingu/bash_r4.png
+share/apps/amor/pics/animated/pingu/bash_r5.png
+share/apps/amor/pics/animated/pingu/bash_r6.png
+share/apps/amor/pics/animated/pingu/bash_r7.png
+share/apps/amor/pics/animated/pingu/bash_r8.png
+share/apps/amor/pics/animated/pingu/bash_r9.png
+share/apps/amor/pics/animated/pingu/blocker1.png
+share/apps/amor/pics/animated/pingu/blocker2.png
+share/apps/amor/pics/animated/pingu/blocker3.png
+share/apps/amor/pics/animated/pingu/blocker4.png
+share/apps/amor/pics/animated/pingu/blocker5.png
+share/apps/amor/pics/animated/pingu/blocker6.png
+share/apps/amor/pics/animated/pingu/bomber1.png
+share/apps/amor/pics/animated/pingu/bomber10.png
+share/apps/amor/pics/animated/pingu/bomber11.png
+share/apps/amor/pics/animated/pingu/bomber12.png
+share/apps/amor/pics/animated/pingu/bomber13.png
+share/apps/amor/pics/animated/pingu/bomber14.png
+share/apps/amor/pics/animated/pingu/bomber15.png
+share/apps/amor/pics/animated/pingu/bomber16.png
+share/apps/amor/pics/animated/pingu/bomber2.png
+share/apps/amor/pics/animated/pingu/bomber3.png
+share/apps/amor/pics/animated/pingu/bomber4.png
+share/apps/amor/pics/animated/pingu/bomber5.png
+share/apps/amor/pics/animated/pingu/bomber6.png
+share/apps/amor/pics/animated/pingu/bomber7.png
+share/apps/amor/pics/animated/pingu/bomber8.png
+share/apps/amor/pics/animated/pingu/bomber9.png
+share/apps/amor/pics/animated/pingu/digger1.png
+share/apps/amor/pics/animated/pingu/digger10.png
+share/apps/amor/pics/animated/pingu/digger11.png
+share/apps/amor/pics/animated/pingu/digger12.png
+share/apps/amor/pics/animated/pingu/digger13.png
+share/apps/amor/pics/animated/pingu/digger14.png
+share/apps/amor/pics/animated/pingu/digger2.png
+share/apps/amor/pics/animated/pingu/digger3.png
+share/apps/amor/pics/animated/pingu/digger4.png
+share/apps/amor/pics/animated/pingu/digger5.png
+share/apps/amor/pics/animated/pingu/digger6.png
+share/apps/amor/pics/animated/pingu/digger7.png
+share/apps/amor/pics/animated/pingu/digger8.png
+share/apps/amor/pics/animated/pingu/digger9.png
+share/apps/amor/pics/animated/pingu/faller1.png
+share/apps/amor/pics/animated/pingu/faller2.png
+share/apps/amor/pics/animated/pingu/faller3.png
+share/apps/amor/pics/animated/pingu/faller4.png
+share/apps/amor/pics/animated/pingu/faller5.png
+share/apps/amor/pics/animated/pingu/faller6.png
+share/apps/amor/pics/animated/pingu/faller7.png
+share/apps/amor/pics/animated/pingu/faller8.png
+share/apps/amor/pics/animated/pingu/floater1.png
+share/apps/amor/pics/animated/pingu/floater2.png
+share/apps/amor/pics/animated/pingu/floater3.png
+share/apps/amor/pics/animated/pingu/floater4.png
+share/apps/amor/pics/animated/pingu/floater5.png
+share/apps/amor/pics/animated/pingu/floater6.png
+share/apps/amor/pics/animated/pingu/floater7.png
+share/apps/amor/pics/animated/pingu/floater8.png
+share/apps/amor/pics/animated/pingu/tumble1.png
+share/apps/amor/pics/animated/pingu/tumble2.png
+share/apps/amor/pics/animated/pingu/tumble3.png
+share/apps/amor/pics/animated/pingu/tumble4.png
+share/apps/amor/pics/animated/pingu/tumble5.png
+share/apps/amor/pics/animated/pingu/tumble6.png
+share/apps/amor/pics/animated/pingu/tumble7.png
+share/apps/amor/pics/animated/pingu/tumble8.png
+share/apps/amor/pics/animated/pingu/walk_l1.png
+share/apps/amor/pics/animated/pingu/walk_l2.png
+share/apps/amor/pics/animated/pingu/walk_l3.png
+share/apps/amor/pics/animated/pingu/walk_l4.png
+share/apps/amor/pics/animated/pingu/walk_l5.png
+share/apps/amor/pics/animated/pingu/walk_l6.png
+share/apps/amor/pics/animated/pingu/walk_l7.png
+share/apps/amor/pics/animated/pingu/walk_l8.png
+share/apps/amor/pics/animated/pingu/walk_r1.png
+share/apps/amor/pics/animated/pingu/walk_r2.png
+share/apps/amor/pics/animated/pingu/walk_r3.png
+share/apps/amor/pics/animated/pingu/walk_r4.png
+share/apps/amor/pics/animated/pingu/walk_r5.png
+share/apps/amor/pics/animated/pingu/walk_r6.png
+share/apps/amor/pics/animated/pingu/walk_r7.png
+share/apps/amor/pics/animated/pingu/walk_r8.png
+share/apps/amor/pics/animated/tao/yy-1.png
+share/apps/amor/pics/animated/tao/yy-2.png
+share/apps/amor/pics/animated/tao/yy-3.png
+share/apps/amor/pics/animated/tao/yy-4.png
+share/apps/amor/pics/animated/tao/yy-5.png
+share/apps/amor/pics/animated/tao/yy-6.png
+share/apps/amor/pics/animated/tao/yy-7.png
+share/apps/amor/pics/animated/tao/yy-8.png
+share/apps/amor/pics/animated/tao/yy-9.png
+share/apps/amor/pics/animated/tao/yy.png
+share/apps/amor/pics/animated/tao/yy105.png
+share/apps/amor/pics/animated/tao/yy120.png
+share/apps/amor/pics/animated/tao/yy135.png
+share/apps/amor/pics/animated/tao/yy15.png
+share/apps/amor/pics/animated/tao/yy150.png
+share/apps/amor/pics/animated/tao/yy165.png
+share/apps/amor/pics/animated/tao/yy180.png
+share/apps/amor/pics/animated/tao/yy195.png
+share/apps/amor/pics/animated/tao/yy210.png
+share/apps/amor/pics/animated/tao/yy225.png
+share/apps/amor/pics/animated/tao/yy240.png
+share/apps/amor/pics/animated/tao/yy255.png
+share/apps/amor/pics/animated/tao/yy270.png
+share/apps/amor/pics/animated/tao/yy285.png
+share/apps/amor/pics/animated/tao/yy30.png
+share/apps/amor/pics/animated/tao/yy300.png
+share/apps/amor/pics/animated/tao/yy315.png
+share/apps/amor/pics/animated/tao/yy330.png
+share/apps/amor/pics/animated/tao/yy345.png
+share/apps/amor/pics/animated/tao/yy45.png
+share/apps/amor/pics/animated/tao/yy60.png
+share/apps/amor/pics/animated/tao/yy75.png
+share/apps/amor/pics/animated/tao/yy90.png
+share/apps/amor/pics/animated/tao/yyx10.png
+share/apps/amor/pics/animated/tao/yyx12.png
+share/apps/amor/pics/animated/tao/yyx14.png
+share/apps/amor/pics/animated/tao/yyx16.png
+share/apps/amor/pics/animated/tao/yyx18.png
+share/apps/amor/pics/animated/tao/yyx20.png
+share/apps/amor/pics/animated/tao/yyx22.png
+share/apps/amor/pics/animated/tao/yyx24.png
+share/apps/amor/pics/animated/tao/yyx26.png
+share/apps/amor/pics/animated/tao/yyx28.png
+share/apps/amor/pics/animated/tao/yyx30.png
+share/apps/amor/pics/animated/tao/yyx6.png
+share/apps/amor/pics/animated/tao/yyx8.png
+share/apps/amor/pics/animated/worm/w-a1.png
+share/apps/amor/pics/animated/worm/w-a2.png
+share/apps/amor/pics/animated/worm/w-b1.png
+share/apps/amor/pics/animated/worm/w-b2.png
+share/apps/amor/pics/animated/worm/w-be1.png
+share/apps/amor/pics/animated/worm/w-be2.png
+share/apps/amor/pics/animated/worm/w-be3.png
+share/apps/amor/pics/animated/worm/w-be4.png
+share/apps/amor/pics/animated/worm/w-d1.png
+share/apps/amor/pics/animated/worm/w-d2.png
+share/apps/amor/pics/animated/worm/w-d3.png
+share/apps/amor/pics/animated/worm/w-d4.png
+share/apps/amor/pics/animated/worm/w-d5.png
+share/apps/amor/pics/animated/worm/w-dr1.png
+share/apps/amor/pics/animated/worm/w-e1.png
+share/apps/amor/pics/animated/worm/w-l1.png
+share/apps/amor/pics/animated/worm/w-l2.png
+share/apps/amor/pics/animated/worm/w-l3.png
+share/apps/amor/pics/animated/worm/w-ml0.png
+share/apps/amor/pics/animated/worm/w-ml1.png
+share/apps/amor/pics/animated/worm/w-ml2.png
+share/apps/amor/pics/animated/worm/w-ml3.png
+share/apps/amor/pics/animated/worm/w-mr0.png
+share/apps/amor/pics/animated/worm/w-mr1.png
+share/apps/amor/pics/animated/worm/w-mr2.png
+share/apps/amor/pics/animated/worm/w-mr3.png
+share/apps/amor/pics/animated/worm/w-s1.png
+share/apps/amor/pics/animated/worm/w-s2.png
+share/apps/amor/pics/animated/worm/w-s3.png
+share/apps/amor/pics/animated/worm/w-u1.png
+share/apps/amor/pics/animated/worm/w-u2.png
+share/apps/amor/pics/animated/worm/w-u3.png
+share/apps/amor/pics/animated/worm/w-wl1.png
+share/apps/amor/pics/animated/worm/w-wl2.png
+share/apps/amor/pics/animated/worm/w-wr1.png
+share/apps/amor/pics/animated/worm/w-wr2.png
+share/apps/amor/pics/preview/billy.png
+share/apps/amor/pics/preview/blob.png
+share/apps/amor/pics/preview/bonhomme.png
+share/apps/amor/pics/preview/bsd.png
+share/apps/amor/pics/preview/eyes.png
+share/apps/amor/pics/preview/ghost.png
+share/apps/amor/pics/preview/neko.png
+share/apps/amor/pics/preview/tao.png
+share/apps/amor/pics/preview/tux.png
+share/apps/amor/pics/preview/worm.png
+share/apps/amor/pics/static/billy.png
+share/apps/amor/pics/static/bsd.png
+share/apps/amor/pics/static/tux.png
+share/apps/amor/pingurc
+share/apps/amor/taorc
+share/apps/amor/tips-en
+share/apps/amor/tuxrc
+share/apps/amor/wormrc
+share/apps/kteatime/kteatime.notifyrc
+share/apps/ktux/sprites/anim0001.png
+share/apps/ktux/sprites/anim0002.png
+share/apps/ktux/sprites/anim0003.png
+share/apps/ktux/sprites/anim0004.png
+share/apps/ktux/sprites/anim0005.png
+share/apps/ktux/sprites/anim0006.png
+share/apps/ktux/sprites/anim0007.png
+share/apps/ktux/sprites/anim0008.png
+share/apps/ktux/sprites/anim0009.png
+share/apps/ktux/sprites/anim0010.png
+share/apps/ktux/sprites/bg.png
+share/apps/ktux/sprites/flare0001.png
+share/apps/ktux/sprites/flare0002.png
+share/apps/ktux/sprites/spriterc
+share/apps/ktux/sprites/star0001.png
+share/apps/ktux/sprites/star0002.png
+share/apps/kweather/cloudy1.png
+share/apps/kweather/cloudy1_night.png
+share/apps/kweather/cloudy2.png
+share/apps/kweather/cloudy2_night.png
+share/apps/kweather/cloudy3.png
+share/apps/kweather/cloudy3_night.png
+share/apps/kweather/cloudy4.png
+share/apps/kweather/cloudy4_night.png
+share/apps/kweather/cloudy5.png
+share/apps/kweather/dunno.png
+share/apps/kweather/fog.png
+share/apps/kweather/fog_night.png
+share/apps/kweather/hail.png
+share/apps/kweather/light_rain.png
+share/apps/kweather/mist.png
+share/apps/kweather/mist_night.png
+share/apps/kweather/overcast.png
+share/apps/kweather/shower1.png
+share/apps/kweather/shower1_night.png
+share/apps/kweather/shower2.png
+share/apps/kweather/shower2_night.png
+share/apps/kweather/shower3.png
+share/apps/kweather/sleet.png
+share/apps/kweather/snow1.png
+share/apps/kweather/snow1_night.png
+share/apps/kweather/snow2.png
+share/apps/kweather/snow2_night.png
+share/apps/kweather/snow3.png
+share/apps/kweather/snow3_night.png
+share/apps/kweather/snow4.png
+share/apps/kweather/snow5.png
+share/apps/kweather/sunny.png
+share/apps/kweather/sunny_night.png
+share/apps/kweather/tstorm1.png
+share/apps/kweather/tstorm1_night.png
+share/apps/kweather/tstorm2.png
+share/apps/kweather/tstorm2_night.png
+share/apps/kweather/tstorm3.png
+share/apps/kweatherservice/stations.dat
+share/apps/kweatherservice/weather_stations.desktop
+share/dbus-1/interfaces/org.kde.amor.xml
+share/dbus-1/interfaces/org.kde.kweather.kweather.xml
+share/dbus-1/interfaces/org.kde.kweather.service.xml
+share/doc/HTML/en/amor/billy.png
+share/doc/HTML/en/amor/bonhomme.png
+share/doc/HTML/en/amor/bsd.png
+share/doc/HTML/en/amor/common
+share/doc/HTML/en/amor/eyes.png
+share/doc/HTML/en/amor/ghost.png
+share/doc/HTML/en/amor/index.cache.bz2
+share/doc/HTML/en/amor/index.docbook
+share/doc/HTML/en/amor/man-amor.6.docbook
+share/doc/HTML/en/amor/neko.png
+share/doc/HTML/en/amor/pingus.png
+share/doc/HTML/en/amor/spot.png
+share/doc/HTML/en/amor/tao.png
+share/doc/HTML/en/amor/tux.png
+share/doc/HTML/en/amor/worm.png
+share/doc/HTML/en/kteatime/common
+share/doc/HTML/en/kteatime/config.png
+share/doc/HTML/en/kteatime/index.cache.bz2
+share/doc/HTML/en/kteatime/index.docbook
+share/doc/HTML/en/kweather/common
+share/doc/HTML/en/kweather/index.cache.bz2
+share/doc/HTML/en/kweather/index.docbook
+share/icons/hicolor/128x128/apps/kteatime.png
+share/icons/hicolor/16x16/apps/amor.png
+share/icons/hicolor/16x16/apps/kteatime.png
+share/icons/hicolor/16x16/apps/ktux.png
+share/icons/hicolor/16x16/apps/kweather.png
+share/icons/hicolor/22x22/apps/amor.png
+share/icons/hicolor/22x22/apps/kteatime.png
+share/icons/hicolor/32x32/apps/amor.png
+share/icons/hicolor/32x32/apps/kteatime.png
+share/icons/hicolor/32x32/apps/ktux.png
+share/icons/hicolor/32x32/apps/kweather.png
+share/icons/hicolor/48x48/apps/amor.png
+share/icons/hicolor/48x48/apps/kteatime.png
+share/icons/hicolor/48x48/apps/kweather.png
+share/icons/hicolor/64x64/apps/kteatime.png
+share/icons/hicolor/scalable/apps/kteatime.svgz
+share/kde4/services/ScreenSavers/ktux.desktop
+share/kde4/services/kcmweather.desktop
+share/kde4/services/kcmweatherservice.desktop
+share/kde4/services/kweatherservice.desktop
+ at dirrmtry share/kde4/services/ScreenSavers
+ at dirrmtry share/kde4/services
+ at dirrmtry share/kde4
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrm share/doc/HTML/en/kweather
+ at dirrm share/doc/HTML/en/kteatime
+ at dirrm share/doc/HTML/en/amor
+ at dirrmtry share/doc/HTML/en
+ at dirrmtry share/doc/HTML
+ at dirrmtry share/dbus-1/interfaces
+ at dirrmtry share/dbus-1
+ at dirrm share/apps/kweatherservice
+ at dirrm share/apps/kweather
+ at dirrm share/apps/ktux/sprites
+ at dirrm share/apps/ktux
+ at dirrm share/apps/kteatime
+ at dirrm share/apps/amor/pics/static
+ at dirrm share/apps/amor/pics/preview
+ at dirrm share/apps/amor/pics/animated/worm
+ at dirrm share/apps/amor/pics/animated/tao
+ at dirrm share/apps/amor/pics/animated/pingu
+ at dirrm share/apps/amor/pics/animated/neko
+ at dirrm share/apps/amor/pics/animated/ghost
+ at dirrm share/apps/amor/pics/animated/eyes
+ at dirrm share/apps/amor/pics/animated/bonhomme
+ at dirrm share/apps/amor/pics/animated/blob
+ at dirrm share/apps/amor/pics/animated
+ at dirrm share/apps/amor/pics
+ at dirrm share/apps/amor
+ at dirrmtry share/apps
+ at dirrmtry share/applications/kde4
+ at dirrmtry share/applications
+ at dirrmtry lib/kde4
--- /dev/null
+++ x11-clocks/kdetoys4/Makefile
@@ -0,0 +1,27 @@
+#
+# $MidnightBSD: mports/x11-clocks/kdetoys4/Makefile,v 1.1 2009/01/05 01:40:10 ctriv Exp $
+#
+
+PORTNAME=	kdetoys
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	x11-clocks kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Collection of entertaining, educational programs for KDE
+LICENSE=	gpl2
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_BZIP2=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	opengl gui moc rcc uic
+USE_KDE4=	kdelibs workspace kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+
+post-extract:
+	@${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ x11-clocks/kdetoys4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdetoys-4.1.3.tar.bz2) = ca5a74c6ae9f4c2f5e5b70e3c7711c78
+SHA256 (KDE/kdetoys-4.1.3.tar.bz2) = 59d7ea4ba4443feca7ad2aa29a680b8f5ab8f588db7e4cef6bad0338229f8026
+SIZE (KDE/kdetoys-4.1.3.tar.bz2) = 1323128

From ctriv at midnightbsd.org  Sun Jan  4 20:40:27 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 20:40:27 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: kdetoys4.
Message-ID: <200901050140.n051eRY1002688@stargazer.midnightbsd.org>

Log Message:
-----------
added: kdetoys4.

Modified Files:
--------------
    mports/x11-clocks:
        Makefile (r1.4 -> r1.5)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-clocks/Makefile,v
retrieving revision 1.4
retrieving revision 1.5
diff -L x11-clocks/Makefile -L x11-clocks/Makefile -u -r1.4 -r1.5
--- x11-clocks/Makefile
+++ x11-clocks/Makefile
@@ -5,6 +5,7 @@
 
     SUBDIR += asclock
     SUBDIR += kdetoys3
+    SUBDIR += kdetoys4
     SUBDIR += wmbinclock
     SUBDIR += wmcalclock
 

From ctriv at midnightbsd.org  Sun Jan  4 21:33:25 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 21:33:25 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: devel/kdesdk4: Added kdesdk-4.1.3
Message-ID: <200901050233.n052XPKw009997@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdesdk-4.1.3

Added Files:
-----------
    mports/devel/kdesdk4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ devel/kdesdk4/pkg-descr
@@ -0,0 +1,3 @@
+This is a collection of applications and tools used by KDE developers.
+It also has example code for use in learning KDE programming or starting
+a new KDE application.
--- /dev/null
+++ devel/kdesdk4/pkg-plist
@@ -0,0 +1,830 @@
+bin/adddebug
+bin/build-progress.sh
+bin/cervisia
+bin/cheatmake
+bin/colorsvn
+bin/create_cvsignore
+bin/create_makefile
+bin/create_makefiles
+bin/create_svnignore
+bin/cvs-clean
+bin/cvs2dist
+bin/cvsaddcurrentdir
+bin/cvsaskpass
+bin/cvsbackport
+bin/cvsblame
+bin/cvscheck
+bin/cvsforwardport
+bin/cvslastchange
+bin/cvslastlog
+bin/cvsrevertlast
+bin/cvsservice
+bin/cvsversion
+bin/cxxmetric
+bin/dprof2calltree
+bin/extend_dmalloc
+bin/extractattr
+bin/extractrc
+bin/findmissingcrystal
+bin/fix-include.sh
+bin/fixkdeincludes
+bin/fixuifiles
+bin/hotshot2calltree
+bin/includemocs
+bin/kate
+bin/kbugbuster
+bin/kcachegrind
+bin/kde_generate_export_header
+bin/kdedoc
+bin/kdekillall
+bin/kdelnk2desktop.py
+bin/kdemangen.pl
+bin/kdesvn-build
+bin/kio_svn_helper
+bin/kompare
+bin/krazy-licensecheck
+bin/kuiviewer
+bin/lokalize
+bin/makeobj
+bin/memprof2calltree
+bin/noncvslist
+bin/nonsvnlist
+bin/op2calltree
+bin/optimizegraphics
+bin/package_crystalsvg
+bin/png2mng.pl
+bin/po2xml
+bin/pprof2calltree
+bin/pruneemptydirs
+bin/qtdoc
+bin/split2po
+bin/svn-clean
+bin/svn2dist
+bin/svnbackport
+bin/svnchangesince
+bin/svnforwardport
+bin/svngettags
+bin/svnintegrate
+bin/svnlastchange
+bin/svnlastlog
+bin/svnrevertlast
+bin/svnversions
+bin/swappo
+bin/umbrello
+bin/wcgrep
+bin/xml2pot
+bin/zonetab2pot.py
+include/kate/application.h
+include/kate/documentmanager.h
+include/kate/mainwindow.h
+include/kate/plugin.h
+include/kate/pluginconfigpageinterface.h
+include/kate/pluginmanager.h
+include/kate_export.h
+include/kprofilemethod.h
+lib/kde4/kabcformat_kdeaccounts.so
+lib/kde4/kateexternaltoolsplugin.so
+lib/kde4/katefilebrowserplugin.so
+lib/kde4/katefiletemplates.so
+lib/kde4/katefindinfilesplugin.so
+lib/kde4/katekonsoleplugin.so
+lib/kde4/katemailfilesplugin.so
+lib/kde4/kateopenheaderplugin.so
+lib/kde4/katequickdocumentswitcherplugin.so
+lib/kde4/katesymbolviewerplugin.so
+lib/kde4/katetabbarextensionplugin.so
+lib/kde4/katetextfilterplugin.so
+lib/kde4/kcal_bugzilla.so
+lib/kde4/kded_ksvnd.so
+lib/kde4/kio_svn.so
+lib/kde4/libcervisiapart.so
+lib/kde4/libkomparenavtreepart.so
+lib/kde4/libkomparepart.so
+lib/kde4/libkuiviewerpart.so
+lib/kde4/plasma_applet_katesession.so
+lib/kde4/quithumbnail.so
+lib/libantlr.so
+lib/libantlr.so.5
+lib/libantlr.so.5.0.0
+lib/libkateinterfaces.so
+lib/libkateinterfaces.so.5
+lib/libkateinterfaces.so.5.0.0
+lib/libkdeinit4_cervisia.so
+lib/libkdeinit4_cvsaskpass.so
+lib/libkdeinit4_cvsservice.so
+lib/libkdeinit4_kate.so
+lib/libkomparedialogpages.so
+lib/libkomparedialogpages.so.5
+lib/libkomparedialogpages.so.5.0.0
+lib/libkomparediff2.so
+lib/libkomparediff2.so.5
+lib/libkomparediff2.so.5.0.0
+lib/libkompareinterface.so
+lib/libkompareinterface.so.5
+lib/libkompareinterface.so.5.0.0
+lib/strigi/strigila_diff.so
+lib/strigi/strigila_po.so
+lib/strigi/strigita_ts.so
+share/applications/kde4/cervisia.desktop
+share/applications/kde4/kate.desktop
+share/applications/kde4/kbugbuster.desktop
+share/applications/kde4/kcachegrind.desktop
+share/applications/kde4/kompare.desktop
+share/applications/kde4/kuiviewer.desktop
+share/applications/kde4/lokalize.desktop
+share/applications/kde4/umbrello.desktop
+share/apps/cervisia/cervisia.notifyrc
+share/apps/cervisia/cervisiashellui.rc
+share/apps/cervisiapart/cervisiaui.rc
+share/apps/kabc/formats/kdeaccountsplugin.desktop
+share/apps/kate/default.katesession
+share/apps/kate/externaltools
+share/apps/kate/icons/oxygen/16x16/actions/curfiledir.png
+share/apps/kate/icons/oxygen/16x16/actions/modified.png
+share/apps/kate/icons/oxygen/16x16/actions/modmod.png
+share/apps/kate/icons/oxygen/16x16/actions/modonhd.png
+share/apps/kate/icons/oxygen/16x16/actions/null.png
+share/apps/kate/kateui.rc
+share/apps/kate/pics/sessionchooser.png
+share/apps/kate/plugins/kateexternaltools/ui.rc
+share/apps/kate/plugins/katefiletemplates/templates/cppgpl.cpp.katetemplate
+share/apps/kate/plugins/katefiletemplates/templates/cppgpl.hh.katetemplate
+share/apps/kate/plugins/katefiletemplates/templates/cpplgpl.cpp.katetemplate
+share/apps/kate/plugins/katefiletemplates/templates/cpplgpl.hh.katetemplate
+share/apps/kate/plugins/katefiletemplates/templates/docbookchapter.xml.katetemplate
+share/apps/kate/plugins/katefiletemplates/templates/html.katetemplate
+share/apps/kate/plugins/katefiletemplates/templates/language.xml.katetemplate
+share/apps/kate/plugins/katefiletemplates/ui.rc
+share/apps/kate/plugins/katekonsole/ui.rc
+share/apps/kate/plugins/katemailfiles/ui.rc
+share/apps/kate/plugins/kateopenheader/ui.rc
+share/apps/kate/plugins/katequickdocumentswitcher/ui.rc
+share/apps/kate/plugins/katesymbolviewer/ui.rc
+share/apps/kate/plugins/katetabbarextension/ui.rc
+share/apps/kate/plugins/katetextfilter/ui.rc
+share/apps/kate/tips
+share/apps/katepart/syntax/katetemplate.xml
+share/apps/katepart/syntax/kdesvn-buildrc.xml
+share/apps/kbugbuster/kbugbusterui.rc
+share/apps/kbugbuster/pics/bars.png
+share/apps/kbugbuster/pics/logo.png
+share/apps/kbugbuster/pics/tools.png
+share/apps/kbugbuster/pics/top-right.png
+share/apps/kcachegrind/icons/hicolor/16x16/actions/move.png
+share/apps/kcachegrind/icons/hicolor/16x16/actions/percent.png
+share/apps/kcachegrind/icons/hicolor/22x22/actions/move.png
+share/apps/kcachegrind/icons/hicolor/22x22/actions/percent.png
+share/apps/kcachegrind/icons/hicolor/32x32/actions/percent.png
+share/apps/kcachegrind/kcachegrindui.rc
+share/apps/kcachegrind/tips
+share/apps/kconf_update/cervisia-change_repos_list.pl
+share/apps/kconf_update/cervisia-normalize_cvsroot.pl
+share/apps/kconf_update/cervisia.upd
+share/apps/kconf_update/change_colors.pl
+share/apps/kconf_update/kate-2.4.upd
+share/apps/kompare/komparepartui.rc
+share/apps/kompare/kompareui.rc
+share/apps/kuiviewer/kuiviewerui.rc
+share/apps/kuiviewerpart/kuiviewer_part.rc
+share/apps/lokalize/lokalizeui.rc
+share/apps/lokalize/projectmanagerui.rc
+share/apps/umbrello/common.ent
+share/apps/umbrello/docbook2xhtml.xsl
+share/apps/umbrello/headings/heading.adb
+share/apps/umbrello/headings/heading.ads
+share/apps/umbrello/headings/heading.as
+share/apps/umbrello/headings/heading.cpp
+share/apps/umbrello/headings/heading.cs
+share/apps/umbrello/headings/heading.d
+share/apps/umbrello/headings/heading.h
+share/apps/umbrello/headings/heading.idl
+share/apps/umbrello/headings/heading.java
+share/apps/umbrello/headings/heading.js
+share/apps/umbrello/headings/heading.php
+share/apps/umbrello/headings/heading.pm
+share/apps/umbrello/headings/heading.py
+share/apps/umbrello/headings/heading.rb
+share/apps/umbrello/headings/heading.sql
+share/apps/umbrello/headings/heading.xsd
+share/apps/umbrello/pics/CVglobal_meth.png
+share/apps/umbrello/pics/CVglobal_var.png
+share/apps/umbrello/pics/CVimplementation_meth.png
+share/apps/umbrello/pics/CVimplementation_signal.png
+share/apps/umbrello/pics/CVimplementation_slot.png
+share/apps/umbrello/pics/CVimplementation_var.png
+share/apps/umbrello/pics/CVnamespace.png
+share/apps/umbrello/pics/CVprivate_meth.png
+share/apps/umbrello/pics/CVprivate_signal.png
+share/apps/umbrello/pics/CVprivate_slot.png
+share/apps/umbrello/pics/CVprivate_var.png
+share/apps/umbrello/pics/CVprotected_meth.png
+share/apps/umbrello/pics/CVprotected_signal.png
+share/apps/umbrello/pics/CVprotected_slot.png
+share/apps/umbrello/pics/CVprotected_var.png
+share/apps/umbrello/pics/CVpublic_meth.png
+share/apps/umbrello/pics/CVpublic_signal.png
+share/apps/umbrello/pics/CVpublic_slot.png
+share/apps/umbrello/pics/CVpublic_var.png
+share/apps/umbrello/pics/CVstruct.png
+share/apps/umbrello/pics/PrePostCondition.png
+share/apps/umbrello/pics/accept_signal.png
+share/apps/umbrello/pics/accept_time_event.png
+share/apps/umbrello/pics/activity-fork.png
+share/apps/umbrello/pics/actor.png
+share/apps/umbrello/pics/aggregation.png
+share/apps/umbrello/pics/align-horizontal-center.png
+share/apps/umbrello/pics/align-horizontal-left.png
+share/apps/umbrello/pics/align-horizontal-right.png
+share/apps/umbrello/pics/align-vertical-bottom.png
+share/apps/umbrello/pics/align-vertical-center.png
+share/apps/umbrello/pics/align-vertical-top.png
+share/apps/umbrello/pics/anchor.png
+share/apps/umbrello/pics/andline.png
+share/apps/umbrello/pics/arrow.png
+share/apps/umbrello/pics/artifact.png
+share/apps/umbrello/pics/association.png
+share/apps/umbrello/pics/box.png
+share/apps/umbrello/pics/branch.png
+share/apps/umbrello/pics/category.png
+share/apps/umbrello/pics/category2parent.png
+share/apps/umbrello/pics/check_constraint.png
+share/apps/umbrello/pics/child2category.png
+share/apps/umbrello/pics/choice-rhomb.png
+share/apps/umbrello/pics/choice-round.png
+share/apps/umbrello/pics/class.png
+share/apps/umbrello/pics/combined_fragment.png
+share/apps/umbrello/pics/component.png
+share/apps/umbrello/pics/composition.png
+share/apps/umbrello/pics/containment.png
+share/apps/umbrello/pics/cursor-PrePostCondition.png
+share/apps/umbrello/pics/cursor-accept_signal.png
+share/apps/umbrello/pics/cursor-accept_time_event.png
+share/apps/umbrello/pics/cursor-activity-fork.png
+share/apps/umbrello/pics/cursor-actor.png
+share/apps/umbrello/pics/cursor-aggregation.png
+share/apps/umbrello/pics/cursor-anchor.png
+share/apps/umbrello/pics/cursor-andline.png
+share/apps/umbrello/pics/cursor-artifact.png
+share/apps/umbrello/pics/cursor-association.png
+share/apps/umbrello/pics/cursor-box.png
+share/apps/umbrello/pics/cursor-branch.png
+share/apps/umbrello/pics/cursor-category.png
+share/apps/umbrello/pics/cursor-category2parent.png
+share/apps/umbrello/pics/cursor-child2category.png
+share/apps/umbrello/pics/cursor-choice-rhomb.png
+share/apps/umbrello/pics/cursor-choice-round.png
+share/apps/umbrello/pics/cursor-class.png
+share/apps/umbrello/pics/cursor-combined_fragment.png
+share/apps/umbrello/pics/cursor-component.png
+share/apps/umbrello/pics/cursor-composition.png
+share/apps/umbrello/pics/cursor-containment.png
+share/apps/umbrello/pics/cursor-datatype.png
+share/apps/umbrello/pics/cursor-deep-history.png
+share/apps/umbrello/pics/cursor-dependency.png
+share/apps/umbrello/pics/cursor-end_of_life.png
+share/apps/umbrello/pics/cursor-end_state.png
+share/apps/umbrello/pics/cursor-entity.png
+share/apps/umbrello/pics/cursor-enum.png
+share/apps/umbrello/pics/cursor-exception.png
+share/apps/umbrello/pics/cursor-final_activity.png
+share/apps/umbrello/pics/cursor-generalisation.png
+share/apps/umbrello/pics/cursor-initial_state.png
+share/apps/umbrello/pics/cursor-interface.png
+share/apps/umbrello/pics/cursor-join.png
+share/apps/umbrello/pics/cursor-junction.png
+share/apps/umbrello/pics/cursor-node.png
+share/apps/umbrello/pics/cursor-note.png
+share/apps/umbrello/pics/cursor-object.png
+share/apps/umbrello/pics/cursor-object_node.png
+share/apps/umbrello/pics/cursor-package.png
+share/apps/umbrello/pics/cursor-pin.png
+share/apps/umbrello/pics/cursor-precondition.png
+share/apps/umbrello/pics/cursor-region.png
+share/apps/umbrello/pics/cursor-relationship.png
+share/apps/umbrello/pics/cursor-send_signal.png
+share/apps/umbrello/pics/cursor-shallow-history.png
+share/apps/umbrello/pics/cursor-state-fork.png
+share/apps/umbrello/pics/cursor-text.png
+share/apps/umbrello/pics/cursor-umbr-message-asynchronous.png
+share/apps/umbrello/pics/cursor-umbr-message-found.png
+share/apps/umbrello/pics/cursor-umbr-message-lost.png
+share/apps/umbrello/pics/cursor-umbr-message-synchronous.png
+share/apps/umbrello/pics/cursor-uniassociation.png
+share/apps/umbrello/pics/cursor-usecase.png
+share/apps/umbrello/pics/datatype.png
+share/apps/umbrello/pics/deep-history.png
+share/apps/umbrello/pics/dependency.png
+share/apps/umbrello/pics/distribute-horizontal.png
+share/apps/umbrello/pics/distribute-vertical.png
+share/apps/umbrello/pics/end_of_life.png
+share/apps/umbrello/pics/end_state.png
+share/apps/umbrello/pics/entity.png
+share/apps/umbrello/pics/enum.png
+share/apps/umbrello/pics/exception.png
+share/apps/umbrello/pics/final_activity.png
+share/apps/umbrello/pics/foreignkey_constraint.png
+share/apps/umbrello/pics/generalisation.png
+share/apps/umbrello/pics/initial_state.png
+share/apps/umbrello/pics/interface.png
+share/apps/umbrello/pics/join.png
+share/apps/umbrello/pics/junction.png
+share/apps/umbrello/pics/node.png
+share/apps/umbrello/pics/note.png
+share/apps/umbrello/pics/object.png
+share/apps/umbrello/pics/object_node.png
+share/apps/umbrello/pics/package.png
+share/apps/umbrello/pics/pin.png
+share/apps/umbrello/pics/precondition.png
+share/apps/umbrello/pics/primarykey_constraint.png
+share/apps/umbrello/pics/refactor.png
+share/apps/umbrello/pics/region.png
+share/apps/umbrello/pics/relationship.png
+share/apps/umbrello/pics/send_signal.png
+share/apps/umbrello/pics/shallow-history.png
+share/apps/umbrello/pics/startlogo.png
+share/apps/umbrello/pics/state-fork.png
+share/apps/umbrello/pics/subsystem.png
+share/apps/umbrello/pics/template.png
+share/apps/umbrello/pics/text.png
+share/apps/umbrello/pics/umbr-message-asynchronous.png
+share/apps/umbrello/pics/umbr-message-found.png
+share/apps/umbrello/pics/umbr-message-lost.png
+share/apps/umbrello/pics/umbr-message-synchronous.png
+share/apps/umbrello/pics/uniassociation.png
+share/apps/umbrello/pics/unique_constraint.png
+share/apps/umbrello/pics/usecase.png
+share/apps/umbrello/umbrelloui.rc
+share/apps/umbrello/xmi.css
+share/apps/umbrello/xmi2docbook.xsl
+share/config.kcfg/cervisiapart.kcfg
+share/config.kcfg/lokalize.kcfg
+share/config/katefiletemplates.knsrc
+share/config/katerc
+share/dbus-1/interfaces/org.kde.cervisia.cvsjob.xml
+share/dbus-1/interfaces/org.kde.cervisia.cvsloginjob.xml
+share/dbus-1/interfaces/org.kde.cervisia.cvsservice.xml
+share/dbus-1/interfaces/org.kde.cervisia.repository.xml
+share/dbus-1/interfaces/org.kde.ksvnd.xml
+share/doc/HTML/en/cervisia/annotate.png
+share/doc/HTML/en/cervisia/checkout.png
+share/doc/HTML/en/cervisia/commit.png
+share/doc/HTML/en/cervisia/common
+share/doc/HTML/en/cervisia/diff.png
+share/doc/HTML/en/cervisia/history.png
+share/doc/HTML/en/cervisia/import.png
+share/doc/HTML/en/cervisia/index.cache.bz2
+share/doc/HTML/en/cervisia/index.docbook
+share/doc/HTML/en/cervisia/logtree.png
+share/doc/HTML/en/cervisia/mainview.png
+share/doc/HTML/en/cervisia/patch.png
+share/doc/HTML/en/cervisia/popup.png
+share/doc/HTML/en/cervisia/repositories.png
+share/doc/HTML/en/cervisia/resolve.png
+share/doc/HTML/en/cervisia/updatetag.png
+share/doc/HTML/en/kapptemplate/common
+share/doc/HTML/en/kapptemplate/first-page.png
+share/doc/HTML/en/kapptemplate/fourth-page.png
+share/doc/HTML/en/kapptemplate/index.cache.bz2
+share/doc/HTML/en/kapptemplate/index.docbook
+share/doc/HTML/en/kapptemplate/kapp4.png
+share/doc/HTML/en/kapptemplate/kderubyapp.png
+share/doc/HTML/en/kapptemplate/kpartapp.png
+share/doc/HTML/en/kapptemplate/plasma-applet.png
+share/doc/HTML/en/kapptemplate/pykde4.png
+share/doc/HTML/en/kapptemplate/pyqt4app.png
+share/doc/HTML/en/kapptemplate/second-page.png
+share/doc/HTML/en/kapptemplate/third-page.png
+share/doc/HTML/en/kate-plugins/common
+share/doc/HTML/en/kate-plugins/configure_insertcommand.png
+share/doc/HTML/en/kate-plugins/filetemplates.docbook
+share/doc/HTML/en/kate-plugins/htmltools.docbook
+share/doc/HTML/en/kate-plugins/index.cache.bz2
+share/doc/HTML/en/kate-plugins/index.docbook
+share/doc/HTML/en/kate-plugins/insertcommand.docbook
+share/doc/HTML/en/kate-plugins/insertcommand.png
+share/doc/HTML/en/kate-plugins/openheader.docbook
+share/doc/HTML/en/kate-plugins/textfilter.docbook
+share/doc/HTML/en/kate-plugins/xmlcheck.docbook
+share/doc/HTML/en/kate-plugins/xmltools.docbook
+share/doc/HTML/en/kate/advanced.docbook
+share/doc/HTML/en/kate/common
+share/doc/HTML/en/kate/configdialog01.png
+share/doc/HTML/en/kate/configdialog02.png
+share/doc/HTML/en/kate/configuring.docbook
+share/doc/HTML/en/kate/fundamentals.docbook
+share/doc/HTML/en/kate/highlighted.png
+share/doc/HTML/en/kate/highlighting.docbook
+share/doc/HTML/en/kate/index.cache.bz2
+share/doc/HTML/en/kate/index.docbook
+share/doc/HTML/en/kate/kate.png
+share/doc/HTML/en/kate/man-kate.1.docbook
+share/doc/HTML/en/kate/mdi.docbook
+share/doc/HTML/en/kate/menus.docbook
+share/doc/HTML/en/kate/mimetypechooser.png
+share/doc/HTML/en/kate/part.docbook
+share/doc/HTML/en/kate/plugins.docbook
+share/doc/HTML/en/kate/regular-expressions.docbook
+share/doc/HTML/en/kate/unhighlighted.png
+share/doc/HTML/en/kbugbuster/common
+share/doc/HTML/en/kbugbuster/index.cache.bz2
+share/doc/HTML/en/kbugbuster/index.docbook
+share/doc/HTML/en/kcachegrind/common
+share/doc/HTML/en/kcachegrind/index.cache.bz2
+share/doc/HTML/en/kcachegrind/index.docbook
+share/doc/HTML/en/kdesvn-build/common
+share/doc/HTML/en/kdesvn-build/index.cache.bz2
+share/doc/HTML/en/kdesvn-build/index.docbook
+share/doc/HTML/en/kompare/common
+share/doc/HTML/en/kompare/index.cache.bz2
+share/doc/HTML/en/kompare/index.docbook
+share/doc/HTML/en/kompare/settings-diff1.png
+share/doc/HTML/en/kompare/settings-diff2.png
+share/doc/HTML/en/kompare/settings-diff3.png
+share/doc/HTML/en/kompare/settings-diff4.png
+share/doc/HTML/en/kompare/settings-view1.png
+share/doc/HTML/en/kompare/settings-view2.png
+share/doc/HTML/en/lokalize/common
+share/doc/HTML/en/lokalize/index.cache.bz2
+share/doc/HTML/en/lokalize/index.docbook
+share/doc/HTML/en/umbrello/activity-diagram.png
+share/doc/HTML/en/umbrello/add-remove-languages.png
+share/doc/HTML/en/umbrello/aggregation.png
+share/doc/HTML/en/umbrello/association.png
+share/doc/HTML/en/umbrello/authors.docbook
+share/doc/HTML/en/umbrello/category.png
+share/doc/HTML/en/umbrello/class-diagram.png
+share/doc/HTML/en/umbrello/class.png
+share/doc/HTML/en/umbrello/code-import.png
+share/doc/HTML/en/umbrello/code_import_and_generation.docbook
+share/doc/HTML/en/umbrello/collaboration-diagram.png
+share/doc/HTML/en/umbrello/common
+share/doc/HTML/en/umbrello/composition.png
+share/doc/HTML/en/umbrello/credits.docbook
+share/doc/HTML/en/umbrello/disjoint-specialization.png
+share/doc/HTML/en/umbrello/entity-relationship-diagram.png
+share/doc/HTML/en/umbrello/entity.png
+share/doc/HTML/en/umbrello/folders.png
+share/doc/HTML/en/umbrello/generalization.png
+share/doc/HTML/en/umbrello/generation-options.png
+share/doc/HTML/en/umbrello/index.cache.bz2
+share/doc/HTML/en/umbrello/index.docbook
+share/doc/HTML/en/umbrello/introduction.docbook
+share/doc/HTML/en/umbrello/other_features.docbook
+share/doc/HTML/en/umbrello/overlapping-specialization.png
+share/doc/HTML/en/umbrello/sequence-diagram.png
+share/doc/HTML/en/umbrello/state-diagram.png
+share/doc/HTML/en/umbrello/umbrello-main-screen.png
+share/doc/HTML/en/umbrello/umbrello-ui-clean.png
+share/doc/HTML/en/umbrello/umbrello-ui.png
+share/doc/HTML/en/umbrello/uml_basics.docbook
+share/doc/HTML/en/umbrello/use-case-diagram.png
+share/doc/HTML/en/umbrello/working_with_umbrello.docbook
+share/icons/hicolor/128x128/apps/kbugbuster.png
+share/icons/hicolor/128x128/apps/kompare.png
+share/icons/hicolor/128x128/apps/lokalize.png
+share/icons/hicolor/128x128/apps/umbrello.png
+share/icons/hicolor/16x16/actions/approved.png
+share/icons/hicolor/16x16/actions/insert_arg.png
+share/icons/hicolor/16x16/actions/insert_tag.png
+share/icons/hicolor/16x16/actions/msgid2msgstr.png
+share/icons/hicolor/16x16/actions/nexterror.png
+share/icons/hicolor/16x16/actions/nextfuzzy.png
+share/icons/hicolor/16x16/actions/nextfuzzyuntrans.png
+share/icons/hicolor/16x16/actions/nextuntranslated.png
+share/icons/hicolor/16x16/actions/preverror.png
+share/icons/hicolor/16x16/actions/prevfuzzy.png
+share/icons/hicolor/16x16/actions/prevfuzzyuntrans.png
+share/icons/hicolor/16x16/actions/prevuntranslated.png
+share/icons/hicolor/16x16/actions/search2msgstr.png
+share/icons/hicolor/16x16/actions/transsearch.png
+share/icons/hicolor/16x16/apps/cervisia.png
+share/icons/hicolor/16x16/apps/kbugbuster.png
+share/icons/hicolor/16x16/apps/kompare.png
+share/icons/hicolor/16x16/apps/kuiviewer.png
+share/icons/hicolor/16x16/apps/umbrello.png
+share/icons/hicolor/16x16/mimetypes/umbrellofile.png
+share/icons/hicolor/22x22/actions/approved.png
+share/icons/hicolor/22x22/actions/catalogmanager.png
+share/icons/hicolor/22x22/actions/insert_arg.png
+share/icons/hicolor/22x22/actions/insert_tag.png
+share/icons/hicolor/22x22/actions/msgid2msgstr.png
+share/icons/hicolor/22x22/actions/nexterror.png
+share/icons/hicolor/22x22/actions/nextfuzzy.png
+share/icons/hicolor/22x22/actions/nextfuzzyuntrans.png
+share/icons/hicolor/22x22/actions/nextuntranslated.png
+share/icons/hicolor/22x22/actions/preverror.png
+share/icons/hicolor/22x22/actions/prevfuzzy.png
+share/icons/hicolor/22x22/actions/prevfuzzyuntrans.png
+share/icons/hicolor/22x22/actions/prevuntranslated.png
+share/icons/hicolor/22x22/actions/search2msgstr.png
+share/icons/hicolor/22x22/actions/transsearch.png
+share/icons/hicolor/22x22/apps/cervisia.png
+share/icons/hicolor/22x22/apps/kbugbuster.png
+share/icons/hicolor/22x22/apps/kompare.png
+share/icons/hicolor/22x22/apps/umbrello.png
+share/icons/hicolor/32x32/actions/approved.png
+share/icons/hicolor/32x32/actions/autodiff.png
+share/icons/hicolor/32x32/actions/catalogmanager.png
+share/icons/hicolor/32x32/actions/diff.png
+share/icons/hicolor/32x32/actions/insert_arg.png
+share/icons/hicolor/32x32/actions/insert_tag.png
+share/icons/hicolor/32x32/actions/msgid2msgstr.png
+share/icons/hicolor/32x32/actions/nexterror.png
+share/icons/hicolor/32x32/actions/nextfuzzy.png
+share/icons/hicolor/32x32/actions/nextfuzzyuntrans.png
+share/icons/hicolor/32x32/actions/nextuntranslated.png
+share/icons/hicolor/32x32/actions/preverror.png
+share/icons/hicolor/32x32/actions/prevfuzzy.png
+share/icons/hicolor/32x32/actions/prevfuzzyuntrans.png
+share/icons/hicolor/32x32/actions/prevuntranslated.png
+share/icons/hicolor/32x32/actions/search2msgstr.png
+share/icons/hicolor/32x32/actions/transsearch.png
+share/icons/hicolor/32x32/apps/cervisia.png
+share/icons/hicolor/32x32/apps/kbugbuster.png
+share/icons/hicolor/32x32/apps/kcachegrind.png
+share/icons/hicolor/32x32/apps/kompare.png
+share/icons/hicolor/32x32/apps/kuiviewer.png
+share/icons/hicolor/32x32/apps/lokalize.png
+share/icons/hicolor/32x32/apps/umbrello.png
+share/icons/hicolor/32x32/mimetypes/umbrellofile.png
+share/icons/hicolor/48x48/actions/approved.png
+share/icons/hicolor/48x48/apps/cervisia.png
+share/icons/hicolor/48x48/apps/kbugbuster.png
+share/icons/hicolor/48x48/apps/kcachegrind.png
+share/icons/hicolor/48x48/apps/kompare.png
+share/icons/hicolor/48x48/apps/kuiviewer.png
+share/icons/hicolor/48x48/apps/umbrello.png
+share/icons/hicolor/64x64/apps/kbugbuster.png
+share/icons/hicolor/64x64/apps/lokalize.png
+share/icons/hicolor/64x64/apps/umbrello.png
+share/icons/hicolor/scalable/actions/approved.svgz
+share/icons/hicolor/scalable/apps/kompare.svgz
+share/icons/hicolor/scalable/apps/lokalize.svgz
+share/icons/hicolor/scalable/apps/umbrello.svgz
+share/icons/locolor/16x16/actions/autodiff.png
+share/icons/locolor/16x16/actions/catalogmanager.png
+share/icons/locolor/16x16/actions/diff.png
+share/icons/locolor/16x16/actions/insert_arg.png
+share/icons/locolor/16x16/actions/insert_tag.png
+share/icons/locolor/16x16/actions/msgid2msgstr.png
+share/icons/locolor/16x16/actions/nexterror.png
+share/icons/locolor/16x16/actions/nextfuzzy.png
+share/icons/locolor/16x16/actions/nextfuzzyuntrans.png
+share/icons/locolor/16x16/actions/nextuntranslated.png
+share/icons/locolor/16x16/actions/preverror.png
+share/icons/locolor/16x16/actions/prevfuzzy.png
+share/icons/locolor/16x16/actions/prevfuzzyuntrans.png
+share/icons/locolor/16x16/actions/prevuntranslated.png
+share/icons/locolor/16x16/actions/search2msgstr.png
+share/icons/locolor/16x16/actions/transsearch.png
+share/icons/locolor/32x32/actions/autodiff.png
+share/icons/locolor/32x32/actions/catalogmanager.png
+share/icons/locolor/32x32/actions/diff.png
+share/icons/locolor/32x32/actions/insert_arg.png
+share/icons/locolor/32x32/actions/insert_tag.png
+share/icons/locolor/32x32/actions/msgid2msgstr.png
+share/icons/locolor/32x32/actions/nexterror.png
+share/icons/locolor/32x32/actions/nextfuzzy.png
+share/icons/locolor/32x32/actions/nextfuzzyuntrans.png
+share/icons/locolor/32x32/actions/nextuntranslated.png
+share/icons/locolor/32x32/actions/preverror.png
+share/icons/locolor/32x32/actions/prevfuzzy.png
+share/icons/locolor/32x32/actions/prevfuzzyuntrans.png
+share/icons/locolor/32x32/actions/prevuntranslated.png
+share/icons/locolor/32x32/actions/search2msgstr.png
+share/icons/locolor/32x32/actions/transsearch.png
+share/icons/oxygen/128x128/actions/svn_add.png
+share/icons/oxygen/128x128/actions/svn_branch.png
+share/icons/oxygen/128x128/actions/svn_merge.png
+share/icons/oxygen/128x128/actions/svn_remove.png
+share/icons/oxygen/128x128/actions/svn_status.png
+share/icons/oxygen/128x128/actions/svn_switch.png
+share/icons/oxygen/16x16/actions/svn_add.png
+share/icons/oxygen/16x16/actions/svn_branch.png
+share/icons/oxygen/16x16/actions/svn_merge.png
+share/icons/oxygen/16x16/actions/svn_remove.png
+share/icons/oxygen/16x16/actions/svn_status.png
+share/icons/oxygen/16x16/actions/svn_switch.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_activity.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_class.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_collaboration.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_component.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_deployment.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_sequence.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_state.png
+share/icons/oxygen/16x16/actions/umbrello_diagram_usecase.png
+share/icons/oxygen/16x16/actions/vcs_add.png
+share/icons/oxygen/16x16/actions/vcs_commit.png
+share/icons/oxygen/16x16/actions/vcs_diff.png
+share/icons/oxygen/16x16/actions/vcs_remove.png
+share/icons/oxygen/16x16/actions/vcs_status.png
+share/icons/oxygen/16x16/actions/vcs_update.png
+share/icons/oxygen/22x22/actions/svn_add.png
+share/icons/oxygen/22x22/actions/svn_branch.png
+share/icons/oxygen/22x22/actions/svn_merge.png
+share/icons/oxygen/22x22/actions/svn_remove.png
+share/icons/oxygen/22x22/actions/svn_status.png
+share/icons/oxygen/22x22/actions/svn_switch.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_activity.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_class.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_collaboration.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_component.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_deployment.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_entityrelationship.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_sequence.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_state.png
+share/icons/oxygen/22x22/actions/umbrello_diagram_usecase.png
+share/icons/oxygen/22x22/actions/vcs_add.png
+share/icons/oxygen/22x22/actions/vcs_commit.png
+share/icons/oxygen/22x22/actions/vcs_diff.png
+share/icons/oxygen/22x22/actions/vcs_remove.png
+share/icons/oxygen/22x22/actions/vcs_status.png
+share/icons/oxygen/22x22/actions/vcs_update.png
+share/icons/oxygen/32x32/actions/svn_add.png
+share/icons/oxygen/32x32/actions/svn_branch.png
+share/icons/oxygen/32x32/actions/svn_merge.png
+share/icons/oxygen/32x32/actions/svn_remove.png
+share/icons/oxygen/32x32/actions/svn_status.png
+share/icons/oxygen/32x32/actions/svn_switch.png
+share/icons/oxygen/32x32/actions/vcs_add.png
+share/icons/oxygen/32x32/actions/vcs_commit.png
+share/icons/oxygen/32x32/actions/vcs_diff.png
+share/icons/oxygen/32x32/actions/vcs_remove.png
+share/icons/oxygen/32x32/actions/vcs_status.png
+share/icons/oxygen/32x32/actions/vcs_update.png
+share/icons/oxygen/48x48/actions/svn_add.png
+share/icons/oxygen/48x48/actions/svn_branch.png
+share/icons/oxygen/48x48/actions/svn_merge.png
+share/icons/oxygen/48x48/actions/svn_remove.png
+share/icons/oxygen/48x48/actions/svn_status.png
+share/icons/oxygen/48x48/actions/svn_switch.png
+share/icons/oxygen/48x48/actions/vcs_add.png
+share/icons/oxygen/48x48/actions/vcs_commit.png
+share/icons/oxygen/48x48/actions/vcs_diff.png
+share/icons/oxygen/48x48/actions/vcs_remove.png
+share/icons/oxygen/48x48/actions/vcs_status.png
+share/icons/oxygen/48x48/actions/vcs_update.png
+share/icons/oxygen/64x64/actions/svn_add.png
+share/icons/oxygen/64x64/actions/svn_branch.png
+share/icons/oxygen/64x64/actions/svn_merge.png
+share/icons/oxygen/64x64/actions/svn_remove.png
+share/icons/oxygen/64x64/actions/svn_status.png
+share/icons/oxygen/64x64/actions/svn_switch.png
+share/icons/oxygen/scalable/actions/svn_add.svgz
+share/icons/oxygen/scalable/actions/svn_branch.svgz
+share/icons/oxygen/scalable/actions/svn_merge.svgz
+share/icons/oxygen/scalable/actions/svn_remove.svgz
+share/icons/oxygen/scalable/actions/svn_status.svgz
+share/icons/oxygen/scalable/actions/svn_switch.svgz
+share/icons/oxygen/scalable/actions/vcs_add.svgz
+share/icons/oxygen/scalable/actions/vcs_commit.svgz
+share/icons/oxygen/scalable/actions/vcs_diff.svgz
+share/icons/oxygen/scalable/actions/vcs_remove.svgz
+share/icons/oxygen/scalable/actions/vcs_status.svgz
+share/icons/oxygen/scalable/actions/vcs_update.svgz
+share/kde4/services/ServiceMenus/subversion.desktop
+share/kde4/services/ServiceMenus/subversion_toplevel.desktop
+share/kde4/services/cvsservice.desktop
+share/kde4/services/designerthumbnail.desktop
+share/kde4/services/kateexternaltoolsplugin.desktop
+share/kde4/services/katefilebrowserplugin.desktop
+share/kde4/services/katefiletemplates.desktop
+share/kde4/services/katefindinfilesplugin.desktop
+share/kde4/services/katekonsoleplugin.desktop
+share/kde4/services/katemailfilesplugin.desktop
+share/kde4/services/kateopenheader.desktop
+share/kde4/services/katequickdocumentswitcher.desktop
+share/kde4/services/katesymbolviewer.desktop
+share/kde4/services/katetabbarextension.desktop
+share/kde4/services/katetextfilter.desktop
+share/kde4/services/kded/ksvnd.desktop
+share/kde4/services/komparenavtreepart.desktop
+share/kde4/services/komparepart.desktop
+share/kde4/services/kresources/kcal/bugzilla.desktop
+share/kde4/services/kuiviewer_part.desktop
+share/kde4/services/plasma-applet-katesession.desktop
+share/kde4/services/svn+file.protocol
+share/kde4/services/svn+http.protocol
+share/kde4/services/svn+https.protocol
+share/kde4/services/svn+ssh.protocol
+share/kde4/services/svn.protocol
+share/kde4/servicetypes/kateplugin.desktop
+share/kde4/servicetypes/komparenavigationpart.desktop
+share/kde4/servicetypes/kompareviewpart.desktop
+share/strigi/fieldproperties/strigi_translation.fieldproperties
+ at dirrmtry share/strigi/fieldproperties
+ at dirrmtry share/strigi
+ at dirrmtry share/kde4/servicetypes
+ at dirrmtry share/kde4/services/kresources/kcal
+ at dirrmtry share/kde4/services/kresources
+ at dirrmtry share/kde4/services/kded
+ at dirrmtry share/kde4/services/ServiceMenus
+ at dirrmtry share/kde4/services
+ at dirrmtry share/kde4
+ at dirrmtry share/icons/oxygen/scalable/actions
+ at dirrmtry share/icons/oxygen/scalable
+ at dirrmtry share/icons/oxygen/64x64/actions
+ at dirrmtry share/icons/oxygen/64x64
+ at dirrmtry share/icons/oxygen/48x48/actions
+ at dirrmtry share/icons/oxygen/48x48
+ at dirrmtry share/icons/oxygen/32x32/actions
+ at dirrmtry share/icons/oxygen/32x32
+ at dirrmtry share/icons/oxygen/22x22/actions
+ at dirrmtry share/icons/oxygen/22x22
+ at dirrmtry share/icons/oxygen/16x16/actions
+ at dirrmtry share/icons/oxygen/16x16
+ at dirrmtry share/icons/oxygen/128x128/actions
+ at dirrmtry share/icons/oxygen/128x128
+ at dirrmtry share/icons/oxygen
+ at dirrmtry share/icons/locolor/32x32/actions
+ at dirrmtry share/icons/locolor/32x32
+ at dirrmtry share/icons/locolor/16x16/actions
+ at dirrmtry share/icons/locolor/16x16
+ at dirrmtry share/icons/locolor
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable/actions
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48/actions
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/mimetypes
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32/actions
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22/actions
+ at dirrmtry share/icons/hicolor/22x22
+ at dirrmtry share/icons/hicolor/16x16/mimetypes
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16/actions
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrm share/doc/HTML/en/umbrello
+ at dirrm share/doc/HTML/en/lokalize
+ at dirrm share/doc/HTML/en/kompare
+ at dirrm share/doc/HTML/en/kdesvn-build
+ at dirrm share/doc/HTML/en/kcachegrind
+ at dirrm share/doc/HTML/en/kbugbuster
+ at dirrm share/doc/HTML/en/kate-plugins
+ at dirrm share/doc/HTML/en/kate
+ at dirrm share/doc/HTML/en/kapptemplate
+ at dirrm share/doc/HTML/en/cervisia
+ at dirrmtry share/doc/HTML/en
+ at dirrmtry share/doc/HTML
+ at dirrmtry share/dbus-1/interfaces
+ at dirrmtry share/dbus-1
+ at dirrmtry share/config.kcfg
+ at dirrmtry share/config
+ at dirrm share/apps/umbrello/pics
+ at dirrm share/apps/umbrello/headings
+ at dirrm share/apps/umbrello
+ at dirrm share/apps/lokalize
+ at dirrm share/apps/kuiviewerpart
+ at dirrm share/apps/kuiviewer
+ at dirrm share/apps/kompare
+ at dirrmtry share/apps/kconf_update
+ at dirrm share/apps/kcachegrind/icons/hicolor/32x32/actions
+ at dirrm share/apps/kcachegrind/icons/hicolor/32x32
+ at dirrm share/apps/kcachegrind/icons/hicolor/22x22/actions
+ at dirrm share/apps/kcachegrind/icons/hicolor/22x22
+ at dirrm share/apps/kcachegrind/icons/hicolor/16x16/actions
+ at dirrm share/apps/kcachegrind/icons/hicolor/16x16
+ at dirrm share/apps/kcachegrind/icons/hicolor
+ at dirrm share/apps/kcachegrind/icons
+ at dirrm share/apps/kcachegrind
+ at dirrm share/apps/kbugbuster/pics
+ at dirrm share/apps/kbugbuster
+ at dirrmtry share/apps/katepart/syntax
+ at dirrmtry share/apps/katepart
+ at dirrm share/apps/kate/plugins/katetextfilter
+ at dirrm share/apps/kate/plugins/katetabbarextension
+ at dirrm share/apps/kate/plugins/katesymbolviewer
+ at dirrm share/apps/kate/plugins/katequickdocumentswitcher
+ at dirrm share/apps/kate/plugins/kateopenheader
+ at dirrm share/apps/kate/plugins/katemailfiles
+ at dirrm share/apps/kate/plugins/katekonsole
+ at dirrm share/apps/kate/plugins/katefiletemplates/templates
+ at dirrm share/apps/kate/plugins/katefiletemplates
+ at dirrm share/apps/kate/plugins/kateexternaltools
+ at dirrm share/apps/kate/plugins
+ at dirrm share/apps/kate/pics
+ at dirrm share/apps/kate/icons/oxygen/16x16/actions
+ at dirrm share/apps/kate/icons/oxygen/16x16
+ at dirrm share/apps/kate/icons/oxygen
+ at dirrm share/apps/kate/icons
+ at dirrmtry share/apps/kate
+ at dirrmtry share/apps/kabc/formats
+ at dirrmtry share/apps/kabc
+ at dirrm share/apps/cervisiapart
+ at dirrm share/apps/cervisia
+ at dirrmtry share/apps
+ at dirrmtry share/applications/kde4
+ at dirrmtry share/applications
+ at dirrmtry lib/strigi
+ at dirrmtry lib/kde4
+ at dirrm include/kate
--- /dev/null
+++ devel/kdesdk4/Makefile
@@ -0,0 +1,35 @@
+#
+# $MidnightBSD: mports/devel/kdesdk4/Makefile,v 1.1 2009/01/05 02:33:24 ctriv Exp $
+#
+
+PORTNAME=	kdesdk
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	devel kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	KDE Software Development Kit
+LICENSE=	gpl2
+
+RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash
+LIB_DEPENDS=	svn_client-1.0:${PORTSDIR}/devel/subversion
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_BZIP2=	yes
+KDE4_BUILDENV=	yes
+USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier \
+		automoc4 akonadi
+USE_QT_VER=	4
+QT_COMPONENTS=	network gui moc rcc uic svg qt3support
+
+MAN1=		cervisia.1
+
+CMAKE_ARGS+=	-DBUILD_kapptemplate:BOOL=Off
+
+post-extract:
+	@${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ devel/kdesdk4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdesdk-4.1.3.tar.bz2) = 77787a59f74b1b5ed71b49b8643a75f9
+SHA256 (KDE/kdesdk-4.1.3.tar.bz2) = 0bdf2631d5caba68596d8efa2918fc2b4e55193698856bcd30ec869e3625c095
+SIZE (KDE/kdesdk-4.1.3.tar.bz2) = 4981104

From ctriv at midnightbsd.org  Sun Jan  4 21:34:18 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 21:34:18 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add kdesdk4
Message-ID: <200901050234.n052YIVM010078@stargazer.midnightbsd.org>

Log Message:
-----------
add kdesdk4

Modified Files:
--------------
    mports/devel:
        Makefile (r1.270 -> r1.271)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/Makefile,v
retrieving revision 1.270
retrieving revision 1.271
diff -L devel/Makefile -L devel/Makefile -u -r1.270 -r1.271
--- devel/Makefile
+++ devel/Makefile
@@ -96,6 +96,7 @@
     SUBDIR += imake-6
     SUBDIR += judy
     SUBDIR += kdesdk3
+    SUBDIR += kdesdk4
     SUBDIR += kdevelop
     SUBDIR += libIDL
     SUBDIR += libbonobo

From ctriv at midnightbsd.org  Sun Jan  4 22:37:51 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 22:37:51 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: misc/kdeutils4: Added kdeutils-4.1.3
Message-ID: <200901050337.n053bpLa015909@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdeutils-4.1.3

Added Files:
-----------
    mports/misc/kdeutils4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)
    mports/misc/kdeutils4/files:
        patch-ark_plugins_libzipplugin-zipplugin.cpp (r1.1)

-------------- next part --------------
--- /dev/null
+++ misc/kdeutils4/pkg-descr
@@ -0,0 +1 @@
+KDE provides an integrated X11 based environment, much like CDE.
--- /dev/null
+++ misc/kdeutils4/pkg-plist
@@ -0,0 +1,322 @@
+bin/ark
+bin/kcalc
+bin/kcharselect
+bin/kdessh
+bin/kdf
+bin/kfloppy
+bin/kgpg
+bin/ktimer
+bin/kwalletmanager
+bin/kwikdisk
+bin/okteta
+bin/superkaramba
+bin/sweeper
+lib/kde4/kcm_kdf.so
+lib/kde4/kcm_kwallet.so
+lib/kde4/kerfuffle_bk.so
+lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libzip.so
+lib/kde4/kerfuffle_rar.so
+lib/kde4/libarkpart.so
+lib/kde4/libkbytearrayedit.so
+lib/kde4/liboktetapart.so
+lib/kde4/plasma_package_superkaramba.so
+lib/kde4/plasma_scriptengine_superkaramba.so
+lib/libkdeinit4_kcalc.so
+lib/libkerfuffle.so
+lib/libkerfuffle.so.5
+lib/libkerfuffle.so.5.0.0
+lib/liboktetacore.so
+lib/liboktetacore.so.5
+lib/liboktetacore.so.5.0.0
+lib/liboktetagui.so
+lib/liboktetagui.so.5
+lib/liboktetagui.so.5.0.0
+lib/libsuperkaramba.so
+lib/libsuperkaramba.so.5
+lib/libsuperkaramba.so.5.0.0
+share/applications/kde4/KCharSelect.desktop
+share/applications/kde4/KFloppy.desktop
+share/applications/kde4/ark.desktop
+share/applications/kde4/kcalc.desktop
+share/applications/kde4/kdf.desktop
+share/applications/kde4/kgpg.desktop
+share/applications/kde4/ktimer.desktop
+share/applications/kde4/kwalletmanager-kwalletd.desktop
+share/applications/kde4/kwalletmanager.desktop
+share/applications/kde4/kwikdisk.desktop
+share/applications/kde4/okteta.desktop
+share/applications/kde4/superkaramba.desktop
+share/applications/kde4/sweeper.desktop
+share/apps/ark/ark_part.rc
+share/apps/ark/arkui.rc
+share/apps/kcalc/kcalcui.rc
+share/apps/kcalc/scienceconstants.xml
+share/apps/kcharselect/kcharselectui.rc
+share/apps/kconf_update/kcalcrc.upd
+share/apps/kconf_update/kcharselect.upd
+share/apps/kdf/kdfui.rc
+share/apps/kdf/pics/delete.png
+share/apps/kdf/pics/tick.png
+share/apps/kgpg/icons/oxygen/16x16/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/16x16/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/16x16/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-group.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-orphan.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-pair.png
+share/apps/kgpg/icons/oxygen/16x16/status/key-single.png
+share/apps/kgpg/icons/oxygen/22x22/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/22x22/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/22x22/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/22x22/actions/key-generate-pair.png
+share/apps/kgpg/icons/oxygen/22x22/actions/view-key-secret.png
+share/apps/kgpg/icons/oxygen/22x22/status/key-group.png
+share/apps/kgpg/icons/oxygen/22x22/status/key-pair.png
+share/apps/kgpg/icons/oxygen/22x22/status/key-single.png
+share/apps/kgpg/icons/oxygen/32x32/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/32x32/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/32x32/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/32x32/status/key-group.png
+share/apps/kgpg/icons/oxygen/32x32/status/key-pair.png
+share/apps/kgpg/icons/oxygen/32x32/status/key-single.png
+share/apps/kgpg/icons/oxygen/48x48/actions/document-export-key.png
+share/apps/kgpg/icons/oxygen/48x48/actions/document-import-key.png
+share/apps/kgpg/icons/oxygen/48x48/actions/document-properties-key.png
+share/apps/kgpg/icons/oxygen/48x48/status/key-group.png
+share/apps/kgpg/icons/oxygen/48x48/status/key-pair.png
+share/apps/kgpg/icons/oxygen/48x48/status/key-single.png
+share/apps/kgpg/icons/oxygen/scalable/actions/document-export-key.svgz
+share/apps/kgpg/icons/oxygen/scalable/actions/document-import-key.svgz
+share/apps/kgpg/icons/oxygen/scalable/actions/document-properties-key.svgz
+share/apps/kgpg/icons/oxygen/scalable/status/key-group.svgz
+share/apps/kgpg/icons/oxygen/scalable/status/key-pair.svgz
+share/apps/kgpg/icons/oxygen/scalable/status/key-single.svgz
+share/apps/kgpg/keysmanager.rc
+share/apps/kgpg/kgpg.rc
+share/apps/kgpg/pics/kgpg_anim.gif
+share/apps/kgpg/tips
+share/apps/kwalletmanager/icons/oxygen/22x22/actions/folder_closed.png
+share/apps/kwalletmanager/icons/oxygen/22x22/actions/folder_open.png
+share/apps/kwalletmanager/kwalleteditor.rc
+share/apps/kwalletmanager/kwalletmanager.rc
+share/apps/okteta/oktetaui.rc
+share/apps/oktetapart/oktetapartui.rc
+share/apps/superkaramba/superkarambaui.rc
+share/apps/sweeper/sweeperui.rc
+share/autostart/kgpg.desktop
+share/config.kcfg/ark.kcfg
+share/config.kcfg/kcalc.kcfg
+share/config.kcfg/kgpg.kcfg
+share/config/superkaramba.knsrc
+share/dbus-1/interfaces/org.kde.kgpg.Key.xml
+share/dbus-1/interfaces/org.kde.superkaramba.xml
+share/dbus-1/interfaces/org.kde.sweeper.xml
+share/doc/HTML/en/ark/common
+share/doc/HTML/en/ark/index.cache.bz2
+share/doc/HTML/en/ark/index.docbook
+share/doc/HTML/en/ark/man-ark.1.docbook
+share/doc/HTML/en/kcalc/commands.docbook
+share/doc/HTML/en/kcalc/common
+share/doc/HTML/en/kcalc/index.cache.bz2
+share/doc/HTML/en/kcalc/index.docbook
+share/doc/HTML/en/kcharselect/common
+share/doc/HTML/en/kcharselect/index.cache.bz2
+share/doc/HTML/en/kcharselect/index.docbook
+share/doc/HTML/en/kdf/common
+share/doc/HTML/en/kdf/index.cache.bz2
+share/doc/HTML/en/kdf/index.docbook
+share/doc/HTML/en/kdf/kdf.png
+share/doc/HTML/en/kdf/kdf_config.png
+share/doc/HTML/en/kfloppy/common
+share/doc/HTML/en/kfloppy/index.cache.bz2
+share/doc/HTML/en/kfloppy/index.docbook
+share/doc/HTML/en/kgpg/common
+share/doc/HTML/en/kgpg/editor.png
+share/doc/HTML/en/kgpg/index.cache.bz2
+share/doc/HTML/en/kgpg/index.docbook
+share/doc/HTML/en/kgpg/keygen.png
+share/doc/HTML/en/kgpg/keymanage.png
+share/doc/HTML/en/kgpg/keyprop.png
+share/doc/HTML/en/kgpg/keys.png
+share/doc/HTML/en/kgpg/keyserver.png
+share/doc/HTML/en/kgpg/kicker.png
+share/doc/HTML/en/kgpg/options.png
+share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/index.cache.bz2
+share/doc/HTML/en/ktimer/index.docbook
+share/doc/HTML/en/kwallet/common
+share/doc/HTML/en/kwallet/edit1.png
+share/doc/HTML/en/kwallet/edit2.png
+share/doc/HTML/en/kwallet/edit3.png
+share/doc/HTML/en/kwallet/index.cache.bz2
+share/doc/HTML/en/kwallet/index.docbook
+share/doc/HTML/en/kwallet/kwalletmanager.png
+share/doc/HTML/en/kwallet/ox22-action-wallet_closed.png
+share/doc/HTML/en/kwallet/ox22-action-wallet_open.png
+share/doc/HTML/en/kwallet/password1.png
+share/doc/HTML/en/kwallet/password2.png
+share/doc/HTML/en/okteta/basics.docbook
+share/doc/HTML/en/okteta/common
+share/doc/HTML/en/okteta/credits.docbook
+share/doc/HTML/en/okteta/index.cache.bz2
+share/doc/HTML/en/okteta/index.docbook
+share/doc/HTML/en/okteta/introduction.docbook
+share/doc/HTML/en/okteta/menu.docbook
+share/doc/HTML/en/okteta/tools.docbook
+share/doc/HTML/en/superkaramba/common
+share/doc/HTML/en/superkaramba/index.cache.bz2
+share/doc/HTML/en/superkaramba/index.docbook
+share/icons/hicolor/128x128/apps/kdf.png
+share/icons/hicolor/128x128/apps/kfloppy.png
+share/icons/hicolor/128x128/apps/ktimer.png
+share/icons/hicolor/128x128/apps/kwalletmanager.png
+share/icons/hicolor/128x128/apps/kwalletmanager2.png
+share/icons/hicolor/128x128/apps/kwikdisk.png
+share/icons/hicolor/128x128/apps/superkaramba.png
+share/icons/hicolor/16x16/apps/kcalc.png
+share/icons/hicolor/16x16/apps/kdf.png
+share/icons/hicolor/16x16/apps/kfloppy.png
+share/icons/hicolor/16x16/apps/kgpg.png
+share/icons/hicolor/16x16/apps/ktimer.png
+share/icons/hicolor/16x16/apps/kwalletmanager.png
+share/icons/hicolor/16x16/apps/kwalletmanager2.png
+share/icons/hicolor/16x16/apps/kwikdisk.png
+share/icons/hicolor/16x16/apps/okteta.png
+share/icons/hicolor/16x16/apps/superkaramba.png
+share/icons/hicolor/22x22/apps/kcalc.png
+share/icons/hicolor/22x22/apps/kdf.png
+share/icons/hicolor/22x22/apps/kfloppy.png
+share/icons/hicolor/22x22/apps/kgpg.png
+share/icons/hicolor/22x22/apps/kwalletmanager.png
+share/icons/hicolor/22x22/apps/kwikdisk.png
+share/icons/hicolor/22x22/apps/superkaramba.png
+share/icons/hicolor/32x32/apps/kcalc.png
+share/icons/hicolor/32x32/apps/kdf.png
+share/icons/hicolor/32x32/apps/kfloppy.png
+share/icons/hicolor/32x32/apps/kgpg.png
+share/icons/hicolor/32x32/apps/ktimer.png
+share/icons/hicolor/32x32/apps/kwalletmanager.png
+share/icons/hicolor/32x32/apps/kwalletmanager2.png
+share/icons/hicolor/32x32/apps/kwikdisk.png
+share/icons/hicolor/32x32/apps/okteta.png
+share/icons/hicolor/32x32/apps/superkaramba.png
+share/icons/hicolor/48x48/apps/kcalc.png
+share/icons/hicolor/48x48/apps/kdf.png
+share/icons/hicolor/48x48/apps/kfloppy.png
+share/icons/hicolor/48x48/apps/kgpg.png
+share/icons/hicolor/48x48/apps/ktimer.png
+share/icons/hicolor/48x48/apps/kwalletmanager.png
+share/icons/hicolor/48x48/apps/kwalletmanager2.png
+share/icons/hicolor/48x48/apps/kwikdisk.png
+share/icons/hicolor/48x48/apps/okteta.png
+share/icons/hicolor/48x48/apps/superkaramba.png
+share/icons/hicolor/64x64/apps/kcalc.png
+share/icons/hicolor/64x64/apps/kdf.png
+share/icons/hicolor/64x64/apps/kfloppy.png
+share/icons/hicolor/64x64/apps/kwalletmanager.png
+share/icons/hicolor/64x64/apps/kwalletmanager2.png
+share/icons/hicolor/64x64/apps/kwikdisk.png
+share/icons/hicolor/64x64/apps/superkaramba.png
+share/icons/hicolor/scalable/apps/kcalc.svgz
+share/icons/hicolor/scalable/apps/superkaramba.svgz
+share/icons/oxygen/16x16/apps/kcmdf.png
+share/icons/oxygen/22x22/apps/kcmdf.png
+share/icons/oxygen/32x32/apps/kcmdf.png
+share/kde4/services/ServiceMenus/encryptfile.desktop
+share/kde4/services/ServiceMenus/encryptfolder.desktop
+share/kde4/services/ServiceMenus/floppy_format.desktop
+share/kde4/services/ark_part.desktop
+share/kde4/services/kbytearrayedit.desktop
+share/kde4/services/kcmdf.desktop
+share/kde4/services/kerfuffle_bk.desktop
+share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libzip.desktop
+share/kde4/services/kerfuffle_rar.desktop
+share/kde4/services/kwalletconfig.desktop
+share/kde4/services/kwalletmanager_show.desktop
+share/kde4/services/oktetapart.desktop
+share/kde4/services/plasma-package-superkaramba.desktop
+share/kde4/services/plasma-scriptengine-superkaramba.desktop
+share/kde4/servicetypes/kerfufflePlugin.desktop
+ at dirrmtry share/kde4/servicetypes
+ at dirrmtry share/kde4/services/ServiceMenus
+ at dirrmtry share/kde4/services
+ at dirrmtry share/kde4
+ at dirrmtry share/icons/oxygen/32x32/apps
+ at dirrmtry share/icons/oxygen/32x32
+ at dirrmtry share/icons/oxygen/22x22/apps
+ at dirrmtry share/icons/oxygen/22x22
+ at dirrmtry share/icons/oxygen/16x16/apps
+ at dirrmtry share/icons/oxygen/16x16
+ at dirrmtry share/icons/oxygen
+ at dirrmtry share/icons/hicolor/scalable/apps
+ at dirrmtry share/icons/hicolor/scalable
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrm share/doc/HTML/en/superkaramba
+ at dirrm share/doc/HTML/en/okteta
+ at dirrm share/doc/HTML/en/kwallet
+ at dirrm share/doc/HTML/en/ktimer
+ at dirrm share/doc/HTML/en/kgpg
+ at dirrm share/doc/HTML/en/kfloppy
+ at dirrm share/doc/HTML/en/kdf
+ at dirrm share/doc/HTML/en/kcharselect
+ at dirrm share/doc/HTML/en/kcalc
+ at dirrm share/doc/HTML/en/ark
+ at dirrmtry share/doc/HTML/en
+ at dirrmtry share/doc/HTML
+ at dirrmtry share/dbus-1/interfaces
+ at dirrmtry share/dbus-1
+ at dirrmtry share/config.kcfg
+ at dirrmtry share/config
+ at dirrmtry share/autostart
+ at dirrm share/apps/sweeper
+ at dirrm share/apps/superkaramba
+ at dirrm share/apps/oktetapart
+ at dirrm share/apps/okteta
+ at dirrm share/apps/kwalletmanager/icons/oxygen/22x22/actions
+ at dirrm share/apps/kwalletmanager/icons/oxygen/22x22
+ at dirrm share/apps/kwalletmanager/icons/oxygen
+ at dirrm share/apps/kwalletmanager/icons
+ at dirrm share/apps/kwalletmanager
+ at dirrm share/apps/kgpg/pics
+ at dirrm share/apps/kgpg/icons/oxygen/scalable/status
+ at dirrm share/apps/kgpg/icons/oxygen/scalable/actions
+ at dirrm share/apps/kgpg/icons/oxygen/scalable
+ at dirrm share/apps/kgpg/icons/oxygen/48x48/status
+ at dirrm share/apps/kgpg/icons/oxygen/48x48/actions
+ at dirrm share/apps/kgpg/icons/oxygen/48x48
+ at dirrm share/apps/kgpg/icons/oxygen/32x32/status
+ at dirrm share/apps/kgpg/icons/oxygen/32x32/actions
+ at dirrm share/apps/kgpg/icons/oxygen/32x32
+ at dirrm share/apps/kgpg/icons/oxygen/22x22/status
+ at dirrm share/apps/kgpg/icons/oxygen/22x22/actions
+ at dirrm share/apps/kgpg/icons/oxygen/22x22
+ at dirrm share/apps/kgpg/icons/oxygen/16x16/status
+ at dirrm share/apps/kgpg/icons/oxygen/16x16/actions
+ at dirrm share/apps/kgpg/icons/oxygen/16x16
+ at dirrm share/apps/kgpg/icons/oxygen
+ at dirrm share/apps/kgpg/icons
+ at dirrm share/apps/kgpg
+ at dirrm share/apps/kdf/pics
+ at dirrm share/apps/kdf
+ at dirrmtry share/apps/kconf_update
+ at dirrmtry share/apps/kcharselect
+ at dirrm share/apps/kcalc
+ at dirrm share/apps/ark
+ at dirrmtry share/apps
+ at dirrmtry share/applications/kde4
+ at dirrmtry share/applications
+ at dirrmtry lib/kde4
--- /dev/null
+++ misc/kdeutils4/Makefile
@@ -0,0 +1,33 @@
+#
+# $MidnightBSD: mports/misc/kdeutils4/Makefile,v 1.1 2009/01/05 03:37:49 ctriv Exp $
+#
+
+PORTNAME=	kdeutils
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	misc kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Utilities for the KDE4 integrated X11 Desktop
+LICENSE=	gpl2
+
+LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
+		netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
+		zip.1:${PORTSDIR}/archivers/libzip
+RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_BZIP2=	yes
+USE_QT_VER=	4
+KDE4_BUILDENV= yes
+USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+QT_COMPONENTS=	network gui moc rcc uic porting xml
+
+post-extract:
+	${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ misc/kdeutils4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdeutils-4.1.3.tar.bz2) = 2b0eee36ad16f442c9fae85ac0bfc168
+SHA256 (KDE/kdeutils-4.1.3.tar.bz2) = 7048f02a4b932376cde988d0d2bcbaa2e6673734c8b55a8e2498f95dc4fa595b
+SIZE (KDE/kdeutils-4.1.3.tar.bz2) = 2283868
--- /dev/null
+++ misc/kdeutils4/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
@@ -0,0 +1,13 @@
+--- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-08-30 13:07:45.000000000 +0400
++++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-08-30 13:12:59.000000000 +0400
+@@ -30,8 +30,8 @@
+ //usually compiled with off_t to 32bit. in the long run libzip should be
+ //compiled according to bugs.kde.org bug #167018
+ //but for now this will probably do
+-#define __off_t_defined
+-typedef quint32 off_t;
++// #define __off_t_defined
++// typedef quint32 off_t;
+ 
+ #include "kerfuffle/archiveinterface.h"
+ #include "kerfuffle/archivefactory.h"

From ctriv at midnightbsd.org  Sun Jan  4 22:40:37 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 22:40:37 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: added: kdeutils4.
Message-ID: <200901050340.n053ebPH016338@stargazer.midnightbsd.org>

Log Message:
-----------
added: kdeutils4.

Modified Files:
--------------
    mports/misc:
        Makefile (r1.54 -> r1.55)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/misc/Makefile,v
retrieving revision 1.54
retrieving revision 1.55
diff -L misc/Makefile -L misc/Makefile -u -r1.54 -r1.55
--- misc/Makefile
+++ misc/Makefile
@@ -32,6 +32,7 @@
     SUBDIR += kdehier
     SUBDIR += kdehier4
     SUBDIR += kdeutils3
+    SUBDIR += kdeutils4
     SUBDIR += koffice-i18n-af
     SUBDIR += koffice-i18n-bg
     SUBDIR += koffice-i18n-br

From ctriv at midnightbsd.org  Sun Jan  4 22:40:49 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 22:40:49 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: mporter: fix a few bugs with syncdir.
Message-ID: <200901050340.n053encl016381@stargazer.midnightbsd.org>

Log Message:
-----------
fix a few bugs with syncdir.

Modified Files:
--------------
    mports/Tools/scripts:
        mporter (r1.2 -> r1.3)

-------------- next part --------------
Index: mporter
===================================================================
RCS file: /home/cvs/mports/Tools/scripts/mporter,v
retrieving revision 1.2
retrieving revision 1.3
diff -L Tools/scripts/mporter -L Tools/scripts/mporter -u -r1.2 -r1.3
--- Tools/scripts/mporter
+++ Tools/scripts/mporter
@@ -252,14 +252,16 @@
 		}
 		
 		
-		if (m/SUBDIR\s*\+?=\s*([\.\w+-]+)/) {
+		my $linere = qr/SUBDIR\s*\+?=\s*(\S+)/;
+		
+		if (m/$linere/) {
 			push(@{$self->{subdirs}}, $1);
 		} else {
 			die "Couldn't match first subdir.";
 		}
 		
 		while (<$fh>) {
-			last unless m/SUBDIR\s*\+?=\s*([\.\w-]+)/;
+			last unless m/$linere/;
 			push(@{$self->{subdirs}}, $1);
 		}
 		

From ctriv at midnightbsd.org  Sun Jan  4 23:01:40 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 23:01:40 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: www/kdewebdev4: Added kdewebdev-4.1.3
Message-ID: <200901050401.n0541eM6018241@stargazer.midnightbsd.org>

Log Message:
-----------
Added kdewebdev-4.1.3

Added Files:
-----------
    mports/www/kdewebdev4:
        Makefile (r1.1)
        distinfo (r1.1)
        pkg-descr (r1.1)
        pkg-plist (r1.1)

-------------- next part --------------
--- /dev/null
+++ www/kdewebdev4/pkg-descr
@@ -0,0 +1,3 @@
+The KDE web developer's environment.
+
+WWW: http://www.kde.org/
--- /dev/null
+++ www/kdewebdev4/pkg-plist
@@ -0,0 +1,280 @@
+bin/kfilereplace
+bin/kimagemapeditor
+bin/klinkstatus
+bin/kommander
+bin/kxsldbg
+bin/xsldbg
+include/kommandercore_export.h
+include/kommanderplugin.h
+include/kommanderwidget.h
+include/specials.h
+lib/kde4/automationklinkstatus.so
+lib/kde4/klinkstatuspart.so
+lib/kde4/krossmoduleklinkstatus.so
+lib/kde4/libkfilereplacepart.so
+lib/kde4/libkimagemapeditor.so
+lib/kde4/libkxsldbgpart.so
+lib/libklinkstatuscommon.so
+lib/libklinkstatuscommon.so.4
+lib/libklinkstatuscommon.so.4.0.0
+lib/libkommandercore.so
+lib/libkommandercore.so.4
+lib/libkommandercore.so.4.2.0
+lib/libkommanderwidgets.so
+lib/libkommanderwidgets.so.4
+lib/libkommanderwidgets.so.4.2.0
+share/applications/kde4/kfilereplace.desktop
+share/applications/kde4/kimagemapeditor.desktop
+share/applications/kde4/klinkstatus.desktop
+share/applications/kde4/kxsldbg.desktop
+share/applnk/.hidden/kommander.desktop
+share/apps/kfilereplace/kfilereplaceui.rc
+share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/backup_option.png
+share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/casesensitive_option.png
+share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/command_option.png
+share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/filesimulate.png
+share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/invert.png
+share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/recursive_option.png
+share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions/regularexpression_option.png
+share/apps/kfilereplacepart/kfilereplacepartui.rc
+share/apps/kimagemapeditor/addpointcursor.png
+share/apps/kimagemapeditor/freehandcursor.png
+share/apps/kimagemapeditor/kimagemapeditorpartui.rc
+share/apps/kimagemapeditor/kimagemapeditorui.rc
+share/apps/kimagemapeditor/polygoncursor.png
+share/apps/kimagemapeditor/removepointcursor.png
+share/apps/klinkstatus/klinkstatus_shell.rc
+share/apps/klinkstatus/scripts/scripts.rc
+share/apps/klinkstatus/styles/results_stylesheet.xsl
+share/apps/klinkstatuspart/klinkstatus_part.rc
+share/apps/klinkstatuspart/kpartplugins/klinkstatus_automation.rc
+share/apps/klinkstatuspart/kpartplugins/scripting.rc
+share/apps/klinkstatuspart/pics/304.png
+share/apps/kxsldbg/empty.xml
+share/apps/kxsldbg/empty.xsl
+share/apps/kxsldbg/kxsldbg_shell.rc
+share/apps/kxsldbg/test1.xml
+share/apps/kxsldbg/test2.xml
+share/apps/kxsldbg/test3.xml
+share/apps/kxsldbg/test4.xml
+share/apps/kxsldbg/test_import.xsl
+share/apps/kxsldbg/test_include_bot.xsl
+share/apps/kxsldbg/test_include_top.xsl
+share/apps/kxsldbg/testdoc.dtd
+share/apps/kxsldbg/testdoc.xml
+share/apps/kxsldbg/testdoc.xsl
+share/apps/kxsldbgpart/kxsldbg_part.rc
+share/apps/xsldbg/empty.xml
+share/apps/xsldbg/empty.xsl
+share/apps/xsldbg/test1.xml
+share/apps/xsldbg/test2.xml
+share/apps/xsldbg/test3.xml
+share/apps/xsldbg/test4.xml
+share/apps/xsldbg/test_import.xsl
+share/apps/xsldbg/test_include_bot.xsl
+share/apps/xsldbg/test_include_top.xsl
+share/apps/xsldbg/testdoc.dtd
+share/apps/xsldbg/testdoc.xml
+share/apps/xsldbg/testdoc.xsl
+share/config/klinkstatus.knsrc
+share/dbus-1/interfaces/org.kde.kdewebdev.klinkstatus.SearchManager.xml
+share/dbus-1/interfaces/org.kde.kfilereplace.xml
+share/dbus-1/interfaces/org.kde.kxsldbg.kxsldbg.xml
+share/doc/HTML/en/kfilereplace/addstringsdialog_window.png
+share/doc/HTML/en/kfilereplace/backup_option.png
+share/doc/HTML/en/kfilereplace/casesensitive_option.png
+share/doc/HTML/en/kfilereplace/command_option.png
+share/doc/HTML/en/kfilereplace/common
+share/doc/HTML/en/kfilereplace/edit.png
+share/doc/HTML/en/kfilereplace/edit_add.png
+share/doc/HTML/en/kfilereplace/edit_remove.png
+share/doc/HTML/en/kfilereplace/eraser.png
+share/doc/HTML/en/kfilereplace/filereplace.png
+share/doc/HTML/en/kfilereplace/filesearch.png
+share/doc/HTML/en/kfilereplace/filesimulate.png
+share/doc/HTML/en/kfilereplace/index.cache.bz2
+share/doc/HTML/en/kfilereplace/index.docbook
+share/doc/HTML/en/kfilereplace/invert.png
+share/doc/HTML/en/kfilereplace/kfr_standalone_main_window_1.png
+share/doc/HTML/en/kfilereplace/optionsdialog_main_window_1.png
+share/doc/HTML/en/kfilereplace/optionsdialog_main_window_2.png
+share/doc/HTML/en/kfilereplace/project.png
+share/doc/HTML/en/kfilereplace/projectdialog_main_window_1.png
+share/doc/HTML/en/kfilereplace/projectdialog_main_window_2.png
+share/doc/HTML/en/kfilereplace/recursive_option.png
+share/doc/HTML/en/kfilereplace/regularexpression_option.png
+share/doc/HTML/en/kfilereplace/report_example.png
+share/doc/HTML/en/kfilereplace/results_view.png
+share/doc/HTML/en/kfilereplace/stop.png
+share/doc/HTML/en/kfilereplace/strings_view.png
+share/doc/HTML/en/kfilereplace/toolbar.png
+share/doc/HTML/en/kfilereplace/unsortedList.png
+share/doc/HTML/en/kimagemapeditor/common
+share/doc/HTML/en/kimagemapeditor/index.cache.bz2
+share/doc/HTML/en/kimagemapeditor/index.docbook
+share/doc/HTML/en/klinkstatus/common
+share/doc/HTML/en/klinkstatus/index.cache.bz2
+share/doc/HTML/en/klinkstatus/index.docbook
+share/doc/HTML/en/klinkstatus/screenshot.png
+share/doc/HTML/en/kxsldbg/1downarrow.png
+share/doc/HTML/en/kxsldbg/breakpoints_window.png
+share/doc/HTML/en/kxsldbg/callstack.docbook
+share/doc/HTML/en/kxsldbg/callstack_window.png
+share/doc/HTML/en/kxsldbg/common
+share/doc/HTML/en/kxsldbg/configure.png
+share/doc/HTML/en/kxsldbg/configure_window.png
+share/doc/HTML/en/kxsldbg/credits.docbook
+share/doc/HTML/en/kxsldbg/entities.docbook
+share/doc/HTML/en/kxsldbg/entities_window.png
+share/doc/HTML/en/kxsldbg/exit.png
+share/doc/HTML/en/kxsldbg/glossary.docbook
+share/doc/HTML/en/kxsldbg/index.cache.bz2
+share/doc/HTML/en/kxsldbg/index.docbook
+share/doc/HTML/en/kxsldbg/kxsldbg_configure.docbook
+share/doc/HTML/en/kxsldbg/kxsldbg_inspector.docbook
+share/doc/HTML/en/kxsldbg/kxsldbg_mainwindow.docbook
+share/doc/HTML/en/kxsldbg/kxsldbg_tools.docbook
+share/doc/HTML/en/kxsldbg/main_window.png
+share/doc/HTML/en/kxsldbg/next.png
+share/doc/HTML/en/kxsldbg/publicid_window.png
+share/doc/HTML/en/kxsldbg/run.png
+share/doc/HTML/en/kxsldbg/sources.docbook
+share/doc/HTML/en/kxsldbg/sources_window.png
+share/doc/HTML/en/kxsldbg/step.png
+share/doc/HTML/en/kxsldbg/systemid_window.png
+share/doc/HTML/en/kxsldbg/templates.docbook
+share/doc/HTML/en/kxsldbg/templates_window.png
+share/doc/HTML/en/kxsldbg/variables.docbook
+share/doc/HTML/en/kxsldbg/variables_window.png
+share/doc/HTML/en/kxsldbg/walk_window.png
+share/doc/HTML/en/kxsldbg/xsldbg_break.png
+share/doc/HTML/en/kxsldbg/xsldbg_data.png
+share/doc/HTML/en/kxsldbg/xsldbg_delete.png
+share/doc/HTML/en/kxsldbg/xsldbg_enable.png
+share/doc/HTML/en/kxsldbg/xsldbg_output.png
+share/doc/HTML/en/kxsldbg/xsldbg_refresh.png
+share/doc/HTML/en/kxsldbg/xsldbg_source.png
+share/doc/HTML/en/kxsldbg/xsldbg_stepdown.png
+share/doc/HTML/en/kxsldbg/xsldbg_stepup.png
+share/doc/HTML/en/xsldbg/commands.docbook
+share/doc/HTML/en/xsldbg/common
+share/doc/HTML/en/xsldbg/credits.docbook
+share/doc/HTML/en/xsldbg/index.cache.bz2
+share/doc/HTML/en/xsldbg/index.docbook
+share/doc/HTML/en/xsldbg/introduction.docbook
+share/doc/HTML/en/xsldbg/man-xsldbg.1.docbook
+share/doc/HTML/en/xsldbg/usage.docbook
+share/doc/HTML/en/xsldbg/xsldbghelp.xml
+share/doc/HTML/en/xsldbg/xsldbghelp.xsl
+share/icons/hicolor/128x128/apps/klinkstatus.png
+share/icons/hicolor/16x16/actions/1downarrow.png
+share/icons/hicolor/16x16/actions/configure.png
+share/icons/hicolor/16x16/actions/exit.png
+share/icons/hicolor/16x16/actions/hash.png
+share/icons/hicolor/16x16/actions/mark.png
+share/icons/hicolor/16x16/actions/next.png
+share/icons/hicolor/16x16/actions/run.png
+share/icons/hicolor/16x16/actions/step.png
+share/icons/hicolor/16x16/actions/xsldbg_break.png
+share/icons/hicolor/16x16/actions/xsldbg_data.png
+share/icons/hicolor/16x16/actions/xsldbg_delete.png
+share/icons/hicolor/16x16/actions/xsldbg_enable.png
+share/icons/hicolor/16x16/actions/xsldbg_output.png
+share/icons/hicolor/16x16/actions/xsldbg_refresh.png
+share/icons/hicolor/16x16/actions/xsldbg_source.png
+share/icons/hicolor/16x16/actions/xsldbg_stepdown.png
+share/icons/hicolor/16x16/actions/xsldbg_stepup.png
+share/icons/hicolor/16x16/apps/kimagemapeditor.png
+share/icons/hicolor/16x16/apps/klinkstatus.png
+share/icons/hicolor/16x16/apps/kxsldbg.png
+share/icons/hicolor/22x22/actions/1downarrow.png
+share/icons/hicolor/22x22/actions/addpoint.png
+share/icons/hicolor/22x22/actions/arrow.png
+share/icons/hicolor/22x22/actions/circle.png
+share/icons/hicolor/22x22/actions/circle2.png
+share/icons/hicolor/22x22/actions/configure.png
+share/icons/hicolor/22x22/actions/exit.png
+share/icons/hicolor/22x22/actions/freehand.png
+share/icons/hicolor/22x22/actions/lower.png
+share/icons/hicolor/22x22/actions/next.png
+share/icons/hicolor/22x22/actions/polygon.png
+share/icons/hicolor/22x22/actions/raise.png
+share/icons/hicolor/22x22/actions/rectangle.png
+share/icons/hicolor/22x22/actions/removepoint.png
+share/icons/hicolor/22x22/actions/run.png
+share/icons/hicolor/22x22/actions/step.png
+share/icons/hicolor/22x22/actions/xsldbg_break.png
+share/icons/hicolor/22x22/actions/xsldbg_data.png
+share/icons/hicolor/22x22/actions/xsldbg_delete.png
+share/icons/hicolor/22x22/actions/xsldbg_enable.png
+share/icons/hicolor/22x22/actions/xsldbg_output.png
+share/icons/hicolor/22x22/actions/xsldbg_refresh.png
+share/icons/hicolor/22x22/actions/xsldbg_source.png
+share/icons/hicolor/22x22/actions/xsldbg_stepdown.png
+share/icons/hicolor/22x22/actions/xsldbg_stepup.png
+share/icons/hicolor/22x22/apps/kfilereplace.png
+share/icons/hicolor/22x22/apps/klinkstatus.png
+share/icons/hicolor/32x32/apps/kfilereplace.png
+share/icons/hicolor/32x32/apps/kimagemapeditor.png
+share/icons/hicolor/32x32/apps/klinkstatus.png
+share/icons/hicolor/32x32/apps/kxsldbg.png
+share/icons/hicolor/48x48/apps/kfilereplace.png
+share/icons/hicolor/48x48/apps/kimagemapeditor.png
+share/icons/hicolor/48x48/apps/klinkstatus.png
+share/icons/hicolor/64x64/apps/klinkstatus.png
+share/kde4/services/kfilereplacepart.desktop
+share/kde4/services/kimagemapeditorpart.desktop
+share/kde4/services/klinkstatus_automation.desktop
+share/kde4/services/klinkstatus_part.desktop
+share/kde4/services/krossmoduleklinkstatus.desktop
+share/kde4/services/kxsldbg_part.desktop
+ at dirrmtry share/kde4/services
+ at dirrmtry share/kde4
+ at dirrmtry share/icons/hicolor/64x64/apps
+ at dirrmtry share/icons/hicolor/64x64
+ at dirrmtry share/icons/hicolor/48x48/apps
+ at dirrmtry share/icons/hicolor/48x48
+ at dirrmtry share/icons/hicolor/32x32/apps
+ at dirrmtry share/icons/hicolor/32x32
+ at dirrmtry share/icons/hicolor/22x22/apps
+ at dirrmtry share/icons/hicolor/22x22/actions
+ at dirrmtry share/icons/hicolor/22x22
+ at dirrmtry share/icons/hicolor/16x16/apps
+ at dirrmtry share/icons/hicolor/16x16/actions
+ at dirrmtry share/icons/hicolor/16x16
+ at dirrmtry share/icons/hicolor/128x128/apps
+ at dirrmtry share/icons/hicolor/128x128
+ at dirrmtry share/icons/hicolor
+ at dirrmtry share/icons
+ at dirrm share/doc/HTML/en/xsldbg
+ at dirrm share/doc/HTML/en/kxsldbg
+ at dirrm share/doc/HTML/en/klinkstatus
+ at dirrm share/doc/HTML/en/kimagemapeditor
+ at dirrm share/doc/HTML/en/kfilereplace
+ at dirrmtry share/doc/HTML/en
+ at dirrmtry share/doc/HTML
+ at dirrmtry share/dbus-1/interfaces
+ at dirrmtry share/dbus-1
+ at dirrmtry share/config
+ at dirrm share/apps/xsldbg
+ at dirrm share/apps/kxsldbgpart
+ at dirrm share/apps/kxsldbg
+ at dirrm share/apps/klinkstatuspart/pics
+ at dirrm share/apps/klinkstatuspart/kpartplugins
+ at dirrm share/apps/klinkstatuspart
+ at dirrm share/apps/klinkstatus/styles
+ at dirrm share/apps/klinkstatus/scripts
+ at dirrm share/apps/klinkstatus
+ at dirrm share/apps/kimagemapeditor
+ at dirrm share/apps/kfilereplacepart/icons/crystalsvg/22x22/actions
+ at dirrm share/apps/kfilereplacepart/icons/crystalsvg/22x22
+ at dirrm share/apps/kfilereplacepart/icons/crystalsvg
+ at dirrm share/apps/kfilereplacepart/icons
+ at dirrm share/apps/kfilereplacepart
+ at dirrm share/apps/kfilereplace
+ at dirrmtry share/apps
+ at dirrmtry share/applnk/.hidden
+ at dirrmtry share/applnk
+ at dirrmtry share/applications/kde4
+ at dirrmtry share/applications
+ at dirrmtry lib/kde4
--- /dev/null
+++ www/kdewebdev4/Makefile
@@ -0,0 +1,33 @@
+#
+# $MidnightBSD: mports/www/kdewebdev4/Makefile,v 1.1 2009/01/05 04:01:39 ctriv Exp $
+#
+
+PORTNAME=	kdewebdev
+PORTVERSION=	${KDE4_VERSION}
+CATEGORIES=	www kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+DIST_SUBDIR=	KDE
+
+MAINTAINER=	ports at MidnightBSD.org
+COMMENT=	Comprehensive html/website development environment
+LICENSE=	gpl2
+
+BUILD_DEPENDS=	xgettext:${PORTSDIR}/devel/gettext
+LIB_DEPENDS=	antlr.5:${PORTSDIR}/devel/kdesdk4 \
+		tidy-0.99.0:${PORTSDIR}/www/tidy-lib
+
+LATEST_LINK=	${PORTNAME}4
+
+USE_BZIP2=	yes
+USE_QT_VER=	4
+USE_KDE4=	kdelibs kdeprefix kdehier automoc4
+KDE4_BUILDENV=	yes
+QT_COMPONENTS=	opengl gui moc rcc uic
+
+MAN1=		xsldbg.1
+
+post-extract:
+	@${MKDIR} ${WRKSRC}
+
+.include 
--- /dev/null
+++ www/kdewebdev4/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/kdewebdev-4.1.3.tar.bz2) = 9c283ffce644a8dfa8868b237ad92435
+SHA256 (KDE/kdewebdev-4.1.3.tar.bz2) = 78a907c59974a7d89917f5af3d507e67883405be94a6df651f78020b25e18fec
+SIZE (KDE/kdewebdev-4.1.3.tar.bz2) = 2516675

From ctriv at midnightbsd.org  Sun Jan  4 23:02:41 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 23:02:41 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: Makefile: add kdewebdev4
Message-ID: <200901050402.n0542fTF018343@stargazer.midnightbsd.org>

Log Message:
-----------
add kdewebdev4

Modified Files:
--------------
    mports/www:
        Makefile (r1.87 -> r1.88)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/www/Makefile,v
retrieving revision 1.87
retrieving revision 1.88
diff -L www/Makefile -L www/Makefile -u -r1.87 -r1.88
--- www/Makefile
+++ www/Makefile
@@ -3,9 +3,9 @@
 
     COMMENT = Ports related to the World Wide Web
 
+    SUBDIR += analog
     SUBDIR += apache20
     SUBDIR += apache22
-    SUBDIR += analog
     SUBDIR += aria2
     SUBDIR += awstats
     SUBDIR += bluefish
@@ -31,6 +31,7 @@
     SUBDIR += google-sitemapgen
     SUBDIR += gtkhtml3
     SUBDIR += kdewebdev
+    SUBDIR += kdewebdev4
     SUBDIR += libgtkhtml
     SUBDIR += libwww
     SUBDIR += lighttpd
@@ -51,8 +52,10 @@
     SUBDIR += man2web
     SUBDIR += mediawiki
     SUBDIR += midori
+    SUBDIR += mod_fastcgi
     SUBDIR += mod_perl2
     SUBDIR += moinmoin
+    SUBDIR += mozilla
     SUBDIR += nanoblogger
     SUBDIR += neon
     SUBDIR += neon26
@@ -92,10 +95,10 @@
     SUBDIR += tidy-lib
     SUBDIR += tomcat55
     SUBDIR += tomcat6
-    SUBDIR += youtube_dl
     SUBDIR += validator
     SUBDIR += webkit-gtk2
     SUBDIR += weblint
     SUBDIR += webserver
+    SUBDIR += youtube_dl
 
 .include 

From laffer1 at midnightbsd.org  Sun Jan  4 23:11:08 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 23:11:08 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: mports/devel: The evil pear is back.
Message-ID: <200901050411.n054B8O2019289@stargazer.midnightbsd.org>

Log Message:
-----------
The evil pear is back.  Do not even attempt to add pear ports.  This is only for command line usage directly. pear install and so on.

Sorry ctriv@

Modified Files:
--------------
    mports/devel:
        Makefile (r1.271 -> r1.272)

Added Files:
-----------
    mports/devel/pear:
        Makefile (r1.4)
        bsd.pear.mk (r1.3)
        distinfo (r1.3)
        pear-deinstall (r1.3)
        pear-install (r1.3)
        pkg-descr (r1.3)
        pkg-plist (r1.3)
    mports/devel/pear/files:
        patch-go-pear (r1.3)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/devel/Makefile,v
retrieving revision 1.271
retrieving revision 1.272
diff -L devel/Makefile -L devel/Makefile -u -r1.271 -r1.272
--- devel/Makefile
+++ devel/Makefile
@@ -241,6 +241,7 @@
     SUBDIR += pcre
     SUBDIR += pcre-utf8
     SUBDIR += pcsc-lite
+    SUBDIR += pear
     SUBDIR += pecl-json
     SUBDIR += performance
     SUBDIR += perltidy

From laffer1 at midnightbsd.org  Sun Jan  4 23:24:03 2009
From: laffer1 at midnightbsd.org (laffer1 at midnightbsd.org)
Date: Sun, 4 Jan 2009 23:24:03 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: lang/pcc: update pcc version
Message-ID: <200901050424.n054O3iY020340@stargazer.midnightbsd.org>

Log Message:
-----------
update pcc version

Modified Files:
--------------
    mports/lang/pcc:
        Makefile (r1.2 -> r1.3)
        distinfo (r1.2 -> r1.3)
    mports/lang/pcc/files:
        patch-cccc-Makefile.in (r1.1 -> r1.2)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/lang/pcc/Makefile,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lang/pcc/Makefile -L lang/pcc/Makefile -u -r1.2 -r1.3
--- lang/pcc/Makefile
+++ lang/pcc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	pcc
-DATESPEC=	080613
+DATESPEC=	081227
 PORTVERSION=	0.9.9.${DATESPEC}
 PORTREVISION?=	0
 CATEGORIES=	lang
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/lang/pcc/distinfo,v
retrieving revision 1.2
retrieving revision 1.3
diff -L lang/pcc/distinfo -L lang/pcc/distinfo -u -r1.2 -r1.3
--- lang/pcc/distinfo
+++ lang/pcc/distinfo
@@ -1,3 +1,3 @@
-MD5 (pcc-080613.tgz) = 55f305f39c1c666ee057c97790a41518
-SHA256 (pcc-080613.tgz) = 11c34e1f199b60d4ae25009105a07ff50e33f5a0760053a93520e55829fd4809
-SIZE (pcc-080613.tgz) = 526056
+MD5 (pcc-081227.tgz) = 93393dec36caa7dc2f4ec22e2c1a9f76
+SHA256 (pcc-081227.tgz) = 9fe643c2979482a565e9430019a74596df4a893e977327cb9a8fb9faeecb2cd9
+SIZE (pcc-081227.tgz) = 604716
Index: patch-cccc-Makefile.in
===================================================================
RCS file: /home/cvs/mports/lang/pcc/files/patch-cccc-Makefile.in,v
retrieving revision 1.1
retrieving revision 1.2
diff -L lang/pcc/files/patch-cccc-Makefile.in -L lang/pcc/files/patch-cccc-Makefile.in -u -r1.1 -r1.2
--- lang/pcc/files/patch-cccc-Makefile.in
+++ lang/pcc/files/patch-cccc-Makefile.in
@@ -1,14 +1,13 @@
---- cc/cc/Makefile.in.orig	2008-05-19 22:38:04.000000000 -0700
-+++ cc/cc/Makefile.in	2008-06-16 07:49:59.000000000 -0700
-@@ -53,8 +53,9 @@ install:
+Index: cc/cc/Makefile.in
+@@ -59,8 +59,9 @@
  	fi
  	test -z "${DESTDIR}$(mandir)/man1" || mkdir -p "${DESTDIR}$(mandir)/man1"
- 	${INSTALL} cc.1 ${DESTDIR}${mandir}/man1/${DEST}.1
--	test -z "$(PCCINCDIR)" || mkdir -p "$(PCCINCDIR)"
--	test -z "$(PCCLIBDIR)" || mkdir -p "$(PCCLIBDIR)"
+ 	${INSTALL} $(srcdir)/cc.1 ${DESTDIR}${mandir}/man1/${DEST}.1
+-	test -z "${DESTDIR}$(PCCINCDIR)" || mkdir -p "${DESTDIR}$(PCCINCDIR)"
+-	test -z "${DESTDIR}$(PCCLIBDIR)" || mkdir -p "${DESTDIR}$(PCCLIBDIR)"
 +	# Don't make unused empty directories for no reason.
-+	#test -z "$(PCCINCDIR)" || mkdir -p "$(PCCINCDIR)"
-+	#test -z "$(PCCLIBDIR)" || mkdir -p "$(PCCLIBDIR)"
++	#test -z "${DESTDIR}$(PCCINCDIR)" || mkdir -p "${DESTDIR}$(PCCINCDIR)"
++	#test -z "${DESTDIR}$(PCCLIBDIR)" || mkdir -p "${DESTDIR}$(PCCLIBDIR)"
  
  clean:
  	/bin/rm -f  $(OBJS) ${DEST}

From ctriv at midnightbsd.org  Sun Jan  4 23:58:57 2009
From: ctriv at midnightbsd.org (ctriv at midnightbsd.org)
Date: Sun, 4 Jan 2009 23:58:57 -0500 (EST)
Subject: [Midnightbsd-cvs] mports: bsd.ggz.mk: add bsd.ggz.mk,
	this may move to extensions if it is
Message-ID: <200901050458.n054wvwL023463@stargazer.midnightbsd.org>

Log Message:
-----------
add bsd.ggz.mk, this may move to extensions if it is used by more ports.

Added Files:
-----------
    mports/games/libggz:
        bsd.ggz.mk (r1.1)

-------------- next part --------------
--- /dev/null
+++ games/libggz/bsd.ggz.mk
@@ -0,0 +1,29 @@
+# $FreeBSD: ports/games/libggz/bsd.ggz.mk,v 1.2 2008/03/14 06:45:55 rafan Exp $
+
+# common settings
+
+GGZ_VERSION=	0.0.14.1
+
+MASTER_SITES=	\
+	http://mirrors.dotsrc.org/ggzgamingzone/ggz/%SUBDIR%/ \
+	http://ftp.ggzgamingzone.org/pub/ggz/%SUBDIR%/
+MASTER_SITE_SUBDIR=	${PORTVERSION}
+DIST_SUBDIR=	ggz
+
+# components section
+
+_USE_GGZ_ALL=	core client
+
+core_LIB_DEPENDS=	ggz.5:${PORTSDIR}/games/libggz
+
+client_LIB_DEPENDS=	ggzcore.9:${PORTSDIR}/games/ggz-client-libs
+
+.for component in ${USE_GGZ}
+LIB_DEPENDS+=	${${component}_LIB_DEPENDS}
+. endfor
+
+.for component in ${USE_GGZ}
+. if ${_USE_GGZ_ALL:M${component}}==""
+IGNORE=	cannot install: Unknown component ${component}
+. endif
+.endfor



KDE 3.5.8

GNUstep 2.0.1

SeaMonkey 1.1.7

SeaMonkey 1.1.12

Pidgin 2.3.1

Pidgin 2.5.1

GNOME 3.5.8

GNOME 2.22.0

Étoilé 0.2

Étoilé 0.2.1

GIMP 2.4.3

GIMP 2.4.5

AbiWord 2.4.6

xine 1.1.8

xine 1.1.15

Security Updates

December 31, 2008

November 24, 2008

Security »

Featured Ports »

Featured Ports

Xfce 4.4.2

KDE 3.5.8

xine 1.1.15

Xfce 4.4.2

GNUstep 2.0.1

GNUstep 1.16.3

AbiWord 2.4.6

AbiWord 2.6.4

Xfce 4.4.2