Commit Graph

31 Commits

Author SHA1 Message Date
Ade Lovett
3f651573ad Whoa there, boy, that's a mighty big commit y'all have there...
Begin autotools sanitization sequence by requiring ports to explicitly
specify which version of {libtool,autoconf,automake} they need, erasing
the concept of a "system default".

For ports-in-waiting:

	USE_LIBTOOL=YES		->	USE_LIBTOOL_VER=13
	USE_AUTOCONF=YES	->	USE_AUTOCONF_VER=213
	USE_AUTOMAKE=YES	->	USE_AUTOMAKE_VER=14

Ports attempting to use the old style system after June 1st 2004 will be
sorely disappointed.
2004-03-14 06:17:56 +00:00
Trevor Johnson
a4fcaafc30 Only one of the Linuxberg sites (as it happens, the Brazilian one)
has the original distfile.  A slightly different distfile is available
from Sunsite:

diff -burN linuxberg/include/make/jx_config_common sunsite/include/make/jx_config_common
--- linuxberg/include/make/jx_config_common	Sat Sep 25 19:25:40 1999
+++ sunsite/include/make/jx_config_common	Wed Sep  1 02:18:53 1999
@@ -7,14 +7,14 @@

 ifeq ($(findstring g++,$(CXX)),g++)
   ifeq ($(CXX),g++)
-    JX_HAS_GNUG_PRE_2_8 := $(shell \
-        if { $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; } \
-        then { echo 1; } \
-        else { echo 0; } fi)
-    JX_HAS_GNUG_2_95 := $(shell \
-        if { $(CXX) --version | egrep '^(cygnus-)?2\.95' > /dev/null; } \
-        then { echo 1; } \
-        else { echo 0; } fi)
+    JX_HAS_GNUG_PRE_2_8 := \
+      $(shell \
+        if $(CXX) --version | egrep '^(cygnus-)?2\.[0-7]' > /dev/null; then \
+        echo 1; else echo 0; fi)
+    JX_HAS_GNUG_2_95 := \
+      $(shell \
+        if $(CXX) --version | egrep '^(cygnus-)?2\.95' > /dev/null; then \
+        echo 1; else echo 0; fi)
   else  # ! g++
   ifeq (eg++,$(findstring eg++,$(CXX)))
     # Assume that eg++ is egcs.
diff -burN linuxberg/include/make/jx_constants sunsite/include/make/jx_constants
--- linuxberg/include/make/jx_constants	Sat Sep 25 19:25:30 1999
+++ sunsite/include/make/jx_constants	Tue Sep 21 20:31:57 1999
@@ -23,9 +23,9 @@

 ifdef JX_INSTALL_ROOT
   override JX_INSTALL_ROOT := \
-    ${shell if { test -d ${JX_INSTALL_ROOT} -a -w ${JX_INSTALL_ROOT}; } \
-            then { echo ${JX_INSTALL_ROOT}; } \
-            else { echo; } fi }
+    ${shell if { test -d ${JX_INSTALL_ROOT} -a -w ${JX_INSTALL_ROOT} } \
+            then { echo ${JX_INSTALL_ROOT} } \
+            else { echo } fi; }
 endif

 ifndef JX_INSTALL_ROOT
@@ -33,10 +33,10 @@
     override JX_INSTALL_ROOT := ${JX_ROOT_BIN_DIRECTORY}
   else
     override JX_INSTALL_ROOT := \
-      ${shell if { test -d ${HOME}/bin -a -w ${HOME}/bin; } \
-              then { echo ${HOME}/bin; } \
+      ${shell if { test -d ${HOME}/bin -a -w ${HOME}/bin } \
+              then { echo ${HOME}/bin } \
               else { test -d ${JX_ROOT}/bin || mkdir ${JX_ROOT}/bin; \
-                     echo ${JX_ROOT}/bin; } fi }
+                     echo ${JX_ROOT}/bin } fi; }
   endif
 endif

diff -burN linuxberg/libjx/code/jXUtil.cc sunsite/libjx/code/jXUtil.cc
--- linuxberg/libjx/code/jXUtil.cc	Mon Sep 27 20:59:37 1999
+++ sunsite/libjx/code/jXUtil.cc	Thu Aug 26 20:22:57 1999
@@ -392,7 +392,7 @@
 	for (JIndex i=newCount; i>origCount; i--)
 		{
 		const JString* url = fileNameList->NthElement(i);
-		if (url->IsEmpty() || url->GetFirstCharacter() == kURICommentMarker)
+		if (url->GetFirstCharacter() == kURICommentMarker)
 			{
 			fileNameList->DeleteElement(i);
 			}
2004-03-12 17:05:45 +00:00
Joe Marcus Clarke
73f7c91b5d Bump PORTREVISION on all ports that depend on gettext to aid with upgrading.
(Part 1)
2004-02-04 05:10:27 +00:00
Trevor Johnson
f15b845ebe SIZEify. 2004-01-29 16:13:06 +00:00
Mario Sergio Fujikawa Ferreira
e2718b777a Drop maintainership 2003-09-07 23:39:04 +00:00
Mario Sergio Fujikawa Ferreira
d2480723c9 Fix typo: add missing \ to continue line 2003-03-23 04:58:15 +00:00
Mario Sergio Fujikawa Ferreira
bc82a6d708 Fix build: improve previous solution where the distfile was tricked
into believing makemake was installed during build time even though
it really is not

PR:		46217 [1]
Reported by:	bento,
		Nick Jennings <nkj@grenzik.us.mvd> [1]
2003-03-08 18:33:06 +00:00
Mario Sergio Fujikawa Ferreira
74740483d0 De-pkg-comment 2003-02-23 19:58:35 +00:00
Mario Sergio Fujikawa Ferreira
431bcdceda Replace hard dependences on auto{conf,make} with newly added
USE_AUTO{CONF,MAKE}_VER
2002-11-11 20:45:20 +00:00
Mario Sergio Fujikawa Ferreira
e4bd2f66f1 Fix build in -STABLE and -CURRENT
Prompted by:	bento
2002-09-20 17:20:13 +00:00
Mario Sergio Fujikawa Ferreira
3201ef7799 Sanitize MASTER_SITES
Submitted by:	fenner's distfile survey
2002-09-20 14:38:47 +00:00
Mario Sergio Fujikawa Ferreira
ec5bc20025 Mark BROKEN for -CURRENT post gcc 3.1 2002-08-23 22:08:02 +00:00
Mario Sergio Fujikawa Ferreira
17b391afa5 Add working MASTER_SITES
Submitted by:	fenner (distfile survey)
2001-10-22 17:12:33 +00:00
Andrey A. Chernov
5676988fbd Bump png major 2001-09-11 03:32:41 +00:00
Mario Sergio Fujikawa Ferreira
0de6ab1172 The distfile located in one of the MASTER_SITES does not correspond
to the one "checksummed" for port use. Therefore, it will removed
untill this is rectified.

Submitted by:	bento, kris, fenner (scripts)
2001-03-11 01:18:16 +00:00
Mario Sergio Fujikawa Ferreira
0fabc4ff05 Sanitize MASTER_SITES. 2001-02-22 02:49:48 +00:00
Mario Sergio Fujikawa Ferreira
c4e85efd6f typo clean up police: \s -> \t 2001-02-14 04:12:50 +00:00
Jimmy Olgeni
79c05b9c01 Enforce X(1) recommendation about X11 naming in some pkg-{descr,comment}
files.
2001-01-31 23:28:05 +00:00
Will Andrews
1e242ef434 Hopefully finish syncing with bsd.port.mk rev 1.361 - use bsd.port.mk
defined PORTDOCS PLIST_SUB.

Submitted by:	lioux
Closes PR:	24468
PR Submitter:	Mikhail Teterin <mi@aldan.algebra.com>
2001-01-20 00:39:55 +00:00
Will Andrews
5ccbc2a8ac Update to sync with bsd.port.mk rev 1.361 - use PORTDOCS that is now in
bsd.port.mk, for easy removal of documentation.  I left alone one port -
japanese/elisa8x8 (or something like that), because it appeared to have
some rather weird way of doing PORTDOCS substitution.
2001-01-16 19:08:45 +00:00
Satoshi Asami
614d3845fc Rename ${FILESDIR}/patch-aa to ${PATCHDIR}/post-patch-aa. (This patch
does post-patch processing.)
2000-10-07 22:53:03 +00:00
Mario Sergio Fujikawa Ferreira
b327e9c777 Maintainer is now a committer, update email accordingly
Approved by: will
2000-10-03 05:12:49 +00:00
Steve Price
ec7b92ea69 Major overhaul of this port so that we cleanly build the other ports
that depend on it.

Submitted by:	maintainer
2000-09-17 21:26:15 +00:00
Will Andrews
7d7a9a2180 Make these COMMENT files conform to Handbook standard.
PR:		20269
Submitted by:	Ports Fury
2000-08-11 11:50:37 +00:00
Satoshi Asami
c6bcad2436 (1) Add new variable, XFREE86_VERSION, to specify which version of
XFree86 (3 or 4) to depend to when USE_XLIB is set.
    XFREE86_VERSION defaults to 3 for now, but adventurous users can
    override it in /etc/make.conf.  When XFREE86_VERSION=3, USE_XLIB
    will add a dependency to x11/XFree86; when it is set to 4, the
    dependency will be to x11/XFree86-4-libraries.  When
    XFREE86_VERSION=4, the PKG_IGNORE_DEPENDS and ALWAYS_BUILD_DEPENDS
    hacks to avoid messing with XFree86 are turned off.

    Since XFree86 version 4 includes some software that used to be
    separate ports, when XFREE86_VERSION=3 the following variables are
    provided:

    USE_DGS		LIB_DEPENDS on x11/dgs
    USE_FREETYPE	LIB_DEPENDS on print/freetype
    USE_MESA		LIB_DEPENDS on graphics/Mesa3
    USE_XPM		LIB_DEPENDS on graphics/xpm

    When XFREE86_VERSION=4, these variables have no effect.  The
    LIB_DEPENDS in the tree for the above four ports have all been
    converted to the USE_* counterparts.  For your information, this
    is the count of the number of ports:

    USE_DGS		0
    USE_FREETYPE	16
    USE_MESA		36
    USE_XPM		236

    There is a new variable, XAWVER, which is set to 6 when
    XFREE86_VERSION=3 and 7 when XFREE86_VERSION=4.  This is also
    passed to PLIST_SUB so ports that build Xaw based shared libraries
    can use this variable to substitute the shlib version number.

    There is also a provision of using a separate mtree file for
    XFREE86_VERSION=4, but that part is not enabled yet.

Reviewed by:	the ports list
Tested by:	make index (XFREE86_VERSION=3 only)

(2) Add hebrew to list of valid categories.
Submitted by:	nbm
2000-08-03 09:28:57 +00:00
Steve Price
782f056710 - Set USE_X_PREFIX.
- Consistently put things in the jx directory.

PR:		19135
Submitted by:	maintainer
2000-07-10 01:44:23 +00:00
Maxim Sobolev
6db96c0500 Bump png shared library version.
Submitted by:	Hajimu UMEMOTO <ume@mahoroba.org>
2000-07-04 07:13:35 +00:00
Satoshi Asami
ffb21b5654 Rename INSTALLS_SHLIBS to INSTALLS_SHLIB. (There was a typo in the
previous commit message to bsd.port.mk, which said INSTALL_SHLIBS.  Boo.)

Line up the rhs of variable assignments nicely.  Remove a couple of extra
whitespaces while I'm here.

Suggested by:	 sobomax
2000-06-16 21:52:40 +00:00
Maxim Sobolev
dc1177a9a5 Fourth round of INSTALLS_SHLIBS conversion. 2000-06-16 08:48:22 +00:00
Will Andrews
c01762daea Don't try to make this port respect CC/CFLAGS. It won't work. :-( 2000-06-09 19:38:12 +00:00
Will Andrews
c3a9f54064 JX is a C++ application framework and widget library for X11.
PR:		19030
Submitted by:	Mario Sergio Fujikawa Ferriera <lioux@uol.com.br>
2000-06-07 16:52:01 +00:00