summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED2
-rw-r--r--Mk/bsd.fpc.mk6
-rw-r--r--graphics/Makefile1
-rw-r--r--graphics/fpc-imlib/Makefile23
-rw-r--r--graphics/fpc-imlib/pkg-plist7
-rw-r--r--lang/fpc-units/Makefile12
-rw-r--r--x11-toolkits/Makefile1
-rw-r--r--x11-toolkits/fpc-gnome1/Makefile17
-rw-r--r--x11-toolkits/fpc-gnome1/pkg-plist19
9 files changed, 9 insertions, 79 deletions
diff --git a/MOVED b/MOVED
index ce58cc2ba997..1165f9b8d5f2 100644
--- a/MOVED
+++ b/MOVED
@@ -7341,3 +7341,5 @@ graphics/show||2014-12-25|Abandonware, depends on imlib
japanese/ebview|japanese/ebview-gtk2|2014-12-25|Use GTK2 version
japanese/xjtext||2014-12-25|Abandonware, depends on imlib
x11/peeper||2014-12-25|Abandonware, depends on imlib
+x11-toolkits/fpc-gnome1||2014-12-25|Depends on imlib
+graphics/fpc-imlib||2014-12-25|Depends on imlib
diff --git a/Mk/bsd.fpc.mk b/Mk/bsd.fpc.mk
index a202f3814a0f..da06dfb48f17 100644
--- a/Mk/bsd.fpc.mk
+++ b/Mk/bsd.fpc.mk
@@ -65,8 +65,8 @@ UNITSDIR= ${LOCALBASE}/lib/fpc/${FPC_VER}/units/${BUILDNAME}
_FPC_ALL_UNITS= a52 aspell bfd bzip2 cairo chm dblib dbus dts fastcgi fcl-async fcl-base \
fcl-db fcl-extra fcl-fpcunit fcl-image fcl-js fcl-json fcl-net fcl-passrc \
fcl-process fcl-registry fcl-res fcl-web fcl-xml fftw fpgtk fpindexer \
- fpmkunit fppkg fv gdbint gdbm gmp gnome1 graph gtk1 gtk2 hash \
- hermes httpd22 httpd24 ibase iconvenc imagemagick imlib ldap libcurl libgd \
+ fpmkunit fppkg fv gdbint gdbm gmp graph gtk1 gtk2 hash \
+ hermes httpd22 httpd24 ibase iconvenc imagemagick ldap libcurl libgd \
libpng libvlc libxml2 lua mad matroska modplug mysql ncurses newt numlib \
odbc oggvorbis openal opengl openssl oracle pasjpeg paszlib pcap \
postgres proj4 pthreads pxlib regexpr rexx rsvg sdl sndfile sqlite \
@@ -152,12 +152,10 @@ fv_UNIT= devel/fpc-fv
hermes_UNIT= graphics/fpc-hermes
gdbm_UNIT= databases/fpc-gdbm
gmp_UNIT= math/fpc-gmp
-gnome1_UNIT= x11-toolkits/fpc-gnome1
gtk1_UNIT= x11-toolkits/fpc-gtk1
gtk2_UNIT= x11-toolkits/fpc-gtk2
iconvenc_UNIT= converters/fpc-iconvenc
imagemagick_UNIT= graphics/fpc-imagemagick
-imlib_UNIT= graphics/fpc-imlib
ldap_UNIT= net/fpc-ldap
libcurl_UNIT= ftp/fpc-libcurl
libgd_UNIT= graphics/fpc-libgd
diff --git a/graphics/Makefile b/graphics/Makefile
index 63e7a76d12ae..700f0f98ff76 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -182,7 +182,6 @@
SUBDIR += fpc-graph
SUBDIR += fpc-hermes
SUBDIR += fpc-imagemagick
- SUBDIR += fpc-imlib
SUBDIR += fpc-libgd
SUBDIR += fpc-libpng
SUBDIR += fpc-ncurses
diff --git a/graphics/fpc-imlib/Makefile b/graphics/fpc-imlib/Makefile
deleted file mode 100644
index 3127582ff362..000000000000
--- a/graphics/fpc-imlib/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 1
-CATEGORIES= graphics lang
-PKGNAMESUFFIX= -imlib
-
-MAINTAINER= acm@FreeBSD.org
-COMMENT= Free Pascal interface to imlib library
-
-USE_FPC= gtk1 x11 opengl
-
-MASTERDIR= ${.CURDIR}/../../lang/fpc
-WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR= ${WRKUNITDIR}
-
-OPTIONS_DEFINE= IMLIB2
-IMLIB2_DESC= Install imlib graphic library
-OPTIONS_DEFAULT= IMLIB2
-
-IMLIB2_USE= EFL=imlib2
-
-.include "${MASTERDIR}/Makefile"
diff --git a/graphics/fpc-imlib/pkg-plist b/graphics/fpc-imlib/pkg-plist
deleted file mode 100644
index fe6928e429fd..000000000000
--- a/graphics/fpc-imlib/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imlib/gdk_imlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imlib/imlib.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imlib/gdk_imlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imlib/imlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imlib/libpgdk_imlib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/imlib/libpimlib.a
diff --git a/lang/fpc-units/Makefile b/lang/fpc-units/Makefile
index 94b6c8abb9f5..89c925981f28 100644
--- a/lang/fpc-units/Makefile
+++ b/lang/fpc-units/Makefile
@@ -3,7 +3,7 @@
PORTNAME= units
PORTVERSION= 2.6.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= # none
PKGNAMEPREFIX= fpc-
@@ -23,8 +23,8 @@ BUILDNAME= ${ARCH}-freebsd
OPTIONS_DEFINE= A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \
FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPINDEXER \
- FPMKUNIT FPPKG FV GDBM GMP GNOME1 GTK1 GTK2 HERMES ICONVENC \
- IMAGEMAGICK IMLIB LDAP LIBCURL LIBGD LIBPNG LIBVLC LIBXML2 LUA MAD MATROSKA \
+ FPMKUNIT FPPKG FV GDBM GMP GTK1 GTK2 HERMES ICONVENC \
+ IMAGEMAGICK LDAP LIBCURL LIBGD LIBPNG LIBVLC LIBXML2 LUA MAD MATROSKA \
MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 \
PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \
UTMP UUID X11 XFORMS ZLIB
@@ -61,14 +61,12 @@ FPMKUNIT_DESC= Free Pascal build system unit
FV_DESC= Free Pascal unit for Delphi support
GDBM_DESC= Interface to the GNU database system
GMP_DESC= Interface to gmp library
-GNOME1_DESC= Interface to create programs for GNOME
GTK1_DESC= Interface to gtk libraries
GTK2_DESC= Interface to gtk2 libraries
HERMES_DESC= Free Pascal hermes unit
ICONVENC_DESC= Interface to iconv library
FPINDEXER_DESC= Database indexer with database/flat file backend
IMAGEMAGICK_DESC= Interface to ImageMagick
-IMLIB_DESC= Interface to imlib library
LDAP_DESC= Interface to OpenLDAP
LIBCURL_DESC= Interface to curl library
LIBGD_DESC= Interface to gd library
@@ -110,8 +108,8 @@ LATEST_LINK= ${PKGNAMEPREFIX}${PORTNAME}
OPTIONS_DEFAULT=A52 ASPELL BFD BZIP2 CAIRO CHM DBUS DBLIB DTS FASTCGI FCL-ASYNC FCL-BASE \
FCL-EXTRA FCL-DB FCL-FPCUNIT FCL-IMAGE FCL-JS FCL-JSON FCL-NET FCL-PASSRC \
FCL-PROCESS FCL-REGISTRY FCL-RES FCL-WEB FCL-XML FFTW FPGTK FPINDEXER \
- FPMKUNIT FPPKG FV GDBM GMP GNOME1 GTK1 GTK2 HERMES ICONVENC \
- IMAGEMAGICK IMLIB LDAP LIBCURL LIBGD LIBPNG LIBVLC LIBXML2 LUA MAD MATROSKA \
+ FPMKUNIT FPPKG FV GDBM GMP GTK1 GTK2 HERMES ICONVENC \
+ IMAGEMAGICK LDAP LIBCURL LIBGD LIBPNG LIBVLC LIBXML2 LUA MAD MATROSKA \
MODPLUG NCURSES NEWT NUMLIB OGGVORBIS OPENAL OPENGL OPENSSL PCAP PROJ4 \
PXLIB RSVG REXX SDL SNDFILE SVGALIB SYMBOLIC SYSLOG TCL UNZIP USERS \
UTMP UUID X11 XFORMS ZLIB
diff --git a/x11-toolkits/Makefile b/x11-toolkits/Makefile
index 5d02f820cb6d..39773840c1e5 100644
--- a/x11-toolkits/Makefile
+++ b/x11-toolkits/Makefile
@@ -17,7 +17,6 @@
SUBDIR += fox14
SUBDIR += fox16
SUBDIR += fox17
- SUBDIR += fpc-gnome1
SUBDIR += fpc-gtk1
SUBDIR += fpc-gtk2
SUBDIR += fpc-xforms
diff --git a/x11-toolkits/fpc-gnome1/Makefile b/x11-toolkits/fpc-gnome1/Makefile
deleted file mode 100644
index 1d535a44172b..000000000000
--- a/x11-toolkits/fpc-gnome1/Makefile
+++ /dev/null
@@ -1,17 +0,0 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
-# $FreeBSD$
-
-PORTREVISION= 1
-CATEGORIES= x11-toolkits lang
-PKGNAMESUFFIX= -gnome1
-
-MAINTAINER= acm@FreeBSD.org
-COMMENT= Free Pascal unit to create programs for GNOME 1
-
-USE_FPC= gtk1 imlib opengl x11
-
-MASTERDIR= ${.CURDIR}/../../lang/fpc
-WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
-EXTRACTUNITDIR= ${WRKUNITDIR}
-
-.include "${MASTERDIR}/Makefile"
diff --git a/x11-toolkits/fpc-gnome1/pkg-plist b/x11-toolkits/fpc-gnome1/pkg-plist
deleted file mode 100644
index 810866f01207..000000000000
--- a/x11-toolkits/fpc-gnome1/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/gconf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/gconfclient.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libart.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libgnome.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libgnomeui.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libzvt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/gconf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/gconfclient.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libart.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libgnome.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libgnomeui.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libzvt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libplibart.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libpgconf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libpgconfclient.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libplibgnome.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libplibgnomeui.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gnome1/libplibzvt.a